run through remap script

SlimeKnights · Feb 5, 2014 · b8cf7cd · b8cf7cd
1 parent 689aeba
commit b8cf7cd
Show file tree

Hide file tree

Showing 208 changed files with 4,178 additions and 4,178 deletions.
diff --git a/build.properties b/build.properties
@@ -1,6 +1,6 @@
 minecraft_version=1.7.2
-forge_version=LATEST
-mantle_version=c676c6
+forge_version=10.12.0.1024
+mantle_version=e2c89a
 FMP_version=1.0.0.211
 CCLIB_version=1.0.0.44
 NEI_version=1.6.1.8
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
@@ -58,7 +58,7 @@ public class TConstruct
     public static TProxyCommon proxy;
 
     //The name of the enum is accompanied by numbers because I have no idea what will happen if another mod will try to add the same enum, just to be safe
-    //public static EnumCreatureType creatureTypePlayer = EnumHelper.addCreatureType("PLAYER_5821443", EntityPlayer.class, 0, Material.field_151579_a, true);
+    //public static EnumCreatureType creatureTypePlayer = EnumHelper.addCreatureType("PLAYER_5821443", EntityPlayer.class, 0, Material.air, true);
 
     //The packet pipeline
     public static final PacketPipeline packetPipeline = new PacketPipeline();

diff --git a/src/main/java/tconstruct/blocks/BlockFalling.java b/src/main/java/tconstruct/blocks/BlockFalling.java
@@ -11,30 +11,30 @@
 
 public class BlockFalling extends Block
 {
-    public static boolean field_149832_M;
+    public static boolean fallInstantly;
 
     public BlockFalling()
     {
-        super(Material.field_151596_z);
-        this.func_149647_a(CreativeTabs.tabBlock);
+        super(Material.craftedSnow);
+        this.setCreativeTab(CreativeTabs.tabBlock);
     }
 
     public BlockFalling(Material p_i45405_1_)
     {
         super(p_i45405_1_);
     }
 
-    public void func_149726_b(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
+    public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_)
     {
-        p_149726_1_.func_147464_a(p_149726_2_, p_149726_3_, p_149726_4_, this, this.func_149738_a(p_149726_1_));
+        p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, this.tickRate(p_149726_1_));
     }
 
-    public void func_149695_a(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
+    public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
     {
-        p_149695_1_.func_147464_a(p_149695_2_, p_149695_3_, p_149695_4_, this, this.func_149738_a(p_149695_1_));
+        p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, this.tickRate(p_149695_1_));
     }
 
-    public void func_149674_a(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
+    public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
     {
         if (!p_149674_1_.isRemote)
         {
@@ -48,7 +48,7 @@ private void func_149830_m(World p_149830_1_, int p_149830_2_, int p_149830_3_,
         {
             byte b0 = 32;
 
-            if (!field_149832_M && p_149830_1_.checkChunksExist(p_149830_2_ - b0, p_149830_3_ - b0, p_149830_4_ - b0, p_149830_2_ + b0, p_149830_3_ + b0, p_149830_4_ + b0))
+            if (!fallInstantly && p_149830_1_.checkChunksExist(p_149830_2_ - b0, p_149830_3_ - b0, p_149830_4_ - b0, p_149830_2_ + b0, p_149830_3_ + b0, p_149830_4_ + b0))
             {
                 if (!p_149830_1_.isRemote)
                 {
@@ -59,7 +59,7 @@ private void func_149830_m(World p_149830_1_, int p_149830_2_, int p_149830_3_,
             }
             else
             {
-                p_149830_1_.func_147468_f(p_149830_2_, p_149830_3_, p_149830_4_);
+                p_149830_1_.setBlockToAir(p_149830_2_, p_149830_3_, p_149830_4_);
 
                 while (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ > 0)
                 {
@@ -68,22 +68,22 @@ private void func_149830_m(World p_149830_1_, int p_149830_2_, int p_149830_3_,
 
                 if (p_149830_3_ > 0)
                 {
-                    p_149830_1_.func_147449_b(p_149830_2_, p_149830_3_, p_149830_4_, this);
+                    p_149830_1_.setBlock(p_149830_2_, p_149830_3_, p_149830_4_, this);
                 }
             }
         }
     }
 
     protected void func_149829_a(EntityFallingBlock p_149829_1_) {}
 
-    public int func_149738_a(World p_149738_1_)
+    public int tickRate(World p_149738_1_)
     {
         return 2;
     }
 
     public static boolean func_149831_e(World p_149831_0_, int p_149831_1_, int p_149831_2_, int p_149831_3_)
     {
-        Block block = p_149831_0_.func_147439_a(p_149831_1_, p_149831_2_, p_149831_3_);
+        Block block = p_149831_0_.getBlock(p_149831_1_, p_149831_2_, p_149831_3_);
 
         if (block.isAir(p_149831_0_, p_149831_1_, p_149831_2_, p_149831_3_))
         {
@@ -96,8 +96,8 @@ else if (block == Blocks.fire)
         else
         {
             //TODO: King, take a look here when doing liquids!
-            //Material material = block.field_149764_J;
-            //return material == Material.field_151586_h ? true : material == Material.field_151587_i;
+            //Material material = block.blockMaterial;
+            //return material == Material.water ? true : material == Material.lava;
         	return false;
         }
     }