diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java index 9eb4383af..8be12e620 100644 --- a/src/main/java/mekanism/api/reactor/IFusionReactor.java +++ b/src/main/java/mekanism/api/reactor/IFusionReactor.java @@ -37,4 +37,8 @@ public interface IFusionReactor public void formMultiblock(); public boolean isFormed(); + + public void setInjectionRate(int rate); + + public int getInjectionRate(); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index ac3e6e956..e1c52823d 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -1,37 +1,33 @@ package mekanism.generators.client.gui; +import java.util.ArrayList; import java.util.List; +import mekanism.api.Coord4D; import mekanism.api.ListUtils; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiFluidGauge; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.GuiGasGauge; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiGauge.Type; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiNumberGauge; -import mekanism.client.gui.GuiNumberGauge.INumberInfoHandler; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiProgress; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorController; -import net.minecraft.block.BlockStaticLiquid; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidTank; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) @@ -39,6 +35,8 @@ public class GuiReactorFuel extends GuiMekanism { public TileEntityReactorController tileEntity; + public GuiTextField injectionRateField; + public GuiReactorFuel(InventoryPlayer inventory, final TileEntityReactorController tentity) { super(new ContainerNull(inventory.player, tentity)); @@ -101,6 +99,7 @@ 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); } @Override @@ -113,5 +112,76 @@ public class GuiReactorFuel extends GuiMekanism drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + injectionRateField.drawTextBox(); + } + + @Override + public void updateScreen() + { + super.updateScreen(); + + injectionRateField.updateCursorCounter(); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + injectionRateField.mouseClicked(mouseX, mouseY, button); + } + + @Override + public void keyTyped(char c, int i) + { + if(!injectionRateField.isFocused() || i == Keyboard.KEY_ESCAPE) + { + super.keyTyped(c, i); + } + + if(i == Keyboard.KEY_RETURN) + { + if(injectionRateField.isFocused()) + { + setInjection(); + } + } + + if(Character.isDigit(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + { + injectionRateField.textboxKeyTyped(c, i); + } + } + + private void setInjection() + { + if(!injectionRateField.getText().isEmpty()) + { + int toUse = Math.max(0, Integer.parseInt(injectionRateField.getText())); + + ArrayList data = new ArrayList(); + data.add(1); + data.add(toUse); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + + injectionRateField.setText(""); + } + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + String prevRad = injectionRateField != null ? injectionRateField.getText() : ""; + + injectionRateField = new GuiTextField(fontRendererObj, guiWidth + 75, guiHeight + 115, 26, 11); + injectionRateField.setMaxStringLength(2); + injectionRateField.setText(prevRad); } } diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index c2b6e6a12..343eafd68 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -407,4 +407,16 @@ public class FusionReactor implements IFusionReactor return formed; } + @Override + public void setInjectionRate(int rate) + { + injectionRate = rate; + } + + @Override + public int getInjectionRate() + { + return injectionRate; + } + } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index 4b9aacf54..70263558e 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -96,6 +96,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { data.add(getReactor().getPlasmaTemp()); data.add(getReactor().getCaseTemp()); + data.add(getReactor().getInjectionRate()); data.add(fuelTank.getStored()); data.add(deuteriumTank.getStored()); data.add(tritiumTank.getStored()); @@ -113,9 +114,13 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { int type = dataStream.readInt(); - if(type == 0) + switch(type) { - formMultiblock(); + case 0: + formMultiblock(); + break; + case 1: + if(getReactor() != null) getReactor().setInjectionRate(dataStream.readInt()); } return; @@ -134,11 +139,13 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen ((FusionReactor)getReactor()).formed = true; getReactor().setPlasmaTemp(dataStream.readDouble()); getReactor().setCaseTemp(dataStream.readDouble()); + getReactor().setInjectionRate(dataStream.readInt()); fuelTank.setGas(new GasStack(GasRegistry.getGas("fusionFuelDT"), dataStream.readInt())); deuteriumTank.setGas(new GasStack(GasRegistry.getGas("deuterium"), dataStream.readInt())); tritiumTank.setGas(new GasStack(GasRegistry.getGas("tritium"), dataStream.readInt())); waterTank.setFluid(new FluidStack(FluidRegistry.getFluid("water"), dataStream.readInt())); steamTank.setFluid(new FluidStack(FluidRegistry.getFluid("steam"), dataStream.readInt())); + } else if(getReactor() != null) {