競合修正

[chemicraft/chemicraft.git] / common / chemicraft / gui / GuiToolAndWeaponCraftingTable.java

diff --git a/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java b/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
index a13d628..d26ce31 100644 (file)
--- a/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
+++ b/common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
@@ -1,46 +1,22 @@
 package chemicraft.gui;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.InventoryPlayer;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
 import chemicraft.ChemiCraft;
 import chemicraft.container.ContainerToolAndWeaponCraftingTable;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class GuiToolAndWeaponCraftingTable extends GuiContainer {
 
-       /**
-        * the TileEntity.
-        */
-       private TileEntityToolAndWeaponCraftingTable tileEntity;
-
-
-       /**
-        * the InventoryPlayer.
-        */
-       private InventoryPlayer inventoryPlayer;
-
-
-       /**
-        * the Container
-        */
-       private ContainerToolAndWeaponCraftingTable container;
-
-
-
-       public GuiToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2){
+       public GuiToolAndWeaponCraftingTable(EntityPlayer par1EntityPlayer, TileEntityToolAndWeaponCraftingTable par2) {
                super(new ContainerToolAndWeaponCraftingTable(par1EntityPlayer, par2));
-               this.inventoryPlayer = par1EntityPlayer.inventory;
-               this.tileEntity = par2;
-               this.container = (ContainerToolAndWeaponCraftingTable) this.inventorySlots;
        }
 
-
-
        @Override
-       protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3){
-               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture));
+       protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) {
+               this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture(ChemiCraft.instance.GUI_TOOLANDWEAPONCRAFTING_TEXTURE));
                this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
        }
 
+
 }