diff options
4 files changed, 74 insertions, 107 deletions
diff --git a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index 096d5e7aa1..1600d9944f 100644 --- a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -21,14 +21,11 @@ import net.minecraft.world.World; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; -import gtPlusPlus.core.tileentities.general.TileEntityXpConverter; -import gtPlusPlus.core.util.minecraft.EnchantingUtils; import gtPlusPlus.core.util.minecraft.InventoryUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -69,7 +66,6 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { return p_149691_1_ == 1 ? this.textureTop : (p_149691_1_ == 0 ? this.textureBottom : (this.textureFront)); - //return p_149691_1_ == 1 ? this.textureTop : (p_149691_1_ == 0 ? this.textureBottom : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); } @Override @@ -104,7 +100,6 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip if (tile != null) { mDidScrewDriver = tile.onScrewdriverRightClick((byte) side, player, x, y, z); } - } } catch (final Throwable t) {} @@ -113,7 +108,6 @@ public class CircuitProgrammer extends BlockContainer implements ITileTooltip final TileEntity te = world.getTileEntity(x, y, z); if ((te != null) && (te instanceof TileEntityCircuitProgrammer)){ player.openGui(GTplusplus.instance, GuiHandler.GUI8, world, x, y, z); - Logger.INFO("Opened GUI."); return true; } } diff --git a/src/Java/gtPlusPlus/core/container/Container_CircuitProgrammer.java b/src/Java/gtPlusPlus/core/container/Container_CircuitProgrammer.java index 88ce3b3b7b..d8ce521fb5 100644 --- a/src/Java/gtPlusPlus/core/container/Container_CircuitProgrammer.java +++ b/src/Java/gtPlusPlus/core/container/Container_CircuitProgrammer.java @@ -32,7 +32,6 @@ public class Container_CircuitProgrammer extends Container { // slots public Container_CircuitProgrammer(final InventoryPlayer inventory, final TileEntityCircuitProgrammer te) { - Logger.INFO("Created CP Container."); this.tile_entity = te; this.inventoryChest = te.getInventory(); diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java index bf49acbb69..2ab5b58aa7 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java +++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java @@ -8,7 +8,6 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.container.Container_CircuitProgrammer; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; @@ -20,16 +19,13 @@ public class GUI_CircuitProgrammer extends GuiContainer { public GUI_CircuitProgrammer(final InventoryPlayer player_inventory, final TileEntityCircuitProgrammer te){ super(new Container_CircuitProgrammer(player_inventory, te)); - Logger.INFO("Created CP GUI."); } - @Override protected void drawGuiContainerForegroundLayer(final int i, final int j){ super.drawGuiContainerForegroundLayer(i, j); } - @Override protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j){ GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); @@ -39,7 +35,6 @@ public class GUI_CircuitProgrammer extends GuiContainer { this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); } - //This method is called when the Gui is first called! @Override public void initGui(){ diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java index 8acb75552c..816b35ea4b 100644 --- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java +++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java @@ -26,157 +26,136 @@ import gtPlusPlus.core.tileentities.machines.*; public class GuiHandler implements IGuiHandler { - public static final int GUI1 = 0; //Project Table - public static final int GUI2 = 1; //Helium Generator - public static final int GUI3 = 2; //BackpackHandler - public static final int GUI4 = 3; //Workbench - public static final int GUI5 = 4; //Workbench Adv - public static final int GUI6 = 5; //Fish trap - public static final int GUI7 = 6; //Trade table - public static final int GUI8 = 7; //Circuit Programmer - public static final int GUI9 = 8; //Grindle - - - - public static void init(){ + public static final int GUI1 = 0; // Project Table + public static final int GUI2 = 1; // Helium Generator + public static final int GUI3 = 2; // BackpackHandler + public static final int GUI4 = 3; // Workbench + public static final int GUI5 = 4; // Workbench Adv + public static final int GUI6 = 5; // Fish trap + public static final int GUI7 = 6; // Trade table + public static final int GUI8 = 7; // Circuit Programmer + public static final int GUI9 = 8; // Grindle + + public static void init() { Logger.INFO("Registering GUIs."); NetworkRegistry.INSTANCE.registerGuiHandler(GTplusplus.instance, new GuiHandler()); - //Register GuiHandler - //NetworkRegistry.INSTANCE.registerGuiHandler(GTplusplus.instance, new GuiHandler()); + // Register GuiHandler + // NetworkRegistry.INSTANCE.registerGuiHandler(GTplusplus.instance, new + // GuiHandler()); } - - @Override //ContainerModTileEntity - public Object getServerGuiElement(final int ID, final EntityPlayer player, final World world, final int x, final int y, final int z) { + @Override // ContainerModTileEntity + public Object getServerGuiElement(final int ID, final EntityPlayer player, final World world, final int x, + final int y, final int z) { final TileEntity te = world.getTileEntity(x, y, z); - if (te != null){ - if (ID == GUI1){ - return new Container_ProjectTable(player.inventory, (TileEntityProjectTable)te); - } - else if (ID == GUI2){ + if (te != null) { + if (ID == GUI1) { + return new Container_ProjectTable(player.inventory, (TileEntityProjectTable) te); + } else if (ID == GUI2) { return new Container_ModularityTable(player.inventory, (TileEntityModularityTable) te); } } - if (ID == GUI3) - { + if (ID == GUI3) { // Use the player's held item to create the inventory - return new Container_BackpackBase(player, player.inventory, new BaseInventoryBackpack(player.getHeldItem())); + return new Container_BackpackBase(player, player.inventory, + new BaseInventoryBackpack(player.getHeldItem())); } - if (te != null){ - if (ID == GUI4){ - return new Container_Workbench(player.inventory, (TileEntityWorkbench)te); - } - else if (ID == GUI5){ + if (te != null) { + if (ID == GUI4) { + return new Container_Workbench(player.inventory, (TileEntityWorkbench) te); + } else if (ID == GUI5) { Logger.INFO("sad"); - return new Container_WorkbenchAdvanced(player.inventory, (TileEntityWorkbenchAdvanced)te); - - } - else if (ID == GUI6){ - return new Container_FishTrap(player.inventory, (TileEntityFishTrap)te); - } - else if (ID == GUI7){ - return new Container_TradeTable(player.inventory, (TileEntityTradeTable)te); - } - else if (ID == GUI8){ - Logger.INFO("Returning CP Container."); - return new Container_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer)te); + return new Container_WorkbenchAdvanced(player.inventory, (TileEntityWorkbenchAdvanced) te); + + } else if (ID == GUI6) { + return new Container_FishTrap(player.inventory, (TileEntityFishTrap) te); + } else if (ID == GUI7) { + return new Container_TradeTable(player.inventory, (TileEntityTradeTable) te); + } else if (ID == GUI8) { + return new Container_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te); } } - if (ID == GUI9){ + if (ID == GUI9) { return new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem())); } - - - - - - return null; } - @Override //GuiModTileEntity - public Object getClientGuiElement(final int ID, final EntityPlayer player, final World world, final int x, final int y, final int z) { - Logger.WARNING("getClientGuiElement Called by: "+player+", in world: "+player.dimension+" at x:"+x+", y:"+y+", z:"+z+"."); + @Override // GuiModTileEntity + public Object getClientGuiElement(final int ID, final EntityPlayer player, final World world, final int x, + final int y, final int z) { + Logger.WARNING("getClientGuiElement Called by: " + player + ", in world: " + player.dimension + " at x:" + x + + ", y:" + y + ", z:" + z + "."); final TileEntity te = world.getTileEntity(x, y, z); - if (te != null){ - if (ID == GUI1){ - return new GUI_ProjectTable(player.inventory, (TileEntityProjectTable)te); - } - else if (ID == GUI2){ + if (te != null) { + if (ID == GUI1) { + return new GUI_ProjectTable(player.inventory, (TileEntityProjectTable) te); + } else if (ID == GUI2) { return new GUI_ModularityTable(player.inventory, (TileEntityModularityTable) te); } } - if (ID == GUI3) - { + if (ID == GUI3) { // We have to cast the new container as our custom class // and pass in currently held item for the inventory - return new GuiBaseBackpack(new Container_BackpackBase(player, player.inventory, new BaseInventoryBackpack(player.getHeldItem()))); + return new GuiBaseBackpack(new Container_BackpackBase(player, player.inventory, + new BaseInventoryBackpack(player.getHeldItem()))); } - if (te != null){ - if (ID == GUI4){ - return new GUI_Workbench(player.inventory, (TileEntityWorkbench)te); - } - else if (ID == GUI5){ + if (te != null) { + if (ID == GUI4) { + return new GUI_Workbench(player.inventory, (TileEntityWorkbench) te); + } else if (ID == GUI5) { Logger.INFO("sad"); - return new GUI_WorkbenchAdvanced(player.inventory, (TileEntityWorkbenchAdvanced)te); - } - else if (ID == GUI6){ - return new GUI_FishTrap(player.inventory, (TileEntityFishTrap)te); - } - else if (ID == GUI7){ - return new GUI_TradeTable(player.inventory, (TileEntityTradeTable)te, ((TileEntityBase) te).getOwner()); - } - else if (ID == GUI8){ - Logger.INFO("Returning CP GUI."); - return new GUI_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer)te); + return new GUI_WorkbenchAdvanced(player.inventory, (TileEntityWorkbenchAdvanced) te); + } else if (ID == GUI6) { + return new GUI_FishTrap(player.inventory, (TileEntityFishTrap) te); + } else if (ID == GUI7) { + return new GUI_TradeTable(player.inventory, (TileEntityTradeTable) te, + ((TileEntityBase) te).getOwner()); + } else if (ID == GUI8) { + return new GUI_CircuitProgrammer(player.inventory, (TileEntityCircuitProgrammer) te); } } - if (ID == GUI9){ - return new GuiBaseGrindle(new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem()))); + if (ID == GUI9) { + return new GuiBaseGrindle( + new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem()))); } return null; } - - - //New Methods - public static void openGui(final EntityPlayer entityplayer, final IGuiManager guiHandler) - { - openGui(entityplayer, guiHandler, (short)0); + // New Methods + public static void openGui(final EntityPlayer entityplayer, final IGuiManager guiHandler) { + openGui(entityplayer, guiHandler, (short) 0); } - public static void openGui(final EntityPlayer entityplayer, final IGuiManager guiHandler, final short data) - { + public static void openGui(final EntityPlayer entityplayer, final IGuiManager guiHandler, final short data) { final int guiData = encodeGuiData(guiHandler, data); final ChunkCoordinates coordinates = guiHandler.getCoordinates(); - entityplayer.openGui(GTplusplus.instance, guiData, entityplayer.worldObj, coordinates.posX, coordinates.posY, coordinates.posZ); + entityplayer.openGui(GTplusplus.instance, guiData, entityplayer.worldObj, coordinates.posX, coordinates.posY, + coordinates.posZ); } - private static int encodeGuiData(final IGuiManager guiHandler, final short data) - { + private static int encodeGuiData(final IGuiManager guiHandler, final short data) { final MU_GuiId guiId = Gui_ID_Registry.getGuiIdForGuiHandler(guiHandler); return (data << 16) | guiId.getId(); } - private static MU_GuiId decodeGuiID(final int guiData) - { + private static MU_GuiId decodeGuiID(final int guiData) { final int guiId = guiData & 0xFF; return Gui_ID_Registry.getGuiId(guiId); } - private static short decodeGuiData(final int guiId) - { - return (short)(guiId >> 16); + private static short decodeGuiData(final int guiId) { + return (short) (guiId >> 16); } }
\ No newline at end of file |