diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 9f8c87a68..abdd6da5e 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -14,6 +14,9 @@ public class MekanismAPI { //Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes private static Set cardboardBoxIgnore = new HashSet(); + + /** Mekanism debug mode */ + public static boolean debug = false; public static boolean isBlockCompatible(Item item, int meta) { diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 2dc87d615..e544c2a56 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.HashSet; import mekanism.api.Coord4D; -import mekanism.common.Mekanism; +import mekanism.api.MekanismAPI; import net.minecraftforge.common.util.ForgeDirection; import org.apache.logging.log4j.LogManager; @@ -105,7 +105,7 @@ public class TransmitterNetworkRegistry public void removeInvalidTransmitters() { - if(Mekanism.debug && !invalidTransmitters.isEmpty()) + if(MekanismAPI.debug && !invalidTransmitters.isEmpty()) { logger.debug("Dealing with " + invalidTransmitters.size() + " invalid Transmitters"); } @@ -128,7 +128,7 @@ public class TransmitterNetworkRegistry public void assignOrphans() { - if(Mekanism.debug && !orphanTransmitters.isEmpty()) + if(MekanismAPI.debug && !orphanTransmitters.isEmpty()) { logger.debug("Dealing with " + orphanTransmitters.size() + " orphan Transmitters"); } @@ -158,7 +158,7 @@ public class TransmitterNetworkRegistry switch(finder.networksFound.size()) { case 0: - if(Mekanism.debug) + if(MekanismAPI.debug) { logger.debug("No networks found. Creating new network"); } @@ -167,7 +167,7 @@ public class TransmitterNetworkRegistry break; case 1: - if(Mekanism.debug) + if(MekanismAPI.debug) { logger.debug("Using single found network"); } @@ -176,7 +176,7 @@ public class TransmitterNetworkRegistry break; default: - if(Mekanism.debug) + if(MekanismAPI.debug) { logger.debug("Merging " + finder.networksFound.size() + " networks"); } diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 9e9835c5f..6c467d7ee 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -5,6 +5,7 @@ import java.util.Random; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismAPI; import mekanism.api.Pos3D; import mekanism.client.render.particle.EntityJetpackFlameFX; import mekanism.client.render.particle.EntityJetpackSmokeFX; @@ -56,7 +57,7 @@ public class RenderTickHandler Coord4D obj = new Coord4D(x, y, z, world.provider.dimensionId); - if(Mekanism.debug && mc.currentScreen == null && !mc.gameSettings.showDebugInfo) + if(MekanismAPI.debug && mc.currentScreen == null && !mc.gameSettings.showDebugInfo) { String tileDisplay = ""; diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index ca69612d1..3cc1426ce 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import mekanism.api.EnumColor; +import mekanism.api.MekanismAPI; import mekanism.api.MekanismConfig.general; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; @@ -194,8 +195,8 @@ public class CommandMekanism extends CommandBase } else if(params[0].equalsIgnoreCase("debug")) { - Mekanism.debug = !Mekanism.debug; - sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Debug mode set to " + EnumColor.DARK_GREY + Mekanism.debug)); + MekanismAPI.debug = !MekanismAPI.debug; + sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Debug mode set to " + EnumColor.DARK_GREY + MekanismAPI.debug)); } else { sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Unknown command. Type '" + EnumColor.INDIGO + "/mk help" + EnumColor.GREY + "' for help.")); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 12f4514a1..c35d65fa7 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -154,9 +154,6 @@ public class Mekanism @SidedProxy(clientSide = "mekanism.client.ClientProxy", serverSide = "mekanism.common.CommonProxy") public static CommonProxy proxy; - /** Mekanism debug mode */ - public static boolean debug = false; - /** Mekanism mod instance */ @Instance("Mekanism") public static Mekanism instance; @@ -381,7 +378,7 @@ public class Mekanism Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore })); MachineType.ROTARY_CONDENSENTRATOR.addRecipe(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), new Object[] { - "GCG", "tET", "GIG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), + "GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 11) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), new Object[] { diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 15c3306c4..f7e15b441 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -6,13 +6,11 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IHeatTransfer; +import mekanism.api.MekanismAPI; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmitterNetworkRegistry; -import mekanism.common.Mekanism; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -97,7 +95,7 @@ public class ItemNetworkReader extends ItemEnergized } } - if(player.isSneaking() && Mekanism.debug) + if(player.isSneaking() && MekanismAPI.debug) { String[] strings = TransmitterNetworkRegistry.getInstance().toStrings(); player.addChatMessage(new ChatComponentText(EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanism Debug]" + EnumColor.GREY + " ----------"));