Update natura's 1.11 version to the latest version from 1.10.2, and i…

…t is now running 1.11.2!

build.gradle

@@ -35,10 +35,6 @@ repositories {
         name 'CB Maven FS'
         url "http://chickenbones.net/maven/"
     }
-    maven {
-         name "ProfMobius Maven FS"
-         url "http://mobiusstrip.eu/maven"
-    }
     maven {
         name 'DVS1 Maven FS'
         url 'http://dvs1.progwml6.com/files/maven'
@@ -51,22 +47,30 @@ repositories {
         name 'MCMultiPart'
         url 'http://maven.amadornes.com/'
     }
+    maven {
+         name "Tehnut Maven FS"
+         url "http://tehnut.info/maven"
+    }
+    maven {
+         name "ProfMobius Maven FS"
+         url "http://mobiusstrip.eu/maven"
+    }
 }
 
 group = 'com.progwml6.natura'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    //deobfCompile "net.minecraftforge.lex:YUNoMakeGoodMap:${minecraft_version}-${yunomakegoodmap_version}"
     deobfCompile "slimeknights.mantle:Mantle:${minecraft_version}-${mantle_version}"
     //deobfCompile "slimeknights:TConstruct:${minecraft_version}-${tconstruct_version}"
 
+    deobfCompile "mcp.mobius.waila:Hwyla:${hwyla_version}_1.11"
     //deobfCompile "mcp.mobius.waila:Waila:${waila_version}_1.9.4" // ${minecraft_version}" No 1.10 version of waila, must use 1.9.4 version
 
     deobfCompile "mezz.jei:jei_${minecraft_version}:${jei_version}"
 
-    //deobfCompile "MCMultiPart:MCMultiPart-experimental:${mcmultipart_version}:universal"
+    deobfCompile "MCMultiPart2:MCMultiPart-exp:${mcmultipart_version}:universal"
 }
 
 // sets version to the slimeKnights version format

gradle.properties

@@ -1,15 +1,15 @@
-mod_version=4.1.0
+mod_version=4.2.0
 
-minecraft_version=1.11
+minecraft_version=1.11.2
 
-forge_version=13.19.0.2153
-mappings_version=snapshot_20161119
+forge_version=13.20.0.2282
+mappings_version=snapshot_20170415
 
 mantle_version=1.2.0.+
-tconstruct_version=2.5.6.+
+tconstruct_version=2.6.2.+
 
-jei_version=4.0.+
-waila_version=1.7.0-B3
-mcmultipart_version=2.0.0_88
+jei_version=4.3.2.+
 
-yunomakegoodmap_version=6.1.0.24
+hwyla_version=1.8.13-B26
+
+mcmultipart_version=2.0.0_9

src/main/java/com/progwml6/natura/Natura.java

@@ -4,23 +4,27 @@
 import org.apache.logging.log4j.Logger;
 
 import com.progwml6.natura.common.CommonProxy;
-import com.progwml6.natura.common.NaturaOredict;
 import com.progwml6.natura.common.config.Config;
+import com.progwml6.natura.common.gui.GuiHandler;
+import com.progwml6.natura.decorative.NaturaDecorative;
 import com.progwml6.natura.entities.NaturaEntities;
 import com.progwml6.natura.library.Util;
 import com.progwml6.natura.nether.NaturaNether;
+import com.progwml6.natura.oredict.NaturaOredict;
 import com.progwml6.natura.overworld.NaturaOverworld;
 import com.progwml6.natura.shared.NaturaCommons;
+import com.progwml6.natura.tools.NaturaTools;
 import com.progwml6.natura.world.NaturaWorld;
 
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.Mod.Instance;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
 import slimeknights.mantle.pulsar.control.PulseManager;
 
-@Mod(modid = Natura.modID, name = Natura.modName, version = Natura.modVersion, dependencies = "required-after:Forge@[12.18.0.1993,);required-after:mantle@[1.10-0.10.3,)", acceptedMinecraftVersions = "[1.10, 1.11)")
+@Mod(modid = Natura.modID, name = Natura.modName, version = Natura.modVersion, dependencies = "required-after:Forge@[12.18.0.1993,);required-after:mantle@[1.10-0.10.3,);", acceptedMinecraftVersions = "[1.10, 1.11)")
 public class Natura
 {
     public static final String modID = Util.MODID;
@@ -45,6 +49,8 @@ public class Natura
         pulseManager.registerPulse(new NaturaCommons());
         pulseManager.registerPulse(new NaturaOverworld());
         pulseManager.registerPulse(new NaturaNether());
+        pulseManager.registerPulse(new NaturaDecorative());
+        pulseManager.registerPulse(new NaturaTools());
         pulseManager.registerPulse(new NaturaEntities());
         pulseManager.registerPulse(new NaturaOredict());
         pulseManager.registerPulse(new NaturaWorld());
@@ -54,6 +60,8 @@ public class Natura
     public void preInit(FMLPreInitializationEvent event)
     {
         Config.load(event);
+
+        NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
     }
 
 }

src/main/java/com/progwml6/natura/common/GuiIDs.java

@@ -0,0 +1,11 @@
+package com.progwml6.natura.common;
+
+/**
+ * Sole purpose of this class is to have all mod GUI IDs in one place so we don't assign them twice and conflict.
+ */
+public interface GuiIDs
+{
+    int CRAFTING_TABLE = 0;
+
+    int FURNACE = 1;
+}

src/main/java/com/progwml6/natura/common/ModelRegisterUtil.java

@@ -7,6 +7,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
@@ -20,7 +21,6 @@
 @SideOnly(Side.CLIENT)
 public final class ModelRegisterUtil
 {
-
     public static final String VARIANT_INVENTORY = "inventory";
 
     // Regular ITEM MODELS //
@@ -41,10 +41,12 @@ public static void registerItemModel(ItemStack itemStack, ResourceLocation name)
     public static ResourceLocation registerItemModel(Item item)
     {
         ResourceLocation itemLocation = null;
-        if (item != null)
+
+        if (item != Items.AIR)
         {
             itemLocation = item.getRegistryName();
         }
+
         if (itemLocation != null)
         {
             itemLocation = registerIt(item, itemLocation);
@@ -65,6 +67,7 @@ public static void registerItemBlockMeta(Block block)
         if (block != null)
         {
             Item item = Item.getItemFromBlock(block);
+
             if (item instanceof ItemBlockMeta)
             {
                 ((ItemBlockMeta) item).registerItemModels();
@@ -85,7 +88,7 @@ public static void registerItemModel(Item item, int meta)
     /** Registers the given item with the given meta and its registry name for the given variant */
     public static void registerItemModel(Item item, int meta, String variant)
     {
-        if (item != null)
+        if (item != Items.AIR)
         {
             registerItemModel(item, meta, item.getRegistryName(), variant);
         }
@@ -94,7 +97,7 @@ public static void registerItemModel(Item item, int meta, String variant)
     /** Registers the given item/meta combination with the model at the given location, and the given variant */
     public static void registerItemModel(Item item, int meta, ResourceLocation location, String variant)
     {
-        if (item != null && !StringUtils.isNullOrEmpty(variant))
+        if (item != Items.AIR && !StringUtils.isNullOrEmpty(variant))
         {
             //ModelLoader.registerItemVariants(item, location);
             ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(item.getRegistryName(), variant));