some fixes

SlimeKnights · Feb 5, 2014 · 5585d68 · 5585d68
1 parent b8cf7cd
commit 5585d68
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 7 deletions.
diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java
@@ -105,4 +105,10 @@ public void getSubBlocks (Item id, CreativeTabs tab, List list)
 	public TileEntity createNewTileEntity(World arg0, int arg1) {
 		return new CraftingStationLogic();
 	}
+
+    @Override
+    public TileEntity func_149915_a (World arg0, int arg1)
+    {
+        return new CraftingStationLogic();
+    }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java
@@ -431,4 +431,18 @@ public boolean hasCustomInventoryName ()
     {
         return false;
     }
+
+    @Override
+    public void closeInventory ()
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void openInventory ()
+    {
+        // TODO Auto-generated method stub
+
+    }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java
@@ -429,4 +429,18 @@ public boolean hasCustomInventoryName ()
     {
         return false;
     }
+
+    @Override
+    public void closeInventory ()
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void openInventory ()
+    {
+        // TODO Auto-generated method stub
+
+    }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java b/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java
@@ -115,4 +115,18 @@ public boolean hasCustomInventoryName ()
     {
         return true;
     }
+
+    @Override
+    public void closeInventory ()
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void openInventory ()
+    {
+        // TODO Auto-generated method stub
+
+    }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java
@@ -134,4 +134,18 @@ public boolean hasCustomInventoryName ()
     {
         return false;
     }
+
+    @Override
+    public void closeInventory ()
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void openInventory ()
+    {
+        // TODO Auto-generated method stub
+
+    }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java
@@ -253,7 +253,7 @@ public static int getItemBurnTime (ItemStack stack)
                 return 200;
             if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD"))
                 return 200;
-            if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD"))
+            if (item instanceof ItemHoe && ((ItemHoe) item).getToolMaterialName().equals("WOOD"))
                 return 200;
             if (item == Items.stick)
                 return 100;

diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java
@@ -230,7 +230,7 @@ public static int getItemBurnTime (ItemStack stack)
                 return 200;
             if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD"))
                 return 200;
-            if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD"))
+            if (item instanceof ItemHoe && ((ItemHoe) item).getToolMaterialName().equals("WOOD"))
                 return 200;
             if (item == Items.stick)
                 return 100;

diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java
@@ -1168,4 +1168,14 @@ public boolean hasCustomInventoryName ()
     {
         return true;
     }
+
+    @Override
+    public void closeInventory ()
+    {
+    }
+
+    @Override
+    public void openInventory ()
+    {
+    }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java
@@ -133,4 +133,14 @@ public boolean hasCustomInventoryName ()
     {
         return true;
     }
+
+    @Override
+    public void closeInventory ()
+    {
+    }
+
+    @Override
+    public void openInventory ()
+    {
+    }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java
@@ -198,5 +198,15 @@ public boolean hasCustomInventoryName ()
         return false;
     }
 
+    @Override
+    public void closeInventory ()
+    {      
+    }
+
+    @Override
+    public void openInventory ()
+    {        
+    }
+
 
 }
diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java
@@ -211,12 +211,12 @@ public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer)
     }
 
     @Override
-    public void openChest ()
+    public void openInventory ()
     {
     }
 
     @Override
-    public void closeChest ()
+    public void closeInventory ()
     {
     }
 
@@ -263,4 +263,5 @@ public void updateEntity ()
         }
     }
 
+
 }
diff --git a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java
@@ -121,4 +121,14 @@ public boolean hasCustomInventoryName ()
     {
         return true;
     }
+
+    @Override
+    public void closeInventory ()
+    {        
+    }
+
+    @Override
+    public void openInventory ()
+    {        
+    }
 }
diff --git a/src/main/java/tconstruct/client/gui/FurnaceGui.java b/src/main/java/tconstruct/client/gui/FurnaceGui.java
@@ -29,9 +29,9 @@ public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace)
      */
     protected void drawGuiContainerForegroundLayer (int par1, int par2)
     {
-        String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.getStringParams(this.logic.getInvName());
+        String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.format(this.logic.getInvName());
         this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752);
-        this.fontRendererObj.drawString(I18n.getStringParams("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+        this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
     }
 
     /**

diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java
@@ -322,7 +322,7 @@ public void onUpdate ()
         if (!this.worldObj.isRemote && this.worldObj instanceof WorldServer)
         {
             this.worldObj.theProfiler.startSection("portal");
-            MinecraftServer var1 = ((WorldServer) this.worldObj).getMinecraftServer();
+            MinecraftServer var1 = ((WorldServer) this.worldObj).func_73046_m();
             var2 = this.getMaxInPortalTime();
 
             if (this.inPortal)