diff --git a/common/mekanism/api/RecipeHelper.java b/common/mekanism/api/RecipeHelper.java index e0087f316..c3c0bc88e 100644 --- a/common/mekanism/api/RecipeHelper.java +++ b/common/mekanism/api/RecipeHelper.java @@ -211,11 +211,11 @@ public final class RecipeHelper * @param input - input GasStack * @param output - output ItemStack */ - public static void addChemicalCrystalizerRecipe(GasStack input, ItemStack output) + public static void addChemicalCrystallizerRecipe(GasStack input, ItemStack output) { try { Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalCrystalizerRecipe", GasStack.class, ItemStack.class); + Method m = recipeClass.getMethod("addChemicalCrystallizerRecipe", GasStack.class, ItemStack.class); m.invoke(null, input, output); } catch(Exception e) { System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage()); diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index 3f0dd9169..80609cf5f 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -4,7 +4,7 @@ import java.io.File; import java.util.HashMap; import mekanism.api.Coord4D; -import mekanism.client.gui.GuiChemicalCrystalizer; +import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.client.gui.GuiChemicalInfuser; import mekanism.client.gui.GuiChemicalInjectionChamber; @@ -54,7 +54,7 @@ import mekanism.client.render.entity.RenderRobit; import mekanism.client.render.item.ItemRenderingHandler; import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderChargepad; -import mekanism.client.render.tileentity.RenderChemicalCrystalizer; +import mekanism.client.render.tileentity.RenderChemicalCrystallizer; import mekanism.client.render.tileentity.RenderChemicalDissolutionChamber; import mekanism.client.render.tileentity.RenderChemicalInfuser; import mekanism.client.render.tileentity.RenderChemicalOxidizer; @@ -92,7 +92,7 @@ import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityChargepad; -import mekanism.common.tile.TileEntityChemicalCrystalizer; +import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInjectionChamber; @@ -315,7 +315,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber()); ClientRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher", new RenderChemicalWasher()); - ClientRegistry.registerTileEntity(TileEntityChemicalCrystalizer.class, "ChemicalCrystalizer", new RenderChemicalCrystalizer()); + ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityPlasticBlock.class, "PlasticBlock", new RenderPlastic()); } @@ -454,7 +454,7 @@ public class ClientProxy extends CommonProxy case 36: return new GuiChemicalWasher(player.inventory, (TileEntityChemicalWasher)tileEntity); case 37: - return new GuiChemicalCrystalizer(player.inventory, (TileEntityChemicalCrystalizer)tileEntity); + return new GuiChemicalCrystallizer(player.inventory, (TileEntityChemicalCrystallizer)tileEntity); case 38: ItemStack itemStack1 = player.getCurrentEquippedItem().copy(); diff --git a/common/mekanism/client/gui/GuiAdvancedElectricMachine.java b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java index 417696ec7..63efb82df 100644 --- a/common/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -5,6 +5,8 @@ import java.util.List; import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine; @@ -38,6 +40,12 @@ public class GuiAdvancedElectricMachine extends GuiMekanism return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity, tileEntity.guiLocation)); + + guiElements.add(new GuiSlot(SlotType.INPUT, this, tileEntity, tileEntity.guiLocation, 55, 16)); + guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity, tileEntity.guiLocation, 30, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.EXTRA, this, tileEntity, tileEntity.guiLocation, 55, 52)); + guiElements.add(new GuiSlot(SlotType.OUTPUT_LARGE, this, tileEntity, tileEntity.guiLocation, 111, 30)); + } @Override diff --git a/common/mekanism/client/gui/GuiChanceMachine.java b/common/mekanism/client/gui/GuiChanceMachine.java index ac572718f..b55cfd3e5 100644 --- a/common/mekanism/client/gui/GuiChanceMachine.java +++ b/common/mekanism/client/gui/GuiChanceMachine.java @@ -4,6 +4,8 @@ import java.util.List; import mekanism.api.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChanceMachine; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.MekanismUtils; @@ -36,6 +38,11 @@ public class GuiChanceMachine extends GuiMekanism return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity, tileEntity.guiLocation)); + + guiElements.add(new GuiSlot(SlotType.INPUT, this, tileEntity, tileEntity.guiLocation, 55, 16)); + guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity, tileEntity.guiLocation, 55, 52).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT_WIDE, this, tileEntity, tileEntity.guiLocation, 111, 30)); + } @Override @@ -59,14 +66,6 @@ public class GuiChanceMachine extends GuiMekanism int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - int xAxis = mouseX - guiWidth; - int yAxis = mouseY - guiHeight; - - int displayInt; - - displayInt = tileEntity.getScaledProgress(24); - drawTexturedModalRect(guiWidth + 79, guiHeight + 39, 176, 0, displayInt + 1, 7); - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } } diff --git a/common/mekanism/client/gui/GuiChemicalCrystalizer.java b/common/mekanism/client/gui/GuiChemicalCrystallizer.java similarity index 82% rename from common/mekanism/client/gui/GuiChemicalCrystalizer.java rename to common/mekanism/client/gui/GuiChemicalCrystallizer.java index 4f2acd5e0..a35978332 100644 --- a/common/mekanism/client/gui/GuiChemicalCrystalizer.java +++ b/common/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -7,14 +7,18 @@ import mekanism.api.Coord4D; import mekanism.api.ListUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.inventory.container.ContainerChemicalCrystalizer; +import mekanism.common.inventory.container.ContainerChemicalCrystallizer; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tile.TileEntityChemicalCrystalizer; +import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -29,9 +33,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiChemicalCrystalizer extends GuiMekanism +public class GuiChemicalCrystallizer extends GuiMekanism { - public TileEntityChemicalCrystalizer tileEntity; + public TileEntityChemicalCrystallizer tileEntity; public Gas prevGas; @@ -43,14 +47,14 @@ public class GuiChemicalCrystalizer extends GuiMekanism public List iterStacks = new ArrayList(); - public GuiChemicalCrystalizer(InventoryPlayer inventory, TileEntityChemicalCrystalizer tentity) + public GuiChemicalCrystallizer(InventoryPlayer inventory, TileEntityChemicalCrystallizer tentity) { - super(tentity, new ContainerChemicalCrystalizer(inventory, tentity)); + super(tentity, new ContainerChemicalCrystallizer(inventory, tentity)); tileEntity = tentity; - guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystalizer.png"))); - guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystalizer.png"), 160, 23)); - guiElements.add(new GuiConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystalizer.png"))); + guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 160, 23)); + guiElements.add(new GuiConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() @@ -58,7 +62,17 @@ public class GuiChemicalCrystalizer extends GuiMekanism String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.ENERGY_USAGE); return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } - }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystalizer.png"))); + }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.inputTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 5, 4)); + guiElements.add(new GuiSlot(SlotType.EXTRA, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 5, 64).with(SlotOverlay.PLUS)); + guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 154, 4).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 130, 56)); } @Override @@ -90,18 +104,13 @@ public class GuiChemicalCrystalizer extends GuiMekanism } catch(Exception e) {} } - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5 && yAxis <= 63) - { - drawCreativeTabHoveringText(tileEntity.inputTank.getGas() != null ? tileEntity.inputTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.inputTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystalizer.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; @@ -254,7 +263,7 @@ public class GuiChemicalCrystalizer extends GuiMekanism } } - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystalizer.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png")); drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 4, 16, 59); } diff --git a/common/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/common/mekanism/client/gui/GuiChemicalDissolutionChamber.java index 5d079dfa3..ee3223dea 100644 --- a/common/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/common/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -4,7 +4,11 @@ import java.util.List; import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; @@ -37,6 +41,25 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.injectTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 5, 4)); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.outputTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 133, 13)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 154, 4).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 25, 35)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 154, 24).with(SlotOverlay.PLUS)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"), 5, 64).with(SlotOverlay.MINUS)); } @Override @@ -52,50 +75,24 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); } - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5 && yAxis <= 63) - { - drawCreativeTabHoveringText(tileEntity.injectTank.getGas() != null ? tileEntity.injectTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.injectTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - - if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.outputTank.getGas() != null ? tileEntity.outputTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.outputTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - int xAxis = mouseX - guiWidth; - int yAxis = mouseY - guiHeight; - int displayInt; - displayInt = tileEntity.getScaledEnergyLevel(52); - drawTexturedModalRect(guiWidth + 116, guiHeight + 76, 176, 0, displayInt, 4); - displayInt = tileEntity.getScaledProgress(48); drawTexturedModalRect(guiWidth + 64, guiHeight + 40, 176, 63, displayInt, 8); - if(tileEntity.getScaledInjectGasLevel(58) > 0) - { - displayGauge(6, 5, tileEntity.getScaledInjectGasLevel(58), null, tileEntity.injectTank.getGas()); - } - - if(tileEntity.getScaledOutputGasLevel(58) > 0) - { - displayGauge(134, 14, tileEntity.getScaledOutputGasLevel(58), null, tileEntity.outputTank.getGas()); - } + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } public void displayGauge(int xPos, int yPos, int scale, FluidStack fluid, GasStack gas) diff --git a/common/mekanism/client/gui/GuiChemicalInfuser.java b/common/mekanism/client/gui/GuiChemicalInfuser.java index da8ef2c33..8f1c2f3b0 100644 --- a/common/mekanism/client/gui/GuiChemicalInfuser.java +++ b/common/mekanism/client/gui/GuiChemicalInfuser.java @@ -6,7 +6,11 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -42,6 +46,33 @@ public class GuiChemicalInfuser extends GuiMekanism return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.leftTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 25, 13)); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.rightTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 79, 4)); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.rightTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 133, 13)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 154, 4).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 154, 55).with(SlotOverlay.MINUS)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 4, 55).with(SlotOverlay.MINUS)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 79, 64).with(SlotOverlay.PLUS)); + } @Override @@ -53,68 +84,25 @@ public class GuiChemicalInfuser extends GuiMekanism fontRenderer.drawString(MekanismUtils.localize("gui.chemicalInfuser.short"), 5, 5, 0x404040); fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); - if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) - { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); - } - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.leftTank.getGas() != null ? tileEntity.leftTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.leftTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - - if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.rightTank.getGas() != null ? tileEntity.rightTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.rightTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - - if(xAxis >= 80 && xAxis <= 96 && yAxis >= 5 && yAxis <= 63) - { - drawCreativeTabHoveringText(tileEntity.centerTank.getGas() != null ? tileEntity.centerTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.centerTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - int xAxis = mouseX - guiWidth; - int yAxis = mouseY - guiHeight; - - int displayInt; - - displayInt = tileEntity.getScaledEnergyLevel(52); - drawTexturedModalRect(guiWidth + 116, guiHeight + 76, 176, 0, displayInt, 4); - if(tileEntity.isActive) { drawTexturedModalRect(guiWidth + 47, guiHeight + 39, 176, 71, 28, 8); drawTexturedModalRect(guiWidth + 101, guiHeight + 39, 176, 63, 28, 8); } - if(tileEntity.getScaledLeftGasLevel(58) > 0) - { - displayGauge(26, 14, tileEntity.getScaledLeftGasLevel(58), null, tileEntity.leftTank.getGas()); - } - - if(tileEntity.getScaledRightGasLevel(58) > 0) - { - displayGauge(134, 14, tileEntity.getScaledRightGasLevel(58), null, tileEntity.rightTank.getGas()); - } - - if(tileEntity.getScaledCenterGasLevel(58) > 0) - { - displayGauge(80, 5, tileEntity.getScaledCenterGasLevel(58), null, tileEntity.centerTank.getGas()); - } + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/common/mekanism/client/gui/GuiChemicalOxidizer.java b/common/mekanism/client/gui/GuiChemicalOxidizer.java index 02e0f239b..994f65f49 100644 --- a/common/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/common/mekanism/client/gui/GuiChemicalOxidizer.java @@ -3,15 +3,16 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.ListUtils; -import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.render.MekanismRenderer; +import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -37,6 +38,17 @@ public class GuiChemicalOxidizer extends GuiMekanism return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.gasTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 133, 13)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 154, 4).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 25, 35)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 154, 24).with(SlotOverlay.PLUS)); } @Override @@ -48,24 +60,12 @@ public class GuiChemicalOxidizer extends GuiMekanism fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) - { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); - } - - if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -77,64 +77,9 @@ public class GuiChemicalOxidizer extends GuiMekanism int displayInt; - displayInt = tileEntity.getScaledEnergyLevel(52); - drawTexturedModalRect(guiWidth + 116, guiHeight + 76, 176, 0, displayInt, 4); - displayInt = tileEntity.getScaledProgress(48); drawTexturedModalRect(guiWidth + 64, guiHeight + 40, 176, 63, displayInt + 1, 8); - if(tileEntity.getScaledGasLevel(58) > 0) - { - displayGauge(134, 14, tileEntity.getScaledGasLevel(58), null, tileEntity.gasTank.getGas()); - } - } - - public void displayGauge(int xPos, int yPos, int scale, FluidStack fluid, GasStack gas) - { - if(fluid == null && gas == null) - { - return; - } - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - int start = 0; - - while(true) - { - int renderRemaining = 0; - - if(scale > 16) - { - renderRemaining = 16; - scale -= 16; - } - else { - renderRemaining = scale; - scale = 0; - } - - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - - if(fluid != null) - { - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); - } - else if(gas != null) - { - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, gas.getGas().getIcon(), 16, 16 - (16 - renderRemaining)); - } - - start+=16; - - if(renderRemaining == 0 || scale == 0) - { - break; - } - } - - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png")); - drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 4, 16, 59); + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } } diff --git a/common/mekanism/client/gui/GuiChemicalWasher.java b/common/mekanism/client/gui/GuiChemicalWasher.java index d1bb413b1..85c3c0bb5 100644 --- a/common/mekanism/client/gui/GuiChemicalWasher.java +++ b/common/mekanism/client/gui/GuiChemicalWasher.java @@ -6,7 +6,13 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.GuiGauge.Type; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -17,6 +23,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; @@ -43,77 +50,57 @@ public class GuiChemicalWasher extends GuiMekanism return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); + guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() + { + @Override + public FluidTank getTank() + { + return tileEntity.fluidTank; + } + }, Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"), 5, 4)); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.inputTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 26, 13)); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.outputTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 133, 13)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 154, 4).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"), 154, 55).with(SlotOverlay.MINUS)); + } @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - int xAxis = (mouseX - (width - xSize) / 2); - int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.getInvName(), 45, 4, 0x404040); - if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) - { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); - } - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5 && yAxis <= 63) - { - drawCreativeTabHoveringText(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getLocalizedName() + ": " + tileEntity.fluidTank.getFluidAmount() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - - if(xAxis >= 27 && xAxis <= 43 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.inputTank.getGas() != null ? tileEntity.inputTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.inputTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - - if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.outputTank.getGas() != null ? tileEntity.outputTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.outputTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - int xAxis = mouseX - guiWidth; - int yAxis = mouseY - guiHeight; - - int displayInt; - - displayInt = tileEntity.getScaledEnergyLevel(52); - drawTexturedModalRect(guiWidth + 116, guiHeight + 76, 176, 0, displayInt, 4); - if(tileEntity.isActive) { drawTexturedModalRect(guiWidth + 61, guiHeight + 39, 176, 63, 55, 8); } - if(tileEntity.getScaledFluidLevel(58) > 0) - { - displayGauge(6, 5, tileEntity.getScaledFluidLevel(58), tileEntity.fluidTank.getFluid(), null); - } - - if(tileEntity.getScaledInputGasLevel(58) > 0) - { - displayGauge(27, 14, tileEntity.getScaledInputGasLevel(58), null, tileEntity.inputTank.getGas()); - } - - if(tileEntity.getScaledOutputGasLevel(58) > 0) - { - displayGauge(134, 14, tileEntity.getScaledOutputGasLevel(58), null, tileEntity.outputTank.getGas()); - } + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/common/mekanism/client/gui/GuiDigitalMiner.java b/common/mekanism/client/gui/GuiDigitalMiner.java index cdf9bd2d3..af963b201 100644 --- a/common/mekanism/client/gui/GuiDigitalMiner.java +++ b/common/mekanism/client/gui/GuiDigitalMiner.java @@ -6,6 +6,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerDigitalMiner; @@ -44,6 +46,7 @@ public class GuiDigitalMiner extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); guiElements.add(new GuiUpgradeManagement(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"), 163, 23)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() @@ -53,6 +56,10 @@ public class GuiDigitalMiner extends GuiMekanism } }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"), 151, 5).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"), 143, 26)); + + ySize+=64; } @@ -210,8 +217,6 @@ public class GuiDigitalMiner extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -258,9 +263,12 @@ public class GuiDigitalMiner extends GuiMekanism drawTexturedModalRect(guiWidth + 131, guiHeight + 63, 176 + 4 + 42, 14, 14, 14); } + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + if(xAxis >= 144 && xAxis <= 160 && yAxis >= 27 && yAxis <= 43) { GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -268,8 +276,7 @@ public class GuiDigitalMiner extends GuiMekanism int y = guiHeight + 27; drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glPopAttrib(); GL11.glPopMatrix(); } } diff --git a/common/mekanism/client/gui/GuiElectricMachine.java b/common/mekanism/client/gui/GuiElectricMachine.java index c54157945..84b10f53b 100644 --- a/common/mekanism/client/gui/GuiElectricMachine.java +++ b/common/mekanism/client/gui/GuiElectricMachine.java @@ -4,9 +4,13 @@ import java.util.List; import mekanism.api.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; + import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; @@ -36,6 +40,11 @@ public class GuiElectricMachine extends GuiMekanism return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity, tileEntity.guiLocation)); + + guiElements.add(new GuiSlot(SlotType.INPUT, this, tileEntity, tileEntity.guiLocation, 55, 16)); + guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity, tileEntity.guiLocation, 55, 52).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT_LARGE, this, tileEntity, tileEntity.guiLocation, 111, 30)); + } @Override diff --git a/common/mekanism/client/gui/GuiElectricPump.java b/common/mekanism/client/gui/GuiElectricPump.java index ee9655e2f..31d8494be 100644 --- a/common/mekanism/client/gui/GuiElectricPump.java +++ b/common/mekanism/client/gui/GuiElectricPump.java @@ -1,5 +1,8 @@ package mekanism.client.gui; +import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerElectricPump; import mekanism.common.tile.TileEntityElectricPump; @@ -8,6 +11,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; @@ -26,7 +30,18 @@ public class GuiElectricPump extends GuiMekanism super(new ContainerElectricPump(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, guiLocation, 27, 19)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, guiLocation, 27, 50)); + guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity, guiLocation, 142, 34).with(SlotOverlay.POWER)); guiElements.add(new GuiPowerBar(this, tileEntity, guiLocation, 164, 15)); + guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { + @Override + public FluidTank getTank() + { + return tileEntity.fluidTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, guiLocation, 6, 13)); + } @Override @@ -40,11 +55,6 @@ public class GuiElectricPump extends GuiMekanism fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); fontRenderer.drawString(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getName() + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"), 51, 35, 0x00CD00); - if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getLocalizedName() + ": " + tileEntity.fluidTank.getFluid().amount + "mB" : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/common/mekanism/client/gui/GuiElectrolyticSeparator.java b/common/mekanism/client/gui/GuiElectrolyticSeparator.java index 7bfc161df..dece4904e 100755 --- a/common/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/common/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -9,6 +9,8 @@ import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -66,6 +68,11 @@ public class GuiElectrolyticSeparator extends GuiMekanism } }, GuiGauge.Type.SMALL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 164, 15)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 51)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 34).with(SlotOverlay.POWER)); } @Override diff --git a/common/mekanism/client/gui/GuiEnergyCube.java b/common/mekanism/client/gui/GuiEnergyCube.java index 6354609e2..2b655b03c 100644 --- a/common/mekanism/client/gui/GuiEnergyCube.java +++ b/common/mekanism/client/gui/GuiEnergyCube.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; @@ -21,14 +23,19 @@ public class GuiEnergyCube extends GuiMekanism super(new ContainerEnergyCube(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); + guiElements.add(new GuiEnergyGauge(new IEnergyInfoHandler() + { + @Override + public IStrictEnergyStorage getEnergyStorage() + { + return tileEntity; + } + }, GuiEnergyGauge.Type.WIDE, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"), 55, 18)); } @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - int xAxis = (mouseX - (width - xSize) / 2); - int yAxis = (mouseY - (height - ySize) / 2); - String capacityInfo = MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()); String outputInfo = MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"; @@ -43,18 +50,15 @@ public class GuiEnergyCube extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - int xAxis = mouseX - guiWidth; - int yAxis = mouseY - guiHeight; - int displayInt = tileEntity.getScaledEnergyLevel(72); drawTexturedModalRect(guiWidth + 65, guiHeight + 17, 176, 0, displayInt, 10); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } } diff --git a/common/mekanism/client/gui/GuiEnergyGauge.java b/common/mekanism/client/gui/GuiEnergyGauge.java new file mode 100644 index 000000000..b7af9864f --- /dev/null +++ b/common/mekanism/client/gui/GuiEnergyGauge.java @@ -0,0 +1,44 @@ +package mekanism.client.gui; + +import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.util.ResourceLocation; + +public class GuiEnergyGauge extends GuiGauge +{ + IEnergyInfoHandler infoHandler; + + public GuiEnergyGauge(IEnergyInfoHandler handler, Type type, GuiMekanism gui, TileEntity tile, ResourceLocation def, int x, int y) + { + super(type, gui, tile, def, x, y); + + infoHandler = handler; + } + + @Override + public int getScaledLevel() + { + return (int)(infoHandler.getEnergyStorage().getEnergy()*(height-2) / infoHandler.getEnergyStorage().getMaxEnergy()); + } + + @Override + public Icon getIcon() + { + return MekanismRenderer.energyIcon; + } + + @Override + public String getTooltipText() + { + return infoHandler.getEnergyStorage().getEnergy() > 0 ? MekanismUtils.getEnergyDisplay(infoHandler.getEnergyStorage().getEnergy()) : MekanismUtils.localize("gui.empty"); + } + + public static interface IEnergyInfoHandler + { + public IStrictEnergyStorage getEnergyStorage(); + } +} diff --git a/common/mekanism/client/gui/GuiMetallurgicInfuser.java b/common/mekanism/client/gui/GuiMetallurgicInfuser.java index 6a44d5f8c..afb84b0dc 100644 --- a/common/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/common/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -6,6 +6,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; @@ -33,6 +35,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiUpgradeManagement(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 164, 15)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() @@ -41,6 +44,11 @@ public class GuiMetallurgicInfuser extends GuiMekanism return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); + + guiElements.add(new GuiSlot(SlotType.EXTRA, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 16, 34)); + guiElements.add(new GuiSlot(SlotType.INPUT, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 50, 42)); + guiElements.add(new GuiSlot(SlotType.POWER, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 142, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 108, 42)); } @Override @@ -52,11 +60,6 @@ public class GuiMetallurgicInfuser extends GuiMekanism fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) - { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); - } - if(xAxis >= 7 && xAxis <= 11 && yAxis >= 17 && yAxis <= 69) { drawCreativeTabHoveringText(tileEntity.type != null ? tileEntity.type.getLocalizedName() + ": " + tileEntity.infuseStored : MekanismUtils.localize("gui.empty"), xAxis, yAxis); @@ -68,8 +71,6 @@ public class GuiMetallurgicInfuser extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -84,15 +85,14 @@ public class GuiMetallurgicInfuser extends GuiMekanism displayInt = tileEntity.getScaledProgress(32); drawTexturedModalRect(guiWidth + 72, guiHeight + 47, 176, 52, displayInt + 1, 8); - displayInt = tileEntity.getScaledEnergyLevel(52); - drawTexturedModalRect(guiWidth + 165, guiHeight + 17 + 52 - displayInt, 176, 52 - displayInt, 4, displayInt); - if(tileEntity.type != null) { displayInt = tileEntity.getScaledInfuseLevel(52); mc.renderEngine.bindTexture(tileEntity.type.texture); drawTexturedModalRect(guiWidth + 7, guiHeight + 17 + 52 - displayInt, tileEntity.type.texX, tileEntity.type.texY + 52 - displayInt, 4, displayInt); } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/common/mekanism/client/gui/GuiRotaryCondensentrator.java b/common/mekanism/client/gui/GuiRotaryCondensentrator.java index ff84a235d..ef1f6c962 100644 --- a/common/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/common/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -4,6 +4,11 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -14,6 +19,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; import org.lwjgl.opengl.GL11; @@ -31,6 +37,30 @@ public class GuiRotaryCondensentrator extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 4, 24).with(SlotOverlay.PLUS)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 4, 55).with(SlotOverlay.MINUS)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 154, 24)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 154, 55)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 154, 4).with(SlotOverlay.POWER)); + + guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { + @Override + public FluidTank getTank() + { + return tileEntity.fluidTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 133, 13)); + guiElements.add(new GuiGasGauge(new IGasInfoHandler() { + @Override + public GasTank getTank() + { + return tileEntity.gasTank; + } + }, GuiGauge.Type.STANDARD, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 25, 13)); + + } @Override @@ -42,16 +72,6 @@ public class GuiRotaryCondensentrator extends GuiMekanism fontRenderer.drawString(tileEntity.getInvName(), 26, 4, 0x404040); fontRenderer.drawString(tileEntity.mode == 0 ? MekanismUtils.localize("gui.condensentrating") : MekanismUtils.localize("gui.decondensentrating"), 6, (ySize - 94) + 2, 0x404040); - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - - if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14 && yAxis <= 72) - { - drawCreativeTabHoveringText(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getLocalizedName() + ": " + tileEntity.fluidTank.getFluid().amount + "mB" : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - } - if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); @@ -68,8 +88,6 @@ public class GuiRotaryCondensentrator extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -83,16 +101,6 @@ public class GuiRotaryCondensentrator extends GuiMekanism displayInt = tileEntity.getScaledEnergyLevel(52); drawTexturedModalRect(guiWidth + 116, guiHeight + 76, 176, 36, displayInt, 4); - if(tileEntity.getScaledGasLevel(58) > 0) - { - displayGauge(26, 14, tileEntity.getScaledGasLevel(58), null, tileEntity.gasTank.getGas()); - } - - if(tileEntity.getScaledFluidLevel(58) > 0) - { - displayGauge(134, 14, tileEntity.getScaledFluidLevel(58), tileEntity.fluidTank.getFluid(), null); - } - if(xAxis >= 4 && xAxis <= 22 && yAxis >= 4 && yAxis <= 22) { drawTexturedModalRect(guiWidth + 4, guiHeight + 4, 176, 0, 18, 18); @@ -109,6 +117,8 @@ public class GuiRotaryCondensentrator extends GuiMekanism { drawTexturedModalRect(guiWidth + 64, guiHeight + 39, 176, tileEntity.isActive ? 115 : 99, 48, 8); } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } @Override diff --git a/common/mekanism/client/gui/GuiSeismicVibrator.java b/common/mekanism/client/gui/GuiSeismicVibrator.java index f220585d3..083658bc1 100644 --- a/common/mekanism/client/gui/GuiSeismicVibrator.java +++ b/common/mekanism/client/gui/GuiSeismicVibrator.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; @@ -23,6 +25,8 @@ public class GuiSeismicVibrator extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"), 164, 15)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"), 142, 34).with(SlotOverlay.POWER)); } @Override diff --git a/common/mekanism/client/gui/GuiTeleporter.java b/common/mekanism/client/gui/GuiTeleporter.java index a0476a2ca..709de78b6 100644 --- a/common/mekanism/client/gui/GuiTeleporter.java +++ b/common/mekanism/client/gui/GuiTeleporter.java @@ -3,6 +3,8 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.client.gui.GuiSlot.SlotOverlay; +import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerTeleporter; @@ -26,6 +28,9 @@ public class GuiTeleporter extends GuiMekanism { super(new ContainerTeleporter(inventory, tentity)); tileEntity = tentity; + + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"), 164, 15)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"), 26, 13).with(SlotOverlay.POWER)); } @Override @@ -97,8 +102,6 @@ public class GuiTeleporter extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; @@ -120,6 +123,8 @@ public class GuiTeleporter extends GuiMekanism displayInt = getYAxisForNumber(tileEntity.code.digitFour); drawTexturedModalRect(guiWidth + 140, guiHeight + 44, 176, displayInt, 13, 13); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } public int getIncrementedNumber(int i) diff --git a/common/mekanism/client/model/ModelChemicalCrystalizer.java b/common/mekanism/client/model/ModelChemicalCrystallizer.java similarity index 99% rename from common/mekanism/client/model/ModelChemicalCrystalizer.java rename to common/mekanism/client/model/ModelChemicalCrystallizer.java index a93d272ee..18cc82b80 100644 --- a/common/mekanism/client/model/ModelChemicalCrystalizer.java +++ b/common/mekanism/client/model/ModelChemicalCrystallizer.java @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ModelChemicalCrystalizer extends ModelBase +public class ModelChemicalCrystallizer extends ModelBase { ModelRenderer Base; ModelRenderer IO1; @@ -45,7 +45,7 @@ public class ModelChemicalCrystalizer extends ModelBase ModelRenderer Vial3; ModelRenderer Vial4; - public ModelChemicalCrystalizer() + public ModelChemicalCrystallizer() { textureWidth = 128; textureHeight = 64; diff --git a/common/mekanism/client/nei/ChemicalCrystalizerRecipeHandler.java b/common/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java similarity index 91% rename from common/mekanism/client/nei/ChemicalCrystalizerRecipeHandler.java rename to common/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java index 9261183a3..9cebfb086 100644 --- a/common/mekanism/client/nei/ChemicalCrystalizerRecipeHandler.java +++ b/common/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java @@ -10,17 +10,13 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalCrystalizer; -import mekanism.client.nei.MachineRecipeHandler.CachedIORecipe; +import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -31,7 +27,7 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -public class ChemicalCrystalizerRecipeHandler extends BaseRecipeHandler +public class ChemicalCrystallizerRecipeHandler extends BaseRecipeHandler { private int ticksPassed; @@ -41,35 +37,35 @@ public class ChemicalCrystalizerRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock2.ChemicalCrystalizer.name"); + return MekanismUtils.localize("tile.MachineBlock2.ChemicalCrystallizer.name"); } @Override public String getOverlayIdentifier() { - return "chemicalcrystalizer"; + return "chemicalcrystallizer"; } @Override public String getGuiTexture() { - return "mekanism:gui/nei/GuiChemicalCrystalizer.png"; + return "mekanism:gui/nei/GuiChemicalCrystallizer.png"; } @Override public Class getGuiClass() { - return GuiChemicalCrystalizer.class; + return GuiChemicalCrystallizer.class; } public String getRecipeId() { - return "mekanism.chemicalcrystalizer"; + return "mekanism.chemicalcrystallizer"; } public Set> getRecipes() { - return Recipe.CHEMICAL_CRYSTALIZER.get().entrySet(); + return Recipe.CHEMICAL_CRYSTALLIZER.get().entrySet(); } @Override diff --git a/common/mekanism/client/nei/NEIMekanismConfig.java b/common/mekanism/client/nei/NEIMekanismConfig.java index 24fab88e0..017920404 100644 --- a/common/mekanism/client/nei/NEIMekanismConfig.java +++ b/common/mekanism/client/nei/NEIMekanismConfig.java @@ -1,6 +1,6 @@ package mekanism.client.nei; -import mekanism.client.gui.GuiChemicalCrystalizer; +import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.client.gui.GuiChemicalInfuser; import mekanism.client.gui.GuiChemicalInjectionChamber; @@ -73,8 +73,8 @@ public class NEIMekanismConfig implements IConfigureNEI API.registerRecipeHandler(new ChemicalWasherRecipeHandler()); API.registerUsageHandler(new ChemicalWasherRecipeHandler()); - API.registerRecipeHandler(new ChemicalCrystalizerRecipeHandler()); - API.registerUsageHandler(new ChemicalCrystalizerRecipeHandler()); + API.registerRecipeHandler(new ChemicalCrystallizerRecipeHandler()); + API.registerUsageHandler(new ChemicalCrystallizerRecipeHandler()); API.setGuiOffset(GuiEnrichmentChamber.class, 16, 6); API.setGuiOffset(GuiOsmiumCompressor.class, 16, 6); @@ -91,7 +91,7 @@ public class NEIMekanismConfig implements IConfigureNEI API.setGuiOffset(GuiSalinationController.class, SalinationControllerRecipeHandler.xOffset, SalinationControllerRecipeHandler.yOffset); API.setGuiOffset(GuiChemicalDissolutionChamber.class, ChemicalDissolutionChamberRecipeHandler.xOffset, ChemicalDissolutionChamberRecipeHandler.yOffset); API.setGuiOffset(GuiChemicalWasher.class, ChemicalWasherRecipeHandler.xOffset, ChemicalWasherRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalCrystalizer.class, ChemicalCrystalizerRecipeHandler.xOffset, ChemicalCrystalizerRecipeHandler.yOffset); + API.setGuiOffset(GuiChemicalCrystallizer.class, ChemicalCrystallizerRecipeHandler.xOffset, ChemicalCrystallizerRecipeHandler.yOffset); API.hideItem(Mekanism.boundingBlockID); API.hideItem(Mekanism.ItemProxy.itemID); diff --git a/common/mekanism/client/render/block/MachineRenderingHandler.java b/common/mekanism/client/render/block/MachineRenderingHandler.java index 28d554904..d8c33f3f0 100644 --- a/common/mekanism/client/render/block/MachineRenderingHandler.java +++ b/common/mekanism/client/render/block/MachineRenderingHandler.java @@ -2,7 +2,7 @@ package mekanism.client.render.block; import mekanism.client.ClientProxy; import mekanism.client.model.ModelChargepad; -import mekanism.client.model.ModelChemicalCrystalizer; +import mekanism.client.model.ModelChemicalCrystallizer; import mekanism.client.model.ModelChemicalDissolutionChamber; import mekanism.client.model.ModelChemicalInfuser; import mekanism.client.model.ModelChemicalOxidizer; @@ -42,7 +42,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelElectrolyticSeparator electrolyticSeparator = new ModelElectrolyticSeparator(); public ModelChemicalDissolutionChamber chemicalDissolutionChamber = new ModelChemicalDissolutionChamber(); public ModelChemicalWasher chemicalWasher = new ModelChemicalWasher(); - public ModelChemicalCrystalizer chemicalCrystalizer = new ModelChemicalCrystalizer(); + public ModelChemicalCrystallizer chemicalCrystallizer = new ModelChemicalCrystallizer(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -145,13 +145,13 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); chemicalWasher.render(0.0625F); } - else if(type == MachineType.CHEMICAL_CRYSTALIZER) + else if(type == MachineType.CHEMICAL_CRYSTALLIZER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystalizer.png")); - chemicalCrystalizer.render(0.0625F); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); + chemicalCrystallizer.render(0.0625F); } else { MekanismRenderer.renderItem(renderer, metadata, block); diff --git a/common/mekanism/client/render/tileentity/RenderChemicalCrystalizer.java b/common/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java similarity index 74% rename from common/mekanism/client/render/tileentity/RenderChemicalCrystalizer.java rename to common/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 07754f23d..73f91d754 100644 --- a/common/mekanism/client/render/tileentity/RenderChemicalCrystalizer.java +++ b/common/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -1,8 +1,8 @@ package mekanism.client.render.tileentity; -import mekanism.client.model.ModelChemicalCrystalizer; +import mekanism.client.model.ModelChemicalCrystallizer; import mekanism.client.render.MekanismRenderer; -import mekanism.common.tile.TileEntityChemicalCrystalizer; +import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -14,21 +14,21 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderChemicalCrystalizer extends TileEntitySpecialRenderer +public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { - private ModelChemicalCrystalizer model = new ModelChemicalCrystalizer(); + private ModelChemicalCrystallizer model = new ModelChemicalCrystallizer(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - renderAModelAt((TileEntityChemicalCrystalizer)tileEntity, x, y, z, partialTick); + renderAModelAt((TileEntityChemicalCrystallizer)tileEntity, x, y, z, partialTick); } - private void renderAModelAt(TileEntityChemicalCrystalizer tileEntity, double x, double y, double z, float partialTick) + private void renderAModelAt(TileEntityChemicalCrystallizer tileEntity, double x, double y, double z, float partialTick) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystalizer.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index ebf7cbfcc..6310ced81 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -6,7 +6,7 @@ import mekanism.api.MekanismAPI; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerChanceMachine; -import mekanism.common.inventory.container.ContainerChemicalCrystalizer; +import mekanism.common.inventory.container.ContainerChemicalCrystallizer; import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.inventory.container.ContainerChemicalOxidizer; @@ -38,7 +38,7 @@ import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.tile.TileEntityChargepad; -import mekanism.common.tile.TileEntityChemicalCrystalizer; +import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInjectionChamber; @@ -70,8 +70,6 @@ import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySalinationController; -import mekanism.common.tile.TileEntitySalinationTank; -import mekanism.common.tile.TileEntitySalinationValve; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.block.Block; @@ -129,7 +127,7 @@ public class CommonProxy GameRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill"); GameRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber"); GameRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher"); - GameRegistry.registerTileEntity(TileEntityChemicalCrystalizer.class, "ChemicalCrystalizer"); + GameRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer"); GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); GameRegistry.registerTileEntity(TileEntityPlasticBlock.class, "PlasticBlock"); } @@ -247,7 +245,7 @@ public class CommonProxy Mekanism.precisionSawmillUsage = Mekanism.configuration.get("usage", "PrecisionSawmillUsage", 50D).getDouble(50D); Mekanism.chemicalDissolutionChamberUsage = Mekanism.configuration.get("usage", "ChemicalDissolutionChamberUsage", 400D).getDouble(400D); Mekanism.chemicalWasherUsage = Mekanism.configuration.get("usage", "ChemicalWasherUsage", 200D).getDouble(200D); - Mekanism.chemicalCrystalizerUsage = Mekanism.configuration.get("usage", "ChemicalCrystalizerUsage", 400D).getDouble(400D); + Mekanism.chemicalCrystallizerUsage = Mekanism.configuration.get("usage", "ChemicalCrystallizerUsage", 400D).getDouble(400D); Mekanism.seismicVibratorUsage = Mekanism.configuration.get("usage", "SeismicVibratorUsage", 50D).getDouble(50D); Mekanism.pressurizedReactionBaseUsage = Mekanism.configuration.get("usage", "PressurizedReactionBaseUsage", 5D).getDouble(5D); Mekanism.configuration.save(); @@ -398,7 +396,7 @@ public class CommonProxy case 36: return new ContainerChemicalWasher(player.inventory, (TileEntityChemicalWasher)tileEntity); case 37: - return new ContainerChemicalCrystalizer(player.inventory, (TileEntityChemicalCrystalizer)tileEntity); + return new ContainerChemicalCrystallizer(player.inventory, (TileEntityChemicalCrystallizer)tileEntity); case 39: return new ContainerSeismicVibrator(player.inventory, (TileEntitySeismicVibrator)tileEntity); case 40: diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index bf62123c7..2e97671d9 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -132,7 +132,6 @@ import mekanism.common.transporter.TransporterManager; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.voice.VoiceServerManager; -import mekanism.generators.common.MekanismGenerators; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -154,7 +153,6 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import rebelkeithy.mods.metallurgy.api.IOreInfo; import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; import codechicken.multipart.handler.MultipartProxy; -import scala.tools.nsc.backend.icode.Primitives; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.IFuelHandler; @@ -365,7 +363,7 @@ public class Mekanism public static double precisionSawmillUsage; public static double chemicalDissolutionChamberUsage; public static double chemicalWasherUsage; - public static double chemicalCrystalizerUsage; + public static double chemicalCrystallizerUsage; public static double seismicVibratorUsage; public static double pressurizedReactionBaseUsage; @@ -819,7 +817,7 @@ public class Mekanism OreGas oreGas = (OreGas)gas; RecipeHandler.addChemicalWasherRecipe(new GasStack(oreGas, 1), new GasStack(oreGas.getCleanGas(), 1)); - RecipeHandler.addChemicalCrystalizerRecipe(new GasStack(oreGas.getCleanGas(), 200), new ItemStack(Crystal, 1, Resource.getFromName(oreGas.getName()).ordinal())); + RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(oreGas.getCleanGas(), 200), new ItemStack(Crystal, 1, Resource.getFromName(oreGas.getName()).ordinal())); } } diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java index 114b040ba..62c106b57 100644 --- a/common/mekanism/common/block/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -29,7 +29,7 @@ import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityChargepad; -import mekanism.common.tile.TileEntityChemicalCrystalizer; +import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInjectionChamber; @@ -111,7 +111,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:5: Precision Sawmill * 1:6: Chemical Dissolution Chamber * 1:7: Chemical Washer - * 1:8: Chemical Crystalizer + * 1:8: Chemical Crystallizer * 1:9: Seismic Vibrator * 1:10: Pressurized Reaction Chamber * @author AidanBrady @@ -1150,7 +1150,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds PRECISION_SAWMILL(Mekanism.machineBlock2ID, 5, "PrecisionSawmill", 34, Mekanism.precisionSawmillUsage*400, TileEntityPrecisionSawmill.class, false, true), CHEMICAL_DISSOLUTION_CHAMBER(Mekanism.machineBlock2ID, 6, "ChemicalDissolutionChamber", 35, 20000, TileEntityChemicalDissolutionChamber.class, true, false), CHEMICAL_WASHER(Mekanism.machineBlock2ID, 7, "ChemicalWasher", 36, 20000, TileEntityChemicalWasher.class, true, false), - CHEMICAL_CRYSTALIZER(Mekanism.machineBlock2ID, 8, "ChemicalCrystalizer", 37, 20000, TileEntityChemicalCrystalizer.class, true, false), + CHEMICAL_CRYSTALLIZER(Mekanism.machineBlock2ID, 8, "ChemicalCrystallizer", 37, 20000, TileEntityChemicalCrystallizer.class, true, false), SEISMIC_VIBRATOR(Mekanism.machineBlock2ID, 9, "SeismicVibrator", 39, 20000, TileEntitySeismicVibrator.class, false, false), PRESSURIZED_REACTION_CHAMBER(Mekanism.machineBlock2ID, 10, "PressurizedReactionChamber", 40, 20000, TileEntityPRC.class, false, false); diff --git a/common/mekanism/common/inventory/container/ContainerChemicalCrystalizer.java b/common/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java similarity index 87% rename from common/mekanism/common/inventory/container/ContainerChemicalCrystalizer.java rename to common/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java index 784855090..088f01d5d 100644 --- a/common/mekanism/common/inventory/container/ContainerChemicalCrystalizer.java +++ b/common/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java @@ -4,9 +4,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.tile.TileEntityChemicalCrystalizer; +import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -14,14 +12,14 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class ContainerChemicalCrystalizer extends Container +public class ContainerChemicalCrystallizer extends Container { - private TileEntityChemicalCrystalizer tileEntity; + private TileEntityChemicalCrystallizer tileEntity; - public ContainerChemicalCrystalizer(InventoryPlayer inventory, TileEntityChemicalCrystalizer tentity) + public ContainerChemicalCrystallizer(InventoryPlayer inventory, TileEntityChemicalCrystallizer tentity) { tileEntity = tentity; - addSlotToContainer(new SlotStorageTank(tentity, null, true, 0, 6, 65)); + addSlotToContainer(new SlotStorageTank(tentity, 0, 6, 65)); addSlotToContainer(new SlotOutput(tentity, 1, 131, 57)); addSlotToContainer(new SlotDischarge(tentity, 2, 155, 5)); diff --git a/common/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java b/common/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java index e1cccf64c..fc2626f57 100644 --- a/common/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java +++ b/common/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java @@ -20,9 +20,9 @@ public class ContainerChemicalDissolutionChamber extends Container public ContainerChemicalDissolutionChamber(InventoryPlayer inventory, TileEntityChemicalDissolutionChamber tentity) { tileEntity = tentity; - addSlotToContainer(new SlotStorageTank(tentity, null, true, 0, 6, 65)); + addSlotToContainer(new SlotStorageTank(tentity, 0, 6, 65)); addSlotToContainer(new Slot(tentity, 1, 26, 36)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 2, 155, 25)); + addSlotToContainer(new SlotStorageTank(tentity, 2, 155, 25)); addSlotToContainer(new SlotDischarge(tentity, 3, 155, 5)); int slotY; diff --git a/common/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/common/mekanism/common/inventory/container/ContainerChemicalInfuser.java index 6ede69ca5..f32f8e938 100644 --- a/common/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/common/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -19,9 +19,9 @@ public class ContainerChemicalInfuser extends Container public ContainerChemicalInfuser(InventoryPlayer inventory, TileEntityChemicalInfuser tentity) { tileEntity = tentity; - addSlotToContainer(new SlotStorageTank(tentity, null, true, 0, 5, 56)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 1, 155, 56)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 2, 80, 65)); + addSlotToContainer(new SlotStorageTank(tentity, 0, 5, 56)); + addSlotToContainer(new SlotStorageTank(tentity, 1, 155, 56)); + addSlotToContainer(new SlotStorageTank(tentity, 2, 80, 65)); addSlotToContainer(new SlotDischarge(tentity, 3, 155, 5)); int slotX; diff --git a/common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index 7e5397e19..2a95b387d 100644 --- a/common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -22,7 +22,7 @@ public class ContainerChemicalOxidizer extends Container tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, 26, 36)); addSlotToContainer(new SlotDischarge(tentity, 1, 155, 5)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 2, 155, 25)); + addSlotToContainer(new SlotStorageTank(tentity, 2, 155, 25)); int slotX; diff --git a/common/mekanism/common/inventory/container/ContainerChemicalWasher.java b/common/mekanism/common/inventory/container/ContainerChemicalWasher.java index cac25a0b4..a90536883 100644 --- a/common/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/common/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -23,7 +23,7 @@ public class ContainerChemicalWasher extends Container tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, -20, 9)); addSlotToContainer(new SlotOutput(tentity, 1, -20, 40)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 2, 155, 56)); + addSlotToContainer(new SlotStorageTank(tentity, 2, 155, 56)); addSlotToContainer(new SlotDischarge(tentity, 3, 155, 5)); int slotY; diff --git a/common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index e6b4bffaf..2e9f79d54 100644 --- a/common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -21,8 +21,8 @@ public class ContainerElectrolyticSeparator extends Container { tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, 26, 35)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 1, 59, 52)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 2, 101, 52)); + addSlotToContainer(new SlotStorageTank(tentity, 1, 59, 52)); + addSlotToContainer(new SlotStorageTank(tentity, 2, 101, 52)); addSlotToContainer(new SlotDischarge(tentity, 3, 143, 35)); int slotX; diff --git a/common/mekanism/common/inventory/container/ContainerGasTank.java b/common/mekanism/common/inventory/container/ContainerGasTank.java index d59b87041..a3fa0640e 100644 --- a/common/mekanism/common/inventory/container/ContainerGasTank.java +++ b/common/mekanism/common/inventory/container/ContainerGasTank.java @@ -16,8 +16,8 @@ public class ContainerGasTank extends Container public ContainerGasTank(InventoryPlayer inventory, TileEntityGasTank tentity) { tileEntity = tentity; - addSlotToContainer(new SlotStorageTank(tentity, null, true, 0, 8, 8)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 1, 8, 40)); + addSlotToContainer(new SlotStorageTank(tentity, 0, 8, 8)); + addSlotToContainer(new SlotStorageTank(tentity, 1, 8, 40)); int slotX; diff --git a/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index ee427a5a4..d034e199c 100644 --- a/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -20,8 +20,8 @@ public class ContainerRotaryCondensentrator extends Container public ContainerRotaryCondensentrator(InventoryPlayer inventory, TileEntityRotaryCondensentrator tentity) { tileEntity = tentity; - addSlotToContainer(new SlotStorageTank(tentity, null, true, 0, 5, 25)); - addSlotToContainer(new SlotStorageTank(tentity, null, true, 1, 5, 56)); + addSlotToContainer(new SlotStorageTank(tentity, 0, 5, 25)); + addSlotToContainer(new SlotStorageTank(tentity, 1, 5, 56)); addSlotToContainer(new Slot(tentity, 2, 155, 25)); addSlotToContainer(new SlotOutput(tentity, 3, 155, 56)); addSlotToContainer(new SlotDischarge(tentity, 4, 155, 5)); diff --git a/common/mekanism/common/inventory/container/ContainerSeismicVibrator.java b/common/mekanism/common/inventory/container/ContainerSeismicVibrator.java index ce279f853..cefc5b172 100644 --- a/common/mekanism/common/inventory/container/ContainerSeismicVibrator.java +++ b/common/mekanism/common/inventory/container/ContainerSeismicVibrator.java @@ -16,7 +16,7 @@ public class ContainerSeismicVibrator extends Container public ContainerSeismicVibrator(InventoryPlayer inventory, TileEntitySeismicVibrator tentity) { tileEntity = tentity; - addSlotToContainer(new SlotDischarge(tentity, 0, 27, 14)); + addSlotToContainer(new SlotDischarge(tentity, 0, 143, 35)); int slotX; for(slotX = 0; slotX < 3; ++slotX) diff --git a/common/mekanism/common/inventory/slot/SlotStorageTank.java b/common/mekanism/common/inventory/slot/SlotStorageTank.java index a5df00388..eed145d7b 100644 --- a/common/mekanism/common/inventory/slot/SlotStorageTank.java +++ b/common/mekanism/common/inventory/slot/SlotStorageTank.java @@ -14,6 +14,13 @@ public class SlotStorageTank extends Slot public Collection types; public boolean acceptsAllGasses; + public SlotStorageTank(IInventory inventory, int index, int x, int y) + { + super(inventory, index, x, y); + types = null; + acceptsAllGasses = true; + } + public SlotStorageTank(IInventory inventory, Gas gas, boolean all, int index, int x, int y) { super(inventory, index, x, y); diff --git a/common/mekanism/common/item/ItemBlockMachine.java b/common/mekanism/common/item/ItemBlockMachine.java index 470f8115f..53014105f 100644 --- a/common/mekanism/common/item/ItemBlockMachine.java +++ b/common/mekanism/common/item/ItemBlockMachine.java @@ -78,7 +78,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:5: Precision Sawmill * 1:6: Chemical Dissolution Chamber * 1:7: Chemical Washer - * 1:8: Chemical Crystalizer + * 1:8: Chemical Crystallizer * @author AidanBrady * */ diff --git a/common/mekanism/common/network/PacketConfigSync.java b/common/mekanism/common/network/PacketConfigSync.java index 4e1e29f4e..15c4d6e77 100644 --- a/common/mekanism/common/network/PacketConfigSync.java +++ b/common/mekanism/common/network/PacketConfigSync.java @@ -72,7 +72,7 @@ public class PacketConfigSync implements IMekanismPacket Mekanism.precisionSawmillUsage = dataStream.readDouble(); Mekanism.chemicalDissolutionChamberUsage = dataStream.readDouble(); Mekanism.chemicalWasherUsage = dataStream.readDouble(); - Mekanism.chemicalCrystalizerUsage = dataStream.readDouble(); + Mekanism.chemicalCrystallizerUsage = dataStream.readDouble(); Mekanism.seismicVibratorUsage = dataStream.readDouble(); for(IModule module : Mekanism.modulesLoaded) @@ -129,7 +129,7 @@ public class PacketConfigSync implements IMekanismPacket dataStream.writeDouble(Mekanism.precisionSawmillUsage); dataStream.writeDouble(Mekanism.chemicalDissolutionChamberUsage); dataStream.writeDouble(Mekanism.chemicalWasherUsage); - dataStream.writeDouble(Mekanism.chemicalCrystalizerUsage); + dataStream.writeDouble(Mekanism.chemicalCrystallizerUsage); dataStream.writeDouble(Mekanism.seismicVibratorUsage); for(IModule module : Mekanism.modulesLoaded) diff --git a/common/mekanism/common/recipe/RecipeHandler.java b/common/mekanism/common/recipe/RecipeHandler.java index 3e39faf13..31d5449e5 100644 --- a/common/mekanism/common/recipe/RecipeHandler.java +++ b/common/mekanism/common/recipe/RecipeHandler.java @@ -2,7 +2,6 @@ package mekanism.common.recipe; import java.util.HashMap; import java.util.Map; -import java.util.Map.Entry; import mekanism.api.AdvancedInput; import mekanism.api.ChanceOutput; @@ -10,7 +9,6 @@ import mekanism.api.ChemicalPair; import mekanism.api.PressurizedProducts; import mekanism.api.PressurizedReactants; import mekanism.api.PressurizedRecipe; -import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -18,7 +16,6 @@ import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionOutput; import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -166,13 +163,13 @@ public final class RecipeHandler } /** - * Add a Chemical Crystalizer recipe. + * Add a Chemical Crystallizer recipe. * @param input - input GasStack * @param output - output ItemStack */ - public static void addChemicalCrystalizerRecipe(GasStack input, ItemStack output) + public static void addChemicalCrystallizerRecipe(GasStack input, ItemStack output) { - Recipe.CHEMICAL_CRYSTALIZER.put(input, output); + Recipe.CHEMICAL_CRYSTALLIZER.put(input, output); } /** @@ -256,18 +253,18 @@ public final class RecipeHandler } /** - * Gets the Chemical Crystalizer ItemStack output of the defined GasTank input. + * Gets the Chemical Crystallizer ItemStack output of the defined GasTank input. * @param gasTank - input GasTank * @param removeGas - whether or not to use gas in the gas tank * @return output ItemStack */ - public static ItemStack getChemicalCrystalizerOutput(GasTank gasTank, boolean removeGas) + public static ItemStack getChemicalCrystallizerOutput(GasTank gasTank, boolean removeGas) { GasStack gas = gasTank.getGas(); if(gas != null) { - HashMap recipes = Recipe.CHEMICAL_CRYSTALIZER.get(); + HashMap recipes = Recipe.CHEMICAL_CRYSTALLIZER.get(); for(Map.Entry entry : recipes.entrySet()) { @@ -521,7 +518,7 @@ public final class RecipeHandler PRECISION_SAWMILL(new HashMap()), CHEMICAL_DISSOLUTION_CHAMBER(new HashMap()), CHEMICAL_WASHER(new HashMap()), - CHEMICAL_CRYSTALIZER(new HashMap()), + CHEMICAL_CRYSTALLIZER(new HashMap()), PRESSURIZED_REACTION_CHAMBER(new HashMap()); private HashMap recipes; diff --git a/common/mekanism/common/tile/TileEntityChemicalCrystalizer.java b/common/mekanism/common/tile/TileEntityChemicalCrystallizer.java similarity index 94% rename from common/mekanism/common/tile/TileEntityChemicalCrystalizer.java rename to common/mekanism/common/tile/TileEntityChemicalCrystallizer.java index deac9b843..6257ddedf 100644 --- a/common/mekanism/common/tile/TileEntityChemicalCrystalizer.java +++ b/common/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -37,7 +37,7 @@ import net.minecraftforge.fluids.FluidRegistry; import com.google.common.io.ByteArrayDataInput; -public class TileEntityChemicalCrystalizer extends TileEntityElectricBlock implements IActiveState, IGasHandler, ITubeConnection, IRedstoneControl, IHasSound, IInvConfiguration +public class TileEntityChemicalCrystallizer extends TileEntityElectricBlock implements IActiveState, IGasHandler, ITubeConnection, IRedstoneControl, IHasSound, IInvConfiguration { public static final int MAX_GAS = 10000; public static final int MAX_FLUID = 10000; @@ -68,16 +68,16 @@ public class TileEntityChemicalCrystalizer extends TileEntityElectricBlock imple public float spin; - public final double ENERGY_USAGE = Mekanism.chemicalCrystalizerUsage; + public final double ENERGY_USAGE = Mekanism.chemicalCrystallizerUsage; /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; public TileComponentEjector ejectorComponent; - public TileEntityChemicalCrystalizer() + public TileEntityChemicalCrystallizer() { - super("ChemicalCrystalizer", MachineType.CHEMICAL_CRYSTALIZER.baseEnergy); + super("ChemicalCrystallizer", MachineType.CHEMICAL_CRYSTALLIZER.baseEnergy); sideOutputs.add(new SideData(EnumColor.GREY, InventoryUtils.EMPTY)); sideOutputs.add(new SideData(EnumColor.PURPLE, new int[] {0})); @@ -166,7 +166,7 @@ public class TileEntityChemicalCrystalizer extends TileEntityElectricBlock imple return false; } - ItemStack itemstack = RecipeHandler.getChemicalCrystalizerOutput(inputTank, false); + ItemStack itemstack = RecipeHandler.getChemicalCrystallizerOutput(inputTank, false); if(itemstack == null) { @@ -189,7 +189,7 @@ public class TileEntityChemicalCrystalizer extends TileEntityElectricBlock imple public void operate() { - ItemStack itemstack = RecipeHandler.getChemicalCrystalizerOutput(inputTank, true); + ItemStack itemstack = RecipeHandler.getChemicalCrystallizerOutput(inputTank, true); if(inventory[1] == null) { @@ -461,7 +461,7 @@ public class TileEntityChemicalCrystalizer extends TileEntityElectricBlock imple @Override public String getSoundPath() { - return "ChemicalCrystalizer.ogg"; + return "ChemicalCrystallizer.ogg"; } @Override diff --git a/resources/assets/mekanism/gui/GuiChamber.png b/resources/assets/mekanism/gui/GuiChamber.png index c127fff17..7af0c041c 100644 Binary files a/resources/assets/mekanism/gui/GuiChamber.png and b/resources/assets/mekanism/gui/GuiChamber.png differ diff --git a/resources/assets/mekanism/gui/GuiChemicalCrystalizer.png b/resources/assets/mekanism/gui/GuiChemicalCrystalizer.png deleted file mode 100644 index 7d04f546a..000000000 Binary files a/resources/assets/mekanism/gui/GuiChemicalCrystalizer.png and /dev/null differ diff --git a/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png b/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png new file mode 100644 index 000000000..edaa31b24 Binary files /dev/null and b/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png differ diff --git a/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png b/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png index 6f490983a..ceb27bc6d 100644 Binary files a/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png and b/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png differ diff --git a/resources/assets/mekanism/gui/GuiChemicalInfuser.png b/resources/assets/mekanism/gui/GuiChemicalInfuser.png index 0b6e1f669..c760fe6d7 100644 Binary files a/resources/assets/mekanism/gui/GuiChemicalInfuser.png and b/resources/assets/mekanism/gui/GuiChemicalInfuser.png differ diff --git a/resources/assets/mekanism/gui/GuiChemicalInjectionChamber.png b/resources/assets/mekanism/gui/GuiChemicalInjectionChamber.png index 2654f9c45..0d353fbd0 100644 Binary files a/resources/assets/mekanism/gui/GuiChemicalInjectionChamber.png and b/resources/assets/mekanism/gui/GuiChemicalInjectionChamber.png differ diff --git a/resources/assets/mekanism/gui/GuiChemicalOxidizer.png b/resources/assets/mekanism/gui/GuiChemicalOxidizer.png index 34238c8d4..acd11f5ba 100644 Binary files a/resources/assets/mekanism/gui/GuiChemicalOxidizer.png and b/resources/assets/mekanism/gui/GuiChemicalOxidizer.png differ diff --git a/resources/assets/mekanism/gui/GuiChemicalWasher.png b/resources/assets/mekanism/gui/GuiChemicalWasher.png index f72078b1f..3a0f79009 100644 Binary files a/resources/assets/mekanism/gui/GuiChemicalWasher.png and b/resources/assets/mekanism/gui/GuiChemicalWasher.png differ diff --git a/resources/assets/mekanism/gui/GuiCombiner.png b/resources/assets/mekanism/gui/GuiCombiner.png index fca5d114d..d407ad292 100644 Binary files a/resources/assets/mekanism/gui/GuiCombiner.png and b/resources/assets/mekanism/gui/GuiCombiner.png differ diff --git a/resources/assets/mekanism/gui/GuiCompressor.png b/resources/assets/mekanism/gui/GuiCompressor.png index 85a099c63..d834f11f6 100644 Binary files a/resources/assets/mekanism/gui/GuiCompressor.png and b/resources/assets/mekanism/gui/GuiCompressor.png differ diff --git a/resources/assets/mekanism/gui/GuiCrusher.png b/resources/assets/mekanism/gui/GuiCrusher.png index 7354719d0..faaf37b35 100644 Binary files a/resources/assets/mekanism/gui/GuiCrusher.png and b/resources/assets/mekanism/gui/GuiCrusher.png differ diff --git a/resources/assets/mekanism/gui/GuiDigitalMiner.png b/resources/assets/mekanism/gui/GuiDigitalMiner.png index 6f21c8011..7d2068151 100644 Binary files a/resources/assets/mekanism/gui/GuiDigitalMiner.png and b/resources/assets/mekanism/gui/GuiDigitalMiner.png differ diff --git a/resources/assets/mekanism/gui/GuiElectricPump.png b/resources/assets/mekanism/gui/GuiElectricPump.png index 22e743384..e7aac4b6f 100644 Binary files a/resources/assets/mekanism/gui/GuiElectricPump.png and b/resources/assets/mekanism/gui/GuiElectricPump.png differ diff --git a/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png b/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png index 685009942..f9e64f7db 100644 Binary files a/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png and b/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png differ diff --git a/resources/assets/mekanism/gui/GuiEnergizedSmelter.png b/resources/assets/mekanism/gui/GuiEnergizedSmelter.png index e3cdb34ba..0d385c9f6 100644 Binary files a/resources/assets/mekanism/gui/GuiEnergizedSmelter.png and b/resources/assets/mekanism/gui/GuiEnergizedSmelter.png differ diff --git a/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png b/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png index 289b2994a..3f5ee95b7 100644 Binary files a/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png and b/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png differ diff --git a/resources/assets/mekanism/gui/GuiPrecisionSawmill.png b/resources/assets/mekanism/gui/GuiPrecisionSawmill.png index fba215836..62b8b8e82 100644 Binary files a/resources/assets/mekanism/gui/GuiPrecisionSawmill.png and b/resources/assets/mekanism/gui/GuiPrecisionSawmill.png differ diff --git a/resources/assets/mekanism/gui/GuiPurificationChamber.png b/resources/assets/mekanism/gui/GuiPurificationChamber.png index 85a099c63..90a1bde20 100644 Binary files a/resources/assets/mekanism/gui/GuiPurificationChamber.png and b/resources/assets/mekanism/gui/GuiPurificationChamber.png differ diff --git a/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png b/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png index 3b160c3b7..2861f2ad7 100644 Binary files a/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png and b/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png differ diff --git a/resources/assets/mekanism/gui/GuiSeismicVibrator.png b/resources/assets/mekanism/gui/GuiSeismicVibrator.png index 0e5e0f570..9d7922849 100644 Binary files a/resources/assets/mekanism/gui/GuiSeismicVibrator.png and b/resources/assets/mekanism/gui/GuiSeismicVibrator.png differ diff --git a/resources/assets/mekanism/gui/GuiTeleporter.png b/resources/assets/mekanism/gui/GuiTeleporter.png index 10d7713d7..b0dd326be 100644 Binary files a/resources/assets/mekanism/gui/GuiTeleporter.png and b/resources/assets/mekanism/gui/GuiTeleporter.png differ diff --git a/resources/assets/mekanism/gui/nei/GuiChemicalCrystalizer.png b/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png similarity index 100% rename from resources/assets/mekanism/gui/nei/GuiChemicalCrystalizer.png rename to resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png diff --git a/resources/assets/mekanism/lang/de_DE.lang b/resources/assets/mekanism/lang/de_DE.lang index 3de4c1009..261128bbd 100644 --- a/resources/assets/mekanism/lang/de_DE.lang +++ b/resources/assets/mekanism/lang/de_DE.lang @@ -91,7 +91,7 @@ tile.MachineBlock2.ElectrolyticSeparator.name=Elektrolytischer Separator tile.MachineBlock2.PrecisionSawmill.name=Präzisionssägewerk tile.MachineBlock2.ChemicalDissolutionChamber.name=Chemische Auflösungskammer tile.MachineBlock2.ChemicalWasher.name=Chemische Waschanlage -tile.MachineBlock2.ChemicalCrystalizer.name=Chemischer Kristallisierer +tile.MachineBlock2.ChemicalCrystallizer.name=Chemischer Kristallisierer tile.MachineBlock2.SeismicVibrator.name=Seismischer Vibrator //Infuse types @@ -410,7 +410,7 @@ tooltip.ElectrolyticSeparator=Eine Maschine, die den Prozess der Elektrolyse nut tooltip.PrecisionSawmill=Eine Maschine, genutzt, um Baumstämme und andere !nhölzerne Dinge effizienter zu verarbeiten und um Sägemehl zu bekommen. tooltip.ChemicalDissolutionChamber=Eine ultimative Maschine, genutzt, !num jegliche Unreinheiten in einem Erz aufzulösen, !nwas unverarbeiteten Schlamm zurücklässt. tooltip.ChemicalWasher=Eine ultimative Maschine, die unverarbeiteten Schlamm !nsäubert und ihn für die Kristallisierung vorbereitet. -tooltip.ChemicalCrystalizer=Eine ultimative Maschine, genutzt, um!n Purifizierten Erzschlamm zu Erzkristallen zu verarbeiten. +tooltip.ChemicalCrystallizer=Eine ultimative Maschine, genutzt, um!n Purifizierten Erzschlamm zu Erzkristallen zu verarbeiten. tooltip.OsmiumOre=Ein hartes Mineral, dass in fast jeder !nHöhenlage der Welt gefunden werden kann. !nEs ist für seine zahlreichen Verwendungszwecke !nin der Konstruktion von Maschinen bekannt. tooltip.CopperOre=Ein häufiges, leitfähiges Material, dass !nfür die Produktion von Kabeln verwendet werden kann. !nSeine Fähigkeit, großer Hitze zu widerstehen, !nmacht es auch essentiell für fortgeschrittene Maschinen. diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index ded52c50e..43d26f6a7 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -96,7 +96,7 @@ tile.MachineBlock2.ElectrolyticSeparator.name=Electrolytic Separator tile.MachineBlock2.PrecisionSawmill.name=Precision Sawmill tile.MachineBlock2.ChemicalDissolutionChamber.name=Chemical Dissolution Chamber tile.MachineBlock2.ChemicalWasher.name=Chemical Washer -tile.MachineBlock2.ChemicalCrystalizer.name=Chemical Crystalizer +tile.MachineBlock2.ChemicalCrystallizer.name=Chemical Crystallizer tile.MachineBlock2.SeismicVibrator.name=Seismic Vibrator tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC @@ -432,7 +432,7 @@ tooltip.ElectrolyticSeparator=A machine that uses the process of !nelectrolysis tooltip.PrecisionSawmill=A machine used to process logs and other !nwood-based items more efficiently, as well !nas to obtain sawdust. tooltip.ChemicalDissolutionChamber=An ultimate machine used to !nchemically dissolve all impurities of an !nore, leaving an unprocessed slurry !nbehind. tooltip.ChemicalWasher=An ultimate machine that cleans unprocessed !nslurry and prepares it for crystallization. -tooltip.ChemicalCrystalizer=An ultimate machine used to crystalize !npurified ore slurry into ore crystals. +tooltip.ChemicalCrystallizer=An ultimate machine used to crystallize !npurified ore slurry into ore crystals. tooltip.OsmiumOre=A strong mineral that can be found !nat nearly any height in the world. !nIt is known to have many uses in !nthe construction of machinery. tooltip.CopperOre=A common, conductive material that !ncan be used in the production of !nwires. Its ability to withstand !nhigh heats also makes it essential !nto advanced machinery. diff --git a/resources/assets/mekanism/lang/pl_PL.lang b/resources/assets/mekanism/lang/pl_PL.lang index 01fc55f71..24ed53989 100644 --- a/resources/assets/mekanism/lang/pl_PL.lang +++ b/resources/assets/mekanism/lang/pl_PL.lang @@ -89,7 +89,7 @@ tile.MachineBlock2.ElectrolyticSeparator.name=Separator elektrolityczny tile.MachineBlock2.PrecisionSawmill.name=Pilarka ramowa tile.MachineBlock2.ChemicalDissolutionChamber.name=Komora rozpadu chemicznego tile.MachineBlock2.ChemicalWasher.name=Pralka chemiczna -tile.MachineBlock2.ChemicalCrystalizer.name=Krystalizator chemiczny +tile.MachineBlock2.ChemicalCrystallizer.name=Krystallizator chemiczny //Infuse types infuse.carbon=Węglik @@ -383,8 +383,8 @@ tooltip.ChemicalInjectionChamber=Maszyna zdolna przetworzyć rudy na cztery !nod tooltip.ElectrolyticSeparator=Maszyna służąca do rozdzielania !ngazów i cieczy na dwa różne gazy !nza pomocą elektrolizy. tooltip.PrecisionSawmill=Maszyna służąca do przetwarzania drewna !ni drewnopodobnych produktów jak również !ndo otrzymywania trocin. tooltip.ChemicalDissolutionChamber=Maszyna służąca do chemicznego rozkładu wszystkich !nzanieczyszczeń w rudach pozostawiając tylko zawiesinę rudy !nwykorzystywaną fazie pięciokrotnego otrzymywania metali. -tooltip.ChemicalWasher=Maszyna służąca do oczyszczania nieprzetworzonej !nzawiesiny przygotowując ją do krystalizacji. -tooltip.ChemicalCrystalizer=Maszyna służąca do krystalizacji !noczyszczonej zawiesiny w kryształy rud. +tooltip.ChemicalWasher=Maszyna służąca do oczyszczania nieprzetworzonej !nzawiesiny przygotowując ją do krystallizacji. +tooltip.ChemicalCrystallizer=Maszyna służąca do krystallizacji !noczyszczonej zawiesiny w kryształy rud. tooltip.OsmiumOre=Wytrzymały materiał znajdywany na każdej !nwysokości. Ma wiele zastosowań w budowie !nmaszyn. tooltip.CopperOre=Pospolity materiał z wysoką przewodnością !nprądu wykorzystywaną do tworzenia kabli. !nWysoka temperatura topnienia daje miedzi !nwiele zastosowań również w budowie maszyn. diff --git a/resources/assets/mekanism/lang/pt_BR.lang b/resources/assets/mekanism/lang/pt_BR.lang index 350331ebb..d65d9b497 100644 --- a/resources/assets/mekanism/lang/pt_BR.lang +++ b/resources/assets/mekanism/lang/pt_BR.lang @@ -89,7 +89,7 @@ tile.MachineBlock2.ElectrolyticSeparator.name=Separador Eletrolítico tile.MachineBlock2.PrecisionSawmill.name=Serraria de Precisão tile.MachineBlock2.ChemicalDissolutionChamber.name=Câmara de Dissolução Química tile.MachineBlock2.ChemicalWasher.name=Lavador Químico -tile.MachineBlock2.ChemicalCrystalizer.name=Cristalizador Químico +tile.MachineBlock2.ChemicalCrystallizer.name=Cristalizador Químico //Infuse types infuse.carbon=Carbono @@ -383,7 +383,7 @@ tooltip.ElectrolyticSeparator=A machine that uses the process of !nelectrolysis tooltip.PrecisionSawmill=A machine used to process logs and other !nwood-based items more efficiently, as well !nas to obtain sawdust. tooltip.ChemicalDissolutionChamber=An ultimate machine used to !nchemically dissolve all impurities of an !nore, leaving an unprocessed slurry !nbehind. tooltip.ChemicalWasher=An ultimate machine that cleans unprocessed !nslurry and prepares it for crystallization. -tooltip.ChemicalCrystalizer=An ultimate machine used to crystalize !npurified ore slurry into ore crystals. +tooltip.ChemicalCrystallizer=An ultimate machine used to crystallize !npurified ore slurry into ore crystals. tooltip.OsmiumOre=A strong mineral that can be found !nat nearly any height in the world. !nIt is known to have many uses in !nthe construction of machinery. tooltip.CopperOre=A common, conductive material that !ncan be used in the production of !nwires. Its ability to withstand !nhigh heats also makes it essential !nto advanced machinery. diff --git a/resources/assets/mekanism/lang/zh_TW.lang b/resources/assets/mekanism/lang/zh_TW.lang index 24d589e86..c9baa5365 100644 --- a/resources/assets/mekanism/lang/zh_TW.lang +++ b/resources/assets/mekanism/lang/zh_TW.lang @@ -89,7 +89,7 @@ tile.MachineBlock2.ElectrolyticSeparator.name=電解分離器 tile.MachineBlock2.PrecisionSawmill.name=精密鋸木機 tile.MachineBlock2.ChemicalDissolutionChamber.name=化學溶解機 tile.MachineBlock2.ChemicalWasher.name=化學清洗機 -tile.MachineBlock2.ChemicalCrystalizer.name=化學結晶器 +tile.MachineBlock2.ChemicalCrystallizer.name=化學結晶器 //Infuse types infuse.carbon=碳 @@ -384,7 +384,7 @@ tooltip.ElectrolyticSeparator=這台機器使用電解的方式 !n產生兩個 tooltip.PrecisionSawmill=一台處理木頭的機器 !n透過這台機器能夠產生更多的木材以及額外的木屑! tooltip.ChemicalDissolutionChamber=強大的終極機器 !n他能夠將礦物溶解成礦物泥漿!n未去除雜質留下未處理的泥漿!. tooltip.ChemicalWasher=強大的終極機器 !n使未清潔的泥漿進入準備結晶化的機器 -tooltip.ChemicalCrystalizer=強大的終極機器 !n泥漿結晶化的最後機器 +tooltip.ChemicalCrystallizer=強大的終極機器 !n泥漿結晶化的最後機器 tooltip.OsmiumOre=一個可以在任何地方發現的強大的礦物 !n已知可以製作成非常多的機器 tooltip.CopperOre=常見導電性強的礦物 !n主要用在進階型機器上 diff --git a/resources/assets/mekanism/render/ChemicalCrystalizer.png b/resources/assets/mekanism/render/ChemicalCrystallizer.png similarity index 100% rename from resources/assets/mekanism/render/ChemicalCrystalizer.png rename to resources/assets/mekanism/render/ChemicalCrystallizer.png diff --git a/resources/assets/mekanism/sound/ChemicalCrystalizer.ogg b/resources/assets/mekanism/sound/ChemicalCrystallizer.ogg similarity index 100% rename from resources/assets/mekanism/sound/ChemicalCrystalizer.ogg rename to resources/assets/mekanism/sound/ChemicalCrystallizer.ogg