diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 40e44fcb0..e0167926f 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -66,6 +66,7 @@ public class MekanismConfig public static double superheatingHeatTransfer = 10000; public static double heatPerFuelTick = 4; public static boolean allowTransmitterAlloyUpgrade; + public static boolean allowProtection = true; } public static class client diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index c01e7dbcd..ece37160e 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -2,6 +2,7 @@ package mekanism.client.gui.element; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; import mekanism.client.MekanismClient; import mekanism.client.gui.IGuiWrapper; @@ -129,6 +130,9 @@ public class GuiSecurityTab extends GuiElement private SecurityMode getSecurity() { + if(!general.allowProtection) { + return SecurityMode.PUBLIC; + } if(isItem) { if(getItem() == null || !(getItem().getItem() instanceof ISecurityItem)) @@ -172,7 +176,7 @@ public class GuiSecurityTab extends GuiElement @Override public void mouseClicked(int xAxis, int yAxis, int button) { - if(button == 0) + if(button == 0 && general.allowProtection) { if(getOwner() != null && mc.thePlayer.getCommandSenderName().equals(getOwner())) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index b1fe7d693..73dc1d6a8 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -298,6 +298,7 @@ public class CommonProxy implements IGuiProvider general.superheatingHeatTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D).getDouble(); general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble(); general.allowTransmitterAlloyUpgrade = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowTransmitterAlloyUpgrade", true).getBoolean(); + general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 1a1fe7c42..d467beb84 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -393,7 +393,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.stackTagCompound == null) + if(stack.stackTagCompound == null || !general.allowProtection) { return SecurityMode.PUBLIC; } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 188d7dda5..1f9be49f8 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -373,7 +373,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.stackTagCompound == null) + if(stack.stackTagCompound == null || !general.allowProtection) { return SecurityMode.PUBLIC; } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 71d449eb8..7d695f6b2 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -944,7 +944,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.stackTagCompound == null) + if(stack.stackTagCompound == null || !general.allowProtection) { return SecurityMode.PUBLIC; } diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 58e1b3a22..c1836d40b 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -72,6 +72,7 @@ public class PacketConfigSync implements IMessageHandler