diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index e62bd733d..cf6c2e767 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -5,7 +5,6 @@ import java.util.Map; import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.api.util.UnitDisplayUtils.TempType; -import mekanism.common.block.BlockMachine.MachineType; public class MekanismConfig { @@ -66,14 +65,14 @@ public class MekanismConfig public static class machines { - private static Map config = new HashMap(); + private static Map config = new HashMap(); - public static boolean isEnabled(MachineType type) + public static boolean isEnabled(String type) { return config.get(type) != null && config.get(type); } - public static void setEntry(MachineType type, boolean enabled) + public static void setEntry(String type, boolean enabled) { config.put(type, enabled); } diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java index 0c145b837..956bf3986 100644 --- a/src/main/java/mekanism/api/transmitters/TransmissionType.java +++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java @@ -1,8 +1,8 @@ package mekanism.api.transmitters; import mekanism.api.gas.IGasTransmitter; -import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; public enum TransmissionType { @@ -33,7 +33,7 @@ public enum TransmissionType public String localize() { - return MekanismUtils.localize("transmission." + getTransmission()); + return StatCollector.translateToLocal("transmission." + getTransmission()); } public static boolean checkTransmissionType(TileEntity sideTile, TransmissionType type) diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index a6febf658..1d7c5615d 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -309,7 +309,7 @@ public class CommonProxy for(MachineType type : MachineType.getValidMachines()) { - machines.setEntry(type, Mekanism.configuration.get("machines", type.name + "Enabled", true).getBoolean(true)); + machines.setEntry(type.name, Mekanism.configuration.get("machines", type.name + "Enabled", true).getBoolean(true)); } usage.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D); @@ -546,7 +546,7 @@ public class CommonProxy { for(MachineType type : MachineType.getValidMachines()) { - if(machines.isEnabled(type)) + if(machines.isEnabled(type.name)) { CraftingManager.getInstance().getRecipeList().removeAll(type.getRecipes()); CraftingManager.getInstance().getRecipeList().addAll(type.getRecipes()); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 13ad93e1a..3f75f5df6 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1194,7 +1194,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer public boolean isEnabled() { - return machines.isEnabled(this); + return machines.isEnabled(this.name); } public void addRecipes(Collection recipes) diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 476ef1c53..8c75e2cce 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -56,7 +56,7 @@ public class PacketConfigSync implements IMessageHandler