time to take a break for a few hours

SlimeKnights · Feb 1, 2014 · e3282b1 · e3282b1
1 parent 5aec324
commit e3282b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java
@@ -120,7 +120,7 @@ public void func_149689_a (World par1World, int par2, int par3, int par4, Entity
     }
 
     @Override
-    public void func_149749_a (World par1World, int x, int y, int z, int par5, int meta)
+    public void breakBlock (World par1World, int x, int y, int z, int par5, int meta)
     {
         TileEntity te = par1World.func_147438_o(x, y, z);
 
@@ -165,7 +165,7 @@ public void func_149749_a (World par1World, int x, int y, int z, int par5, int m
             }
         }
 
-        super.func_149749_a(par1World, x, y, z, par5, meta);
+        super.breakBlock(par1World, x, y, z, par5, meta);
     }
 
     public int getLightValue (IBlockAccess world, int x, int y, int z)

diff --git a/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java
@@ -146,7 +146,7 @@ public void explode ()
 
         if (hasExploded || defBeh != null && !preventExplode)
         {
-            worldObj.removeBlockTileEntity(x, y, z);
+            worldObj.func_147475_p(x, y, z);
             WorldHelper.setBlockToAir(worldObj, x, y, z);
         }
         else

diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java
@@ -238,7 +238,7 @@ public void breakBlock (World par1World, int par2, int par3, int par4, int par5,
             par1World.func_147459_d(par2, par3 - 1, par4, this);
         }
 
-        super.func_149749_a(par1World, par2, par3, par4, par5, par6);
+        super.breakBlock(par1World, par2, par3, par4, par5, par6);
     }
 
     /**

diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java
@@ -25,9 +25,9 @@ public StencilTableGui(InventoryPlayer inventoryplayer, StencilTableLogic shaper
         patternIndex = 0;
     }
 
-    public void onGuiClosed ()
+    public void func_146281_b ()
     {
-        super.onGuiClosed();
+        super.func_146281_b();
     }
 
     @Override

diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java
@@ -84,13 +84,13 @@ else if (y == 255 && this.b.func_149688_o().isSolid())
         {
             return false;
         }
-        else if (world.canPlaceEntityOnSide(this.b, x, y, z, false, side, player, stack))
+        else if (world.func_147472_a(this.b, x, y, z, false, side, player, stack))
         {
             Block block = this.b;
             //int meta = this.getMetadata(stack.getItemDamage());
             int rotation = MathHelper.floor_double((double) (player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
             int meta = rotation * 4;
-            int metadata = this.b.onBlockPlaced(world, x, y, z, side, hitX, hitY, hitZ, meta);
+            int metadata = this.b.func_149660_a(world, x, y, z, side, hitX, hitY, hitZ, meta);
 
             if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata))
             {