diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index c894e301..cb6ba85c 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -1,34 +1,28 @@ package tconstruct.tools.gui; -import java.math.RoundingMode; -import java.text.DecimalFormat; -import java.util.*; - -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; import tconstruct.library.TConstructRegistry; -import tconstruct.library.accessory.AccessoryCore; -import tconstruct.library.armor.ArmorCore; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.IModifyable; -import tconstruct.library.tools.*; +import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; -import tconstruct.mechworks.logic.TileEntityLandmine; import tconstruct.tools.logic.CraftingStationLogic; +import java.util.Collections; +import java.util.List; + @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { @@ -274,12 +268,11 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler } @Override - public boolean hideItemPanelSlot (GuiContainer gui, int x, int y, int w, int h) - { + public boolean hideItemPanelSlot (GuiContainer gui, int x, int y, int w, int h) { if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) return false; - if (x + 4 > guiLeft + xSize + (logic.tinkerTable ? 126 : 0)) + if (x - w - 4 < guiLeft - (logic.chest != null ? 40 : 0) || x + 4 > guiLeft + xSize + (logic.tinkerTable ? 126 : 0)) return false; return true; diff --git a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java index 7a183c6c..501003b8 100644 --- a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java @@ -1,21 +1,16 @@ package tconstruct.tools.gui; -import java.util.Collections; -import java.util.List; - +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; - -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; -import cpw.mods.fml.common.Optional; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.tools.ToolMaterial; @@ -24,6 +19,9 @@ import tconstruct.smeltery.inventory.ActiveContainer; import tconstruct.tools.inventory.PartCrafterChestContainer; import tconstruct.tools.logic.PartBuilderLogic; +import java.util.Collections; +import java.util.List; + @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { @@ -276,7 +274,7 @@ public class PartCrafterGui extends GuiContainer implements INEIGuiHandler if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) return false; - if (x + 4 > guiLeft + xSize + DESC_WIDTH) + if (x - w - 4 < guiLeft - 40 || x + 4 > guiLeft + xSize + DESC_WIDTH) return false; return true; diff --git a/src/main/java/tconstruct/tools/gui/StencilTableGui.java b/src/main/java/tconstruct/tools/gui/StencilTableGui.java index 76e2c6a6..40f686b2 100644 --- a/src/main/java/tconstruct/tools/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/tools/gui/StencilTableGui.java @@ -171,6 +171,11 @@ public class StencilTableGui extends GuiContainer implements INEIGuiHandler if(y > this.guiTop - 10 && y < this.guiTop + 2 + 22*(TConstructClientRegistry.stencilButtons2.size()-1)/4 + 22*(TConstructClientRegistry.stencilButtons2.size()%4 > 0 ? 1 : 0)) return true; + // is it in the horizontal column of the left buttons? + if(x - w < this.guiLeft && x - w > this.guiLeft - 120) + if(y > this.guiTop - 10 && y < this.guiTop + 2 + 22*(TConstructClientRegistry.stencilButtons.size()-1)/4 + 22*(TConstructClientRegistry.stencilButtons.size()%4 > 0 ? 1 : 0)) + return true; + return false; } } \ No newline at end of file diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index 8f0602f3..4fae2170 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -1,38 +1,32 @@ package tconstruct.tools.gui; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; - -import java.math.RoundingMode; -import java.text.DecimalFormat; -import java.util.*; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.*; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; -import net.minecraft.world.World; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; import tconstruct.TConstruct; -import tconstruct.library.accessory.AccessoryCore; -import tconstruct.library.armor.ArmorCore; -import tconstruct.library.client.*; -import tconstruct.library.tools.*; -import tconstruct.library.util.HarvestLevels; +import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.client.ToolGuiElement; import tconstruct.smeltery.inventory.ActiveContainer; import tconstruct.tools.inventory.ToolStationContainer; import tconstruct.tools.logic.ToolStationLogic; import tconstruct.util.network.ToolStationPacket; +import java.util.Collections; +import java.util.List; + @SideOnly(Side.CLIENT) @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class ToolStationGui extends GuiContainer implements INEIGuiHandler @@ -323,7 +317,7 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler if (y + h - 4 < guiTop || y + 4 > guiTop + ySize) return false; - if (x + 4 > guiLeft + xSize + 126) + if (x - w - 4 < guiLeft - 40 || x + 4 > guiLeft + xSize + 126) return false; return true;