From dffee5a8e33c590bc6ba6cd0a7bedf3651187546 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 5 Aug 2014 01:39:17 +0100 Subject: [PATCH] Add Statistics tab to Reactor Some more stats could be displayed here, regarding energy generation. --- .../mekanism/api/reactor/IFusionReactor.java | 8 ++ .../client/GeneratorsClientProxy.java | 3 + .../client/gui/GuiReactorController.java | 8 +- .../generators/client/gui/GuiReactorFuel.java | 35 +++++- .../generators/client/gui/GuiReactorHeat.java | 37 +++++- .../client/gui/GuiReactorStats.java | 111 ++++++++++++++++++ .../generators/client/gui/GuiStatTab.java | 84 +++++++++++++ .../generators/common/FusionReactor.java | 29 +++++ .../common/GeneratorsCommonProxy.java | 3 +- .../generators/common/block/BlockReactor.java | 2 +- .../resources/assets/mekanism/gui/GuiTall.png | Bin 1713 -> 2377 bytes .../mekanism/gui/elements/GuiStatsTab.png | Bin 0 -> 2632 bytes .../resources/assets/mekanism/lang/en_US.lang | 8 ++ 13 files changed, 317 insertions(+), 11 deletions(-) create mode 100644 src/main/java/mekanism/generators/client/gui/GuiReactorStats.java create mode 100644 src/main/java/mekanism/generators/client/gui/GuiStatTab.java create mode 100644 src/main/resources/assets/mekanism/gui/elements/GuiStatsTab.png diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java index c76d159a3..f27168d4a 100644 --- a/src/main/java/mekanism/api/reactor/IFusionReactor.java +++ b/src/main/java/mekanism/api/reactor/IFusionReactor.java @@ -45,4 +45,12 @@ public interface IFusionReactor public boolean isBurning(); public void setBurning(boolean burn); + + public int getMinInjectionRate(boolean active); + + public double getMaxPlasmaTemperature(boolean active); + + public double getMaxCasingTemperature(boolean active); + + public double getIgnitionTemperature(boolean active); } diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index e439e6812..3fbf3772a 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -7,6 +7,7 @@ import mekanism.generators.client.gui.GuiNeutronCapture; import mekanism.generators.client.gui.GuiReactorController; import mekanism.generators.client.gui.GuiReactorFuel; import mekanism.generators.client.gui.GuiReactorHeat; +import mekanism.generators.client.gui.GuiReactorStats; import mekanism.generators.client.gui.GuiSolarGenerator; import mekanism.generators.client.gui.GuiWindTurbine; import mekanism.generators.client.render.RenderAdvancedSolarGenerator; @@ -85,6 +86,8 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy case 12: return new GuiReactorFuel(player.inventory, (TileEntityReactorController)tileEntity); case 13: + return new GuiReactorStats(player.inventory, (TileEntityReactorController)tileEntity); + case 14: return new GuiNeutronCapture(player.inventory, (TileEntityReactorNeutronCapture)tileEntity); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index fd4503ac5..d21ea028d 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -1,18 +1,13 @@ package mekanism.generators.client.gui; -import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.GuiSlot; import mekanism.client.gui.GuiSlot.SlotType; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerReactorController; @@ -45,6 +40,7 @@ public class GuiReactorController extends GuiMekanism guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 79, 38)); guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiStatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); } @Override @@ -52,7 +48,7 @@ public class GuiReactorController extends GuiMekanism { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - fontRendererObj.drawString(tileEntity.getInventoryName(), 6, 6, 0x404040); + fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040); if(tileEntity.getActive()) { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index bc1e5fb5d..61f834855 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -15,15 +15,21 @@ import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.GuiProgress; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; @@ -91,6 +97,7 @@ public class GuiReactorFuel extends GuiMekanism } }, ProgressBar.SMALL_LEFT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 99, 75)); guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + guiElements.add(new GuiStatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); } @Override @@ -98,8 +105,8 @@ public class GuiReactorFuel extends GuiMekanism { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - fontRendererObj.drawString(tileEntity.getInventoryName(), 6, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.injectionRate") + ": " + (tileEntity.getReactor()==null?"None":tileEntity.getReactor().getInjectionRate()), 55, 35, 0x404040); + fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.injectionRate") + ": " + (tileEntity.getReactor() == null ? "None" : tileEntity.getReactor().getInjectionRate()), 55, 35, 0x404040); } @Override @@ -111,6 +118,17 @@ public class GuiReactorFuel extends GuiMekanism int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 14, 14, 14); + } + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); injectionRateField.drawTextBox(); @@ -130,6 +148,19 @@ public class GuiReactorFuel extends GuiMekanism super.mouseClicked(mouseX, mouseY, button); injectionRateField.mouseClicked(mouseX, mouseY, button); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(button == 0) + { + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + SoundHandler.playSound("gui.button.press"); + MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10)); + } + + } } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 5aa6d2db3..37064ca5b 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -2,6 +2,7 @@ package mekanism.generators.client.gui; import java.util.List; +import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.gui.GuiEnergyGauge; @@ -17,9 +18,12 @@ import mekanism.client.gui.GuiNumberGauge.INumberInfoHandler; import mekanism.client.gui.GuiProgress; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.block.BlockStaticLiquid; @@ -150,6 +154,7 @@ public class GuiReactorHeat extends GuiMekanism } }, Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"), 115, 46)); guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + guiElements.add(new GuiStatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); } @Override @@ -157,7 +162,7 @@ public class GuiReactorHeat extends GuiMekanism { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - fontRendererObj.drawString(tileEntity.getInventoryName(), 6, 6, 0x404040); + fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040); } @Override @@ -169,6 +174,36 @@ public class GuiReactorHeat extends GuiMekanism int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 14, 14, 14); + } + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(button == 0) + { + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + SoundHandler.playSound("gui.button.press"); + MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10)); + } + + } + } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java new file mode 100644 index 000000000..8f814413a --- /dev/null +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -0,0 +1,111 @@ +package mekanism.generators.client.gui; + +import java.text.NumberFormat; +import java.util.List; + +import mekanism.api.Coord4D; +import mekanism.api.util.ListUtils; +import mekanism.client.gui.GuiEnergyInfo; +import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.GuiMekanism; +import mekanism.client.sound.SoundHandler; +import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; +import mekanism.generators.common.tile.reactor.TileEntityReactorController; + +import net.minecraft.entity.player.InventoryPlayer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + +@SideOnly(Side.CLIENT) +public class GuiReactorStats extends GuiMekanism +{ + public TileEntityReactorController tileEntity; + public static NumberFormat nf = NumberFormat.getIntegerInstance(); + + + public GuiReactorStats(InventoryPlayer inventory, final TileEntityReactorController tentity) + { + super(new ContainerNull(inventory.player, tentity)); + tileEntity = tentity; + guiElements.add(new GuiEnergyInfo(new IInfoHandler() + { + @Override + public List getInfo() + { + return ListUtils.asList( + "Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + "Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + guiElements.add(new GuiFuelTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + + fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040); + if(tileEntity.isFormed()) + { + fontRendererObj.drawString(MekanismUtils.localize("gui.passive"), 6, 26, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(false)), 16, 36, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.ignition") + ": " + (nf.format(tileEntity.getReactor().getIgnitionTemperature(false))), 16, 46, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.maxPlasma") + ": " + (nf.format(tileEntity.getReactor().getMaxPlasmaTemperature(false))), 16, 56, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.maxCasing") + ": " + (nf.format(tileEntity.getReactor().getMaxCasingTemperature(false))), 16, 66, 0x404040); + + fontRendererObj.drawString(MekanismUtils.localize("gui.active"), 6, 86, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(true)), 16, 96, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.ignition") + ": " + (nf.format(tileEntity.getReactor().getIgnitionTemperature(true))), 16, 106, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.maxPlasma") + ": " + (nf.format(tileEntity.getReactor().getMaxPlasmaTemperature(true))), 16, 116, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.maxCasing") + ": " + (nf.format(tileEntity.getReactor().getMaxCasingTemperature(true))), 16, 126, 0x404040); + } + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiTall.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 - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176, 14, 14, 14); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(button == 0) + { + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + SoundHandler.playSound("gui.button.press"); + MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 10)); + } + + } + }} diff --git a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java new file mode 100644 index 000000000..8062b9a1b --- /dev/null +++ b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java @@ -0,0 +1,84 @@ +package mekanism.generators.client.gui; + +import mekanism.api.Coord4D; +import mekanism.client.gui.GuiElement; +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiStatTab extends GuiElement +{ + TileEntity tileEntity; + + public GuiStatTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiStatsTab.png"), gui, def); + + tileEntity = tile; + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth - 26, guiHeight + 62, 26, 26); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedRect(guiWidth - 26, guiHeight + 62, 0, 0, 26, 26); + + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) + { + guiObj.drawTexturedRect(guiWidth - 21, guiHeight + 66, 26, 0, 18, 18); + } + else { + guiObj.drawTexturedRect(guiWidth - 21, guiHeight + 66, 26, 18, 18, 18); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + mc.renderEngine.bindTexture(RESOURCE); + + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) + { + displayTooltip(MekanismUtils.localize("gui.stats"), xAxis, yAxis); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) + { + MekanismGenerators.packetHandler.sendToServer(new GeneratorsGuiMessage(Coord4D.get(tileEntity), 13)); + SoundHandler.playSound("gui.button.press"); + } + } + } +} diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index aaf1ad48f..7f70f7b39 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -465,4 +465,33 @@ public class FusionReactor implements IFusionReactor { burning = burn; } + + @Override + public int getMinInjectionRate(boolean active) + { + double k = active ? caseWaterConductivity : 0; + double aMin = burnTemperature * burnRatio * plasmaCaseConductivity * (k+caseAirConductivity) / (energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity)); + return (int)(2 * Math.ceil(aMin/2D)); + } + + @Override + public double getMaxPlasmaTemperature(boolean active) + { + double k = active ? caseWaterConductivity : 0; + return injectionRate * energyPerFuel/plasmaCaseConductivity * (plasmaCaseConductivity+k+caseAirConductivity) / (k+caseAirConductivity); + } + + @Override + public double getMaxCasingTemperature(boolean active) + { + double k = active ? caseWaterConductivity : 0; + return injectionRate * energyPerFuel / (k+caseAirConductivity); + } + + @Override + public double getIgnitionTemperature(boolean active) + { + double k = active ? caseWaterConductivity : 0; + return burnTemperature * energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) / (energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity)); + } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index a5b65ea90..67bd6964f 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -127,8 +127,9 @@ public class GeneratorsCommonProxy return new ContainerReactorController(player.inventory, (TileEntityReactorController)tileEntity); case 11: case 12: - return new ContainerNull(player, (TileEntityReactorController)tileEntity); case 13: + return new ContainerNull(player, (TileEntityReactorController)tileEntity); + case 14: return new ContainerNeutronCapture(player.inventory, (TileEntityReactorNeutronCapture)tileEntity); } diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 14b739e21..b9998703c 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -284,7 +284,7 @@ public class BlockReactor extends BlockContainer { CONTROLLER(GeneratorsBlocks.Reactor, 0, "ReactorController", 10, TileEntityReactorController.class), FRAME(GeneratorsBlocks.Reactor, 1, "ReactorFrame", -1, TileEntityReactorFrame.class), - NEUTRON_CAPTURE(GeneratorsBlocks.Reactor, 2, "ReactorNeutronCapturePlate", 13, TileEntityReactorNeutronCapture.class), + NEUTRON_CAPTURE(GeneratorsBlocks.Reactor, 2, "ReactorNeutronCapturePlate", 14, TileEntityReactorNeutronCapture.class), PORT(GeneratorsBlocks.Reactor, 3, "ReactorInOutPort", -1, TileEntityReactorPort.class), GLASS(GeneratorsBlocks.ReactorGlass, 0, "ReactorGlass", -1, TileEntityReactorGlass.class), LASER_FOCUS_MATRIX(GeneratorsBlocks.ReactorGlass, 1, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class); diff --git a/src/main/resources/assets/mekanism/gui/GuiTall.png b/src/main/resources/assets/mekanism/gui/GuiTall.png index 5e44ebf6c411d2872a16561ba66c5f451b51c341..90f2488819a0a1d421f37e120d28b7d925e97f75 100644 GIT binary patch delta 936 zcmV;Z16Ta94apL)QUrep1ppl(P)iU_000EmNklyRzL1Tm^D3DXd$_hNMW5#+3?PKrjT1WMOQG902zqJ92A$@@JHW_0?aXQ4dwf=uukky}3dv*bT_ppt& zjYzX2Sr*YW=l?FxBOX3{5Z`|NnIWDDfW^;3+1lEQyLa!-Mc~n+2Xn8 z9sm8sZwB}eJAlsi_O_|;zc!gnVr^|Lc6N5UD_7gLQ64uj9OV%a@$(N~#LYYF-OgY* zEMhvXBF}RJ{I`DqSo|!arin-?#b}&IS=RCEPhZWVaI*NzvW}){qbi%Q+ntvg0SkW; zpE-+97ys$5AR?kD@<=Jg(&b?kgMoql*DU}nn)3K$u|I$I<=pXKew_dP`mKA>)U|=x z0njId;k&&qCGY&%0nke+rMPi>J)S?CbjLpa`dL@ZGq*es0S@800Y+cni=i z0KHU}b(Ce@?FO#jx)%`c>rzVb({Rh%PjzX)3$9?RTU8td7j71moK9zitfrkn0*Hz%bfCd0Q5>-*WDto zsw!T+deucCr4&_FMbk9VG`VzVoK+qQq*;y-IV9!HjCk>`20OTZ3*9&P{I zwvGM${kh|NdwX-gU%PfKhQpzO*#Xcu@A3)1s;WE#umhm4R#sN#uKHK6UhTg8b9i_d z)9Eyhj*bk<4uIaB$g?Z^>gsBDY;fkk|12#n#b`8g3m^dWH2|l#0V^vj=WYv%qUatL z;ubQ1o_YJ}{_^s2M4Y@uSXEUNMdAKm0O+IL-Q74iI4}qS;3C@C*f0bE;DYiWKHh_y zB9qYtEt8N19g~0s2LlAa2$R7DJ(G|H6qBt5QIo3$H86m;O(qjV_<)LtNGYXuYirAJ z;ettLes0&+)=Y$ju(PxC_W8?u1|TA$H4+x|+y#?C23Qz?9{3B6?*2`(mdfh@0000< KMNUMnLSTYxZqYgb delta 273 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 Ntt{-#D{p!~`417E=d=I- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 24146bd97..3eca7f28f 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -681,6 +681,14 @@ gui.solarGenerator.sun=Sun gui.bioGenerator.bioFuel=BioFuel gui.electrolyticSeparator.dump=Dump +gui.passive=Passive +gui.active=Active + +gui.minInject=Min. Inject Rate +gui.ignition=Ignition Temp +gui.maxPlasma=Max. Plasma Temp +gui.maxCasing=Max. Casing Temp + //*****// //TOOLS// //*****//