diff --git a/src/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/tconstruct/client/gui/AdaptiveSmelteryGui.java index b3fadd4f..ca76b8fa 100644 --- a/src/tconstruct/client/gui/AdaptiveSmelteryGui.java +++ b/src/tconstruct/client/gui/AdaptiveSmelteryGui.java @@ -1,36 +1,23 @@ package tconstruct.client.gui; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.Icon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.*; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; +import org.lwjgl.opengl.*; -import cpw.mods.fml.common.network.PacketDispatcher; +import tconstruct.TConstruct; import tconstruct.blocks.component.SmelteryComponent; import tconstruct.blocks.logic.AdaptiveSmelteryLogic; -import tconstruct.inventory.ActiveContainer; -import tconstruct.inventory.AdaptiveSmelteryContainer; +import tconstruct.inventory.*; import tconstruct.library.component.MultiFluidTank; public class AdaptiveSmelteryGui extends NewContainerGui @@ -42,8 +29,9 @@ public class AdaptiveSmelteryGui extends NewContainerGui float currentScroll = 0.0F; int slotPos = 0; int prevSlotPos = 0; - private SmelteryComponent scomp; - private MultiFluidTank multitank; + private final SmelteryComponent scomp; + private final MultiFluidTank multitank; + public AdaptiveSmelteryGui(InventoryPlayer inventoryplayer, AdaptiveSmelteryLogic smeltery, World world, int x, int y, int z) { super((ActiveContainer) smeltery.getGuiContainer(inventoryplayer, world, x, y, z)); @@ -53,9 +41,10 @@ public class AdaptiveSmelteryGui extends NewContainerGui scomp = logic.getSmeltery(); multitank = logic.getMultiTank(); scomp.update(); - + } + @Override public void drawScreen (int mouseX, int mouseY, float par3) { super.drawScreen(mouseX, mouseY, par3); @@ -93,7 +82,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui if (this.isScrolling) { - this.currentScroll = ((float) (mouseY - yScroll) - 7.5F) / ((float) (scrollHeight - yScroll) - 15.0F); + this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollHeight - yScroll - 15.0F); if (this.currentScroll < 0.0F) { @@ -112,6 +101,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui } } + @Override protected void drawGuiContainerForegroundLayer (int mouseX, int mouseY) { fontRenderer.drawString(StatCollector.translateToLocal("crafters.Smeltery"), 86, 5, 0x404040); @@ -173,6 +163,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui private static final ResourceLocation backgroundSide = new ResourceLocation("tinker", "textures/gui/smelteryside.png"); private static final ResourceLocation terrain = new ResourceLocation("terrain.png"); + @Override protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -297,9 +288,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui if (liquid.fluidID == -37) { list.add("\u00A7fFuel"); - int mB = liquid.amount; - if (mB > 0) - list.add("mB: " + mB); + list.add("mB: " + liquid.amount); } else { @@ -307,51 +296,48 @@ public class AdaptiveSmelteryGui extends NewContainerGui list.add("\u00A7f" + name); if (name.equals("liquified emerald")) { - float emeralds = liquid.amount / 320f; - list.add("Emeralds: " + emeralds); + list.add("Emeralds: " + liquid.amount / 320f); } else if (name.contains("Molten")) { - int ingots = liquid.amount / 144; + int ingots = liquid.amount / TConstruct.ingotLiquidValue; if (ingots > 0) list.add("Ingots: " + ingots); - int mB = liquid.amount % 144; + int mB = liquid.amount % TConstruct.ingotLiquidValue; if (mB > 0) { - if (mB % 72 == 0) - list.add("Chunks: " + liquid.amount % 144 / 72); - else if (mB % 16 == 0) - list.add("Nuggets: " + liquid.amount % 144 / 16); - else - list.add("mB: " + mB); + int nuggets = mB / TConstruct.nuggetLiquidValue; + int junk = (mB % TConstruct.nuggetLiquidValue); + if (nuggets > 0) + list.add("Nuggets: " + nuggets); + if (junk > 0) + list.add("mB: " + junk); } } else if (name.equals("Seared Stone")) { - int ingots = liquid.amount / 144; + int ingots = liquid.amount / TConstruct.ingotLiquidValue; if (ingots > 0) list.add("Blocks: " + ingots); - int mB = liquid.amount % 144; + int mB = liquid.amount % TConstruct.ingotLiquidValue; if (mB > 0) - { list.add("mB: " + mB); - } } else if (name.equals("Molten Glass")) { - int ingots = liquid.amount / 1000; - if (ingots > 0) - list.add("Blocks: " + ingots); - int mB = liquid.amount % 144; + int blocks = liquid.amount / 1000; + if (blocks > 0) + list.add("Blocks: " + blocks); + int panels = (liquid.amount % 1000) / 250; + if (panels > 0) + list.add("Panels: " + panels); + int mB = (liquid.amount % 1000) % 250; if (mB > 0) - { list.add("mB: " + mB); - } } else { - int mB = liquid.amount; - list.add("mB: " + mB); + list.add("mB: " + liquid.amount); } } return list; @@ -435,10 +421,10 @@ public class AdaptiveSmelteryGui extends NewContainerGui { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (startU + 0), (double) (startV + endV), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMaxV());//Bottom left - tessellator.addVertexWithUV((double) (startU + endU), (double) (startV + endV), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMaxV());//Bottom right - tessellator.addVertexWithUV((double) (startU + endU), (double) (startV + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMinV());//Top right - tessellator.addVertexWithUV((double) (startU + 0), (double) (startV + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMinV()); //Top left + tessellator.addVertexWithUV(startU + 0, startV + endV, this.zLevel, par3Icon.getMinU(), par3Icon.getMaxV());//Bottom left + tessellator.addVertexWithUV(startU + endU, startV + endV, this.zLevel, par3Icon.getMaxU(), par3Icon.getMaxV());//Bottom right + tessellator.addVertexWithUV(startU + endU, startV + 0, this.zLevel, par3Icon.getMaxU(), par3Icon.getMinV());//Top right + tessellator.addVertexWithUV(startU + 0, startV + 0, this.zLevel, par3Icon.getMinU(), par3Icon.getMinV()); //Top left tessellator.draw(); } @@ -509,7 +495,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui } } }*/ - + @Override public void onGuiClosed () { diff --git a/src/tconstruct/client/gui/SmelteryGui.java b/src/tconstruct/client/gui/SmelteryGui.java index 6d9b3ba4..b18384cd 100644 --- a/src/tconstruct/client/gui/SmelteryGui.java +++ b/src/tconstruct/client/gui/SmelteryGui.java @@ -1,33 +1,25 @@ package tconstruct.client.gui; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import cpw.mods.fml.common.network.PacketDispatcher; + +import java.io.*; +import java.util.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.Icon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.*; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; +import org.lwjgl.opengl.*; +import tconstruct.TConstruct; import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.inventory.ActiveContainer; -import tconstruct.inventory.SmelteryContainer; -import cpw.mods.fml.common.network.PacketDispatcher; +import tconstruct.inventory.*; public class SmelteryGui extends NewContainerGui { @@ -48,6 +40,7 @@ public class SmelteryGui extends NewContainerGui smeltery.updateFuelDisplay(); } + @Override public void drawScreen (int mouseX, int mouseY, float par3) { super.drawScreen(mouseX, mouseY, par3); @@ -85,7 +78,7 @@ public class SmelteryGui extends NewContainerGui if (this.isScrolling) { - this.currentScroll = ((float) (mouseY - yScroll) - 7.5F) / ((float) (scrollHeight - yScroll) - 15.0F); + this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollHeight - yScroll - 15.0F); if (this.currentScroll < 0.0F) { @@ -104,6 +97,7 @@ public class SmelteryGui extends NewContainerGui } } + @Override protected void drawGuiContainerForegroundLayer (int mouseX, int mouseY) { fontRenderer.drawString(StatCollector.translateToLocal("crafters.Smeltery"), 86, 5, 0x404040); @@ -112,7 +106,7 @@ public class SmelteryGui extends NewContainerGui int base = 0; int cornerX = (width - xSize) / 2 + 36; int cornerY = (height - ySize) / 2; - + for (FluidStack liquid : logic.moltenMetal) { int basePos = 54; @@ -138,7 +132,7 @@ public class SmelteryGui extends NewContainerGui if (mouseX >= leftX && mouseX <= leftX + sizeX && mouseY >= topY && mouseY < topY + sizeY) { drawFluidStackTooltip(liquid, mouseX - cornerX + 36, mouseY - cornerY); - + } } if (logic.fuelGague > 0) @@ -158,6 +152,7 @@ public class SmelteryGui extends NewContainerGui private static final ResourceLocation backgroundSide = new ResourceLocation("tinker", "textures/gui/smelteryside.png"); private static final ResourceLocation terrain = new ResourceLocation("terrain.png"); + @Override protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -275,61 +270,56 @@ public class SmelteryGui extends NewContainerGui if (liquid.fluidID == -37) { list.add("\u00A7fFuel"); - int mB = liquid.amount; - if (mB > 0) - list.add("mB: " + mB); + list.add("mB: " + liquid.amount); } else { - String name = StatCollector.translateToLocal("fluid."+FluidRegistry.getFluidName(liquid)); + String name = StatCollector.translateToLocal("fluid." + FluidRegistry.getFluidName(liquid)); list.add("\u00A7f" + name); if (name.equals("Liquified Emerald")) { - float emeralds = liquid.amount / 320f; - list.add("Emeralds: " + emeralds); + list.add("Emeralds: " + liquid.amount / 320f); } else if (name.equals("Molten Glass")) { - int ingots = liquid.amount / 1000; - if (ingots > 0) - list.add("Blocks: " + ingots); - int mB = liquid.amount % 144; + int blocks = liquid.amount / 1000; + if (blocks > 0) + list.add("Blocks: " + blocks); + int panels = (liquid.amount % 1000) / 250; + if (panels > 0) + list.add("Panels: " + panels); + int mB = (liquid.amount % 1000) % 250; if (mB > 0) - { list.add("mB: " + mB); - } } else if (name.contains("Molten")) { - int ingots = liquid.amount / 144; + int ingots = liquid.amount / TConstruct.ingotLiquidValue; if (ingots > 0) list.add("Ingots: " + ingots); - int mB = liquid.amount % 144; + int mB = liquid.amount % TConstruct.ingotLiquidValue; if (mB > 0) { - if (mB % 72 == 0) - list.add("Chunks: " + liquid.amount % 144 / 72); - else if (mB % 16 == 0) - list.add("Nuggets: " + liquid.amount % 144 / 16); - else - list.add("mB: " + mB); + int nuggets = mB / TConstruct.nuggetLiquidValue; + int junk = (mB % TConstruct.nuggetLiquidValue); + if (nuggets > 0) + list.add("Nuggets: " + nuggets); + if (junk > 0) + list.add("mB: " + junk); } } else if (name.equals("Seared Stone")) { - int ingots = liquid.amount / 144; + int ingots = liquid.amount / TConstruct.ingotLiquidValue; if (ingots > 0) list.add("Blocks: " + ingots); - int mB = liquid.amount % 144; + int mB = liquid.amount % TConstruct.ingotLiquidValue; if (mB > 0) - { list.add("mB: " + mB); - } } else { - int mB = liquid.amount; - list.add("mB: " + mB); + list.add("mB: " + liquid.amount); } } return list; @@ -413,23 +403,23 @@ public class SmelteryGui extends NewContainerGui { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double) (startU + 0), (double) (startV + endV), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMaxV());//Bottom left - tessellator.addVertexWithUV((double) (startU + endU), (double) (startV + endV), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMaxV());//Bottom right - tessellator.addVertexWithUV((double) (startU + endU), (double) (startV + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) par3Icon.getMinV());//Top right - tessellator.addVertexWithUV((double) (startU + 0), (double) (startV + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) par3Icon.getMinV()); //Top left + tessellator.addVertexWithUV(startU + 0, startV + endV, this.zLevel, par3Icon.getMinU(), par3Icon.getMaxV());//Bottom left + tessellator.addVertexWithUV(startU + endU, startV + endV, this.zLevel, par3Icon.getMaxU(), par3Icon.getMaxV());//Bottom right + tessellator.addVertexWithUV(startU + endU, startV + 0, this.zLevel, par3Icon.getMaxU(), par3Icon.getMinV());//Top right + tessellator.addVertexWithUV(startU + 0, startV + 0, this.zLevel, par3Icon.getMinU(), par3Icon.getMinV()); //Top left tessellator.draw(); } - + @Override - public void mouseClicked(int mouseX, int mouseY, int mouseButton) + public void mouseClicked (int mouseX, int mouseY, int mouseButton) { - super.mouseClicked(mouseX, mouseY, mouseButton); - - int base = 0; + super.mouseClicked(mouseX, mouseY, mouseButton); + + int base = 0; int cornerX = (width - xSize) / 2 + 36; int cornerY = (height - ySize) / 2; int fluidToBeBroughtUp = -1; - + for (FluidStack liquid : logic.moltenMetal) { int basePos = 54; @@ -455,35 +445,35 @@ public class SmelteryGui extends NewContainerGui if (mouseX >= leftX && mouseX <= leftX + sizeX && mouseY >= topY && mouseY < topY + sizeY) { fluidToBeBroughtUp = liquid.fluidID; - + Packet250CustomPayload packet = new Packet250CustomPayload(); - + ByteArrayOutputStream bos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(bos); - + try { - dos.write(11); - - dos.writeInt(logic.worldObj.provider.dimensionId); - dos.writeInt(logic.xCoord); - dos.writeInt(logic.yCoord); - dos.writeInt(logic.zCoord); - - dos.writeBoolean(this.isShiftKeyDown()); - - dos.writeInt(fluidToBeBroughtUp); - } - catch (Exception e) - { - e.printStackTrace(); - } - - packet.channel = "TConstruct"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); - - PacketDispatcher.sendPacketToServer(packet); + dos.write(11); + + dos.writeInt(logic.worldObj.provider.dimensionId); + dos.writeInt(logic.xCoord); + dos.writeInt(logic.yCoord); + dos.writeInt(logic.zCoord); + + dos.writeBoolean(this.isShiftKeyDown()); + + dos.writeInt(fluidToBeBroughtUp); + } + catch (Exception e) + { + e.printStackTrace(); + } + + packet.channel = "TConstruct"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + PacketDispatcher.sendPacketToServer(packet); } } } diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index acc1b068..315bfd4c 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1176,6 +1176,8 @@ public class TContent implements IFuelHandler // ToolStation Recipes (Wooden Version) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "crafterWood")); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingStationWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingSlabWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3)); @@ -1708,7 +1710,28 @@ public class TContent implements IFuelHandler Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, 16), new FluidStack(moltenCobaltFluid, 32), new FluidStack(moltenArditeFluid, 32)); //Manyullyn Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, 48), new FluidStack(moltenAluminumFluid, 80), new FluidStack(moltenIronFluid, 32), new FluidStack(moltenObsidianFluid, 32)); //Alumite - //Items + // Stone parts + for (int sc = 0; sc < patternOutputs.length; sc++) + { + if (patternOutputs[sc] != null) + { + Smeltery.addMelting(FluidType.Stone, new ItemStack(patternOutputs[sc], 1, 1), 1, (8 * ((IPattern) woodPattern).getPatternCost(new ItemStack(woodPattern, 1, sc + 1))) / 2); + } + } + + // Chunks + Smeltery.addMelting(FluidType.Stone, new ItemStack(toolShard, 1, 1), 0, 4); + Smeltery.addMelting(FluidType.Iron, new ItemStack(toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Obsidian, new ItemStack(toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Cobalt, new ItemStack(toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Ardite, new ItemStack(toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Copper, new ItemStack(toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Bronze, new ItemStack(toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Alumite, new ItemStack(toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); + + // Items Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); Smeltery.addMelting(FluidType.Gold, new ItemStack(blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); @@ -1747,7 +1770,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(FluidType.Glass, new ItemStack(glassPane), 0, 250); for (int i = 0; i < 16; i++) { - Smeltery.addMelting(FluidType.Glass, new ItemStack(stainedGlassClear, 1, i), 0, 250); + Smeltery.addMelting(FluidType.Glass, new ItemStack(stainedGlassClear, 1, i), 0, FluidContainerRegistry.BUCKET_VOLUME); Smeltery.addMelting(FluidType.Glass, new ItemStack(stainedGlassClearPane, 1, i), 0, 250); } Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.fenceIron), 0, TConstruct.ingotLiquidValue * 6 / 16); diff --git a/src/tconstruct/library/crafting/FluidType.java b/src/tconstruct/library/crafting/FluidType.java index 82d7885b..c69e89e9 100644 --- a/src/tconstruct/library/crafting/FluidType.java +++ b/src/tconstruct/library/crafting/FluidType.java @@ -51,7 +51,7 @@ public enum FluidType /** Ender Smelting **/ Ender(TContent.metalBlock.blockID, 10, 500, TContent.moltenEnderFluid, false), /** Glass Smelting **/ - Glass(Block.glass.blockID, 0, 625, TContent.moltenGlassFluid, false), + Glass(Block.sand.blockID, 0, 625, TContent.moltenGlassFluid, false), /** Stone Smelting **/ Stone(Block.stone.blockID, 0, 800, TContent.moltenStoneFluid, true), /** Emerald Smelting **/