diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index c2c384189..ece88af77 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -281,7 +281,7 @@ public class CommonProxy implements IGuiProvider general.armoredJetpackDamageRatio = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ArmoredJetpackDamageRatio", 0.8).getDouble(); general.armoredJetpackDamageMax = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ArmoredJepackDamageMax", 115).getInt(); general.aestheticWorldDamage = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AestheticWorldDamage", true).getBoolean(); - general.opsBypassRestrictions = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OpsBypassRestrictions", true).getBoolean(); + general.opsBypassRestrictions = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OpsBypassRestrictions", false).getBoolean(); general.thermalEvaporationSpeed = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ThermalEvaporationSpeed", 1.0D).getDouble(); general.maxJetpackGas = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxJetpackGas", 24000).getInt(); general.maxScubaGas = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxScubaGas", 24000).getInt(); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index ffe36aa4f..c8a1a05e2 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -688,7 +688,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { String owner = ((ISecurityTile)tileEntity).getSecurity().getOwner(); - if(owner == null || entityplayer.getCommandSenderName().equals(owner)) + if(MekanismUtils.isOp((EntityPlayerMP)entityplayer) || owner == null || entityplayer.getCommandSenderName().equals(owner)) { entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); } diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index 4ab1ba075..b21952741 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -11,6 +11,7 @@ import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.security.SecurityData; import mekanism.common.security.SecurityFrequency; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; @@ -34,6 +35,11 @@ public final class SecurityUtils ISecurityItem security = (ISecurityItem)stack.getItem(); + if(MekanismUtils.isOp((EntityPlayerMP)player)) + { + return true; + } + return canAccess(security.getSecurity(stack), player.getCommandSenderName(), security.getOwner(stack)); } @@ -46,6 +52,11 @@ public final class SecurityUtils ISecurityTile security = (ISecurityTile)tile; + if(MekanismUtils.isOp((EntityPlayerMP)player)) + { + return true; + } + return canAccess(security.getSecurity().getMode(), player.getCommandSenderName(), security.getSecurity().getOwner()); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 7fcef55fb..f13caf4c6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -1,7 +1,9 @@ package mekanism.generators.client.gui; +import java.util.ArrayList; import java.util.List; +import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; @@ -12,7 +14,11 @@ import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRateBar; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -53,6 +59,11 @@ public class GuiIndustrialTurbine extends GuiMekanism double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); + if(rate == 0) + { + return 0; + } + return (double)tileEntity.structure.lastSteamInput/rate; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png"), 40, 13)); @@ -89,6 +100,9 @@ public class GuiIndustrialTurbine extends GuiMekanism renderScaledText(LangUtils.localize("gui.capacity") + ": " + tileEntity.structure.getFluidCapacity() + " mB", 53, 44, 0x00CD00, 106); renderScaledText(LangUtils.localize("gui.maxFlow") + ": " + rate + " mB/t", 53, 53, 0x00CD00, 106); + String name = chooseByMode(tileEntity.structure.dumpMode, LangUtils.localize("gui.idle"), LangUtils.localize("gui.dumping"), LangUtils.localize("gui.dumping_excess")); + renderScaledText(name, 156-(int)(fontRendererObj.getStringWidth(name)*getNeededScale(name, 66)), 73, 0x404040, 66); + if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) { drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis); @@ -106,6 +120,9 @@ public class GuiIndustrialTurbine extends GuiMekanism int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + int displayInt = chooseByMode(tileEntity.structure.dumpMode, 142, 150, 158); + drawTexturedModalRect(guiWidth + 160, guiHeight + 73, 176, displayInt, 8, 8); + if(tileEntity.getScaledFluidLevel(58) > 0) { displayGauge(7, 14, tileEntity.getScaledFluidLevel(58), tileEntity.structure.fluidStored, 0); @@ -154,4 +171,40 @@ public class GuiIndustrialTurbine extends GuiMekanism mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png")); drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, side == 0 ? 0 : 54, 16, 54); } + + @Override + protected void mouseClicked(int x, int y, int button) + { + super.mouseClicked(x, y, button); + + int xAxis = (x - (width - xSize) / 2); + int yAxis = (y - (height - ySize) / 2); + + if(xAxis > 160 && xAxis < 169 && yAxis > 73 && yAxis < 82) + { + ArrayList data = new ArrayList(); + data.add((byte)0); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + SoundHandler.playSound("gui.button.press"); + } + } + + private T chooseByMode(TileEntityGasTank.GasMode dumping, T idleOption, T dumpingOption, T dumpingExcessOption) + { + if(dumping.equals(TileEntityGasTank.GasMode.IDLE)) + { + return idleOption; + } + else if(dumping.equals(TileEntityGasTank.GasMode.DUMPING)) + { + return dumpingOption; + } + else if(dumping.equals(TileEntityGasTank.GasMode.DUMPING_EXCESS)) + { + return dumpingExcessOption; + } + + return idleOption; //should not happen; + } } diff --git a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java index 667324ddf..f8795fe52 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -5,6 +5,7 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.common.multiblock.SynchronizedData; +import mekanism.common.tile.TileEntityGasTank.GasMode; import net.minecraftforge.fluids.FluidStack; public class SynchronizedTurbineData extends SynchronizedData @@ -19,6 +20,8 @@ public class SynchronizedTurbineData extends SynchronizedData { public FluidStack fluid; public double electricity; + public GasMode dumpMode = GasMode.IDLE; @Override public void apply(SynchronizedTurbineData data) { data.fluidStored = fluid; data.electricityStored = electricity; + data.dumpMode = dumpMode; } @Override @@ -21,6 +24,7 @@ public class TurbineCache extends MultiblockCache { fluid = data.fluidStored; electricity = data.electricityStored; + dumpMode = data.dumpMode; } @Override @@ -32,6 +36,7 @@ public class TurbineCache extends MultiblockCache } electricity = nbtTags.getDouble("electricity"); + dumpMode = GasMode.values()[nbtTags.getInteger("dumpMode")]; } @Override @@ -43,5 +48,6 @@ public class TurbineCache extends MultiblockCache } nbtTags.setDouble("electricity", electricity); + nbtTags.setInteger("dumpMode", dumpMode.ordinal()); } } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index 85910ea3f..005310d6c 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -243,6 +243,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol