From 5585d680a3125f914e09d662e44dbf7e8690fbe6 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 5 Feb 2014 08:59:16 -0500 Subject: [PATCH] some fixes --- .../tconstruct/blocks/CraftingStationBlock.java | 6 ++++++ .../tconstruct/blocks/logic/CastingBasinLogic.java | 14 ++++++++++++++ .../tconstruct/blocks/logic/CastingTableLogic.java | 14 ++++++++++++++ .../blocks/logic/CraftingStationLogic.java | 14 ++++++++++++++ .../tconstruct/blocks/logic/DryingRackLogic.java | 14 ++++++++++++++ .../java/tconstruct/blocks/logic/FrypanLogic.java | 2 +- .../java/tconstruct/blocks/logic/FurnaceLogic.java | 2 +- .../tconstruct/blocks/logic/SmelteryLogic.java | 10 ++++++++++ .../tconstruct/blocks/logic/StencilTableLogic.java | 10 ++++++++++ .../java/tconstruct/blocks/logic/TankAirLogic.java | 10 ++++++++++ .../blocks/logic/TileEntityLandmine.java | 5 +++-- .../tconstruct/blocks/logic/ToolStationLogic.java | 10 ++++++++++ .../java/tconstruct/client/gui/FurnaceGui.java | 4 ++-- src/main/java/tconstruct/entity/CartEntity.java | 2 +- 14 files changed, 110 insertions(+), 7 deletions(-) diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java index 495bcd17..5199b2d3 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/blocks/CraftingStationBlock.java @@ -105,4 +105,10 @@ public class CraftingStationBlock extends InventoryBlock 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 index 4f771936..e772f2c7 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java @@ -431,4 +431,18 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl { 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 index 2876750a..309faf20 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java @@ -429,4 +429,18 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl { 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 index cffd46f4..ecc6d8a2 100644 --- a/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java @@ -115,4 +115,18 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent { 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 index 8c66f081..2e1bdc11 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -134,4 +134,18 @@ public class DryingRackLogic extends InventoryLogic { 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 index 2b54c3d8..75ac7c0e 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java @@ -253,7 +253,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic 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 index f263e609..d352f6c2 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -230,7 +230,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin 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 index f5343c6f..8743d3e5 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -1168,4 +1168,14 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { 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 index d7f0459d..aa1e6402 100644 --- a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java @@ -133,4 +133,14 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory { 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 index c34d2af0..99e30113 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java @@ -198,5 +198,15 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide 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 index 832c0970..5a14a874 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -211,12 +211,12 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public void openChest () + public void openInventory () { } @Override - public void closeChest () + public void closeInventory () { } @@ -263,4 +263,5 @@ public class TileEntityLandmine extends TileEntity implements IInventory } } + } diff --git a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java index ebb12485..c1df6b2f 100644 --- a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java @@ -121,4 +121,14 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory { 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 index 663a96b5..f1489fa4 100644 --- a/src/main/java/tconstruct/client/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/client/gui/FurnaceGui.java @@ -29,9 +29,9 @@ public class FurnaceGui extends GuiContainer */ 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 index d984065b..06cf2bc7 100644 --- a/src/main/java/tconstruct/entity/CartEntity.java +++ b/src/main/java/tconstruct/entity/CartEntity.java @@ -322,7 +322,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS 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)