bump mantle, add in objectholder

build.gradle

@@ -20,7 +20,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
     }
 }
 
@@ -31,12 +31,16 @@ repositories {
         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'
-	}
-	maven {
-          name 'ForgeFS'
-          url 'http://files.minecraftforge.net/maven'
+    }
+    maven {
+        name 'ForgeFS'
+        url 'http://files.minecraftforge.net/maven'
      }
 }
 

build.properties

@@ -1,7 +1,7 @@
 minecraft_version=1.7.2
-forge_version=10.12.0.1033
-mantle_version=132.45b0b50
-tconstruct_version=1.6.0.jenkins413
+forge_version=10.12.1.1101
+mantle_version=145.3a637c2
+tconstruct_version=1.6.0.jenkins497
 FMP_version=1.1.0.268
 CCLIB_version=1.1.0.77
 NEI_version=1.0.1

src/main/java/mods/natura/Natura.java

@@ -55,15 +55,15 @@ public class Natura
     /* Proxies for sides, used for graphics processing */
     @SidedProxy(clientSide = "mods.natura.client.NProxyClient", serverSide = "mods.natura.common.NProxyCommon")
     public static NProxyCommon proxy;
-
+    public static final String modID = "Natura";
     /* Instance of this mod, used for grabbing prototype fields */
-    @Instance("Natura")
+    @Instance(modID)
     public static Natura instance;
     public static Material cloud = new CloudMaterial();
 
-    public static Logger logger = LogManager.getLogger("Natura");
+    public static Logger logger = LogManager.getLogger(modID);
 
-    public static final ModuleController moduleLoader = new ModuleController("Natura-Dynamic.cfg", "Natura");
+    public static final ModuleController moduleLoader = new ModuleController("Natura-Dynamic.cfg", modID);
 
     @EventHandler
     public void preInit (FMLPreInitializationEvent evt)
@@ -97,7 +97,6 @@ public void init (FMLInitializationEvent evt)
         GameRegistry.registerWorldGenerator(crops = new BaseCropWorldgen(), 20); // TODO 1.7 Find correct weight (param 2)
         GameRegistry.registerWorldGenerator(clouds = new BaseCloudWorldgen(), 20); // TODO 1.7 Find correct weight (param 2)
         GameRegistry.registerWorldGenerator(trees = new BaseTreeWorldgen(), 20); // TODO 1.7 Find correct weight (param 2)
-        //NaturaTab.init(NContent.wheatBag);
 
         proxy.registerRenderer();
         proxy.addNames();
@@ -137,11 +136,6 @@ public void bonemealEvent (BonemealEvent event)
     {
         if (!event.world.isRemote)
         {
-            /*if (event.block == content.crops.blockID)
-            {
-            	if (content.crops.boneFertilize(event.world, event.X, event.y, event.z, event.world.rand))
-            		event.setResult(event.getResult().ALLOW);
-            }*/
             if (event.block == NContent.glowshroom)
             {
                 if (NContent.glowshroom.fertilizeMushroom(event.world, event.x, event.y, event.z, event.world.rand))

src/main/java/mods/natura/common/NContent.java

@@ -138,7 +138,9 @@
 import cpw.mods.fml.common.IFuelHandler;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
 
+@ObjectHolder(Natura.modID)
 public class NContent implements IFuelHandler
 {
 

src/main/java/mods/natura/common/PHNatura.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 
+import cpw.mods.fml.common.Loader;
 import mods.natura.Natura;
 import net.minecraftforge.common.config.Configuration;
 
@@ -19,14 +20,8 @@ public static void initProps (File confFile)
         Natura.retrogen = config.get("Retrogen", "Retroactive Generation", false).getBoolean(false);
 
         boolean BoP = false;
-        try
-        {
-            Class c = Class.forName("biomesoplenty.BiomesOPlenty");
+        if(Loader.isModLoaded("BiomesOPlenty"))
             BoP = true;
-        }
-        catch (Exception e)
-        {
-        }
 
         babyHeatscarMinimum = config.get("Mob Changes", "Minimum Baby Heatscar Spiders on Spider Death", 2).getInt(2);
         if (babyHeatscarMinimum < 0)
@@ -76,7 +71,7 @@ public static void initProps (File confFile)
 
         try
         {
-            Class c = Class.forName("chococraft.common.ModChocoCraft");
+            Class.forName("chococraft.common.ModChocoCraft");
             enableWheatRecipe = config.get("Disabler", "Enable wheat to flour recipe", false).getBoolean(false);
         }
         catch (Exception e)
@@ -141,13 +136,13 @@ public static void initProps (File confFile)
         seaLevel = config.get("general", "Sea level", 64).getInt(64);
 
         /* Save the configuration file */
-        config.save();
+        if(config.hasChanged())
+             config.save();
     }
 
     /* Prototype fields, used elsewhere */
 
     public static int seaLevel;
-    public static int spawnEgg;
 
     //Overworld
     public static boolean generateBarley;
@@ -163,13 +158,7 @@ public static void initProps (File confFile)
     public static boolean generateSkyberries;
     public static boolean generateStingberries;
 
-    public static int seedFood;
-
     public static int saguaroSpawnRarity;
-    public static int saguaroSpawnHeight;
-    public static int saguaroSpawnRange;
-
-    public static int cactusJuice;
 
     public static int raspSpawnRarity;
     public static int raspSpawnRange;
@@ -189,12 +178,6 @@ public static void initProps (File confFile)
     public static int stingSpawnRarity;
     public static int stingSpawnRange;
 
-    public static int netherBerryItem;
-    public static int berryItemID;
-    public static int berryMedley;
-    public static int berryBlockID;
-    public static int netherBerryBlock;
-
     public static int thornSpawnRarity;
 
     //Clouds
@@ -243,7 +226,6 @@ public static void initProps (File confFile)
     public static boolean canRespawnInNether;
 
     public static int redwoodSpawnRarity;
-    public static int redwoodSpawnRange;
     public static int bloodSpawnRarity;
     public static int eucalyptusShortSpawnRarity;
     public static int eucalyptusShortSpawnRange;

src/main/java/mods/natura/worldgen/SakuraTreeGen.java

@@ -15,11 +15,8 @@
 
 public class SakuraTreeGen extends WorldGenAbstractTree
 {
-    // JAVADOC FIELD $$ field_76507_a
     static final byte[] otherCoordPairs = new byte[] {(byte)2, (byte)0, (byte)0, (byte)1, (byte)2, (byte)1};
-    // JAVADOC FIELD $$ field_76505_b
     Random rand = new Random();
-    // JAVADOC FIELD $$ field_76506_c
     World worldObj;
     int[] basePos = new int[] {0, 0, 0};
     int heightLimit;
@@ -29,13 +26,9 @@ public class SakuraTreeGen extends WorldGenAbstractTree
     double branchSlope = 0.381D;
     double scaleWidth = 1.0D;
     double leafDensity = 1.0D;
-    // JAVADOC FIELD $$ field_76510_l
     int trunkSize = 1;
-    // JAVADOC FIELD $$ field_76511_m
     int heightLimitLimit = 12;
-    // JAVADOC FIELD $$ field_76508_n
     int leafDistanceLimit = 4;
-    // JAVADOC FIELD $$ field_76509_o
     int[][] leafNodes;
 
     int metaWood;
@@ -52,7 +45,6 @@ public SakuraTreeGen(boolean par1, int mdwood, int mdleaves)
         metaLeaves = mdleaves;
     }
 
-    // JAVADOC METHOD $$ func_76489_a
     void generateLeafNodeList()
     {
         this.height = (int)((double)this.heightLimit * this.heightAttenuation);
@@ -289,7 +281,6 @@ else if (l == i1)
         }
     }
 
-    // JAVADOC METHOD $$ func_76498_b
     void generateLeaves()
     {
         int i = 0;
@@ -303,13 +294,11 @@ void generateLeaves()
         }
     }
 
-    // JAVADOC METHOD $$ func_76493_c
     boolean leafNodeNeedsBase(int par1)
     {
         return (double)par1 >= (double)this.heightLimit * 0.2D;
     }
 
-    // JAVADOC METHOD $$ func_76499_c
     void generateTrunk()
     {
         int i = this.basePos[0];
@@ -401,7 +390,6 @@ int checkBlockLine(int[] par1ArrayOfInteger, int[] par2ArrayOfInteger)
                 aint3[b1] = par1ArrayOfInteger[b1] + i;
                 aint3[b2] = MathHelper.floor_double((double)par1ArrayOfInteger[b2] + (double)i * d0);
                 aint3[b3] = MathHelper.floor_double((double)par1ArrayOfInteger[b3] + (double)i * d1);
-                Block block = this.worldObj.getBlock(aint3[0], aint3[1], aint3[2]);
 
                 if (!this.isReplaceable(worldObj, aint3[0], aint3[1], aint3[2]))
                 {
@@ -445,7 +433,6 @@ else if (i < 6)
         }
     }
 
-    // JAVADOC METHOD $$ func_76487_a
     public void setScale(double par1, double par3, double par5)
     {
         this.heightLimitLimit = (int)(par1 * 12.0D);

src/main/java/mods/natura/worldgen/retro/ChunkCoord.java

@@ -7,7 +7,7 @@
 
 /**
  * Standardized implementation for representing and manipulating Chunk Coordinates. Provides standard Java Collection interaction.
- * From COFH LIB
+ * From COFH LIB(modified to use mantle's coordtuple instead)
  * @author King Lemming
  * 
  */

src/main/java/mods/natura/worldgen/retro/TickHandlerWorld.java

@@ -42,11 +42,4 @@ public void onTick (WorldTickEvent event)
         }
     }
 
-    /* @Override
-     public String getLabel ()
-     {
-
-         return "NaturaWorld";
-     }*/
-
 }