diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 7e75c7be9..d68cc0c69 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -74,8 +74,9 @@ public class MekanismConfig public static boolean OreDictOsmium; public static boolean OreDictPlatinum; public static boolean enableSiliconCompat; - public static int IC2SinkTier; + public static int IC2SinkTier; public static int IC2SourceTier; + public static int digitalMinerMaxRadius; } public static class client @@ -169,7 +170,6 @@ public class MekanismConfig public static class tools { public static double armorSpawnRate; - public static boolean enableTools = true; } public static class recipes diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 1d35a4df8..1588686da 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -683,7 +684,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { if(!radiusField.getText().isEmpty()) { - int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), 32)); + int toUse = Math.max(0, Math.min(Integer.parseInt(radiusField.getText()), MekanismConfig.general.digitalMinerMaxRadius)); ArrayList data = new ArrayList(); data.add(6); diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index a8f7967c0..d9766e355 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -165,18 +165,13 @@ public class GuiFactory extends GuiMekanism int xAxis = (x - (width - xSize) / 2); int yAxis = (y - (height - ySize) / 2); - if(xAxis > 8 && xAxis < 168 && yAxis > 78 && yAxis < 83) + if(xAxis > 144 && xAxis < 168 && yAxis > 83 && yAxis < 93) { - ItemStack stack = mc.thePlayer.inventory.getItemStack(); - - if(stack != null && stack.getItem() instanceof ItemGaugeDropper) - { - ArrayList data = new ArrayList(); - data.add(1); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); - } + ArrayList data = new ArrayList(); + data.add(1); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + SoundHandler.playSound("gui.button.press"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 072c76765..b56e47d5e 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -121,7 +121,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism int xAxis = (x - (width - xSize) / 2); int yAxis = (y - (height - ySize) / 2); - if(xAxis > 148 && xAxis < 168 && yAxis > 73 && yAxis < 82) + if(xAxis > 144 && xAxis < 168 && yAxis > 72 && yAxis < 83) { ArrayList data = new ArrayList(); data.add(0); diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 5e10c5f18..4980be01d 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -101,6 +101,8 @@ public class GuiQuantumEntangloporter extends GuiMekanism buttonList.add(protectedButton); buttonList.add(setButton); buttonList.add(deleteButton); + + access = ISecurityTile.SecurityMode.TRUSTED; } public void setFrequency(String freq) @@ -113,6 +115,9 @@ public class GuiQuantumEntangloporter extends GuiMekanism ArrayList data = new ArrayList(); data.add(0); data.add(freq); + if (access == null) { + return; + } data.add(access.ordinal()); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 6720cdae5..09190c4de 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -310,6 +310,7 @@ public class CommonProxy implements IGuiProvider general.OreDictOsmium = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictOsmium", true).getBoolean(); general.OreDictPlatinum = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OreDictPlatinum", false).getBoolean(); general.enableSiliconCompat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSiliconCompat", true).getBoolean(); + general.digitalMinerMaxRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DigitalMinerMaxRadius", 32, "Select range from 1 to 64, we do not recommend going over 32", 1, 64).getInt(); general.IC2SinkTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SinkTier", 4, "Tier level for machines, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); general.IC2SourceTier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "IC2SourceTier", 4, "Tier level for generators, we recommend setting it to tier 2 for ic2 classic", 1, 4).getInt(); diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 74dfe477b..787433f34 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -80,6 +80,7 @@ public class PacketConfigSync implements IMessageHandler