diff options
author | Technus <daniel112092@gmail.com> | 2017-08-22 11:31:03 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-08-22 11:31:03 +0200 |
commit | 3ef9c4aa807231fdac85f2a455803028b870822e (patch) | |
tree | 1738bcdfacaed5607b7eb9f513a01db6f0a33b26 /src/main/java | |
parent | beacf52a7db51c15b9deeee490482c3c5b6d88b0 (diff) | |
download | GT5-Unofficial-3ef9c4aa807231fdac85f2a455803028b870822e.tar.gz GT5-Unofficial-3ef9c4aa807231fdac85f2a455803028b870822e.tar.bz2 GT5-Unofficial-3ef9c4aa807231fdac85f2a455803028b870822e.zip |
Small refactor
Diffstat (limited to 'src/main/java')
19 files changed, 102 insertions, 91 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 9be7c008d7..6893663af2 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -25,6 +25,8 @@ import net.minecraftforge.fluids.FluidStack; import java.util.HashMap; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; + @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);" + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore;" + "after:Thaumcraft;" + "after:dreamcraft;" + "after:miscutils;") public class TecTech { @@ -108,13 +110,15 @@ public class TecTech { for (Materials m : Materials.values()) { FluidStack p = m.getPlasma(1); if (p != null) { - if (TecTechConfig.DEBUG_MODE) TecTech.Logger.info("Found Plasma of " + m.mName); + if (DEBUG_MODE) + TecTech.Logger.info("Found Plasma of " + m.mName); if (m.mElement != null && (m.mElement.mProtons >= Materials.Iron.mElement.mProtons || -m.mElement.mProtons >= Materials.Iron.mElement.mProtons || m.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons || -m.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons)) { - if (TecTechConfig.DEBUG_MODE) TecTech.Logger.info("Attempting to bind " + m.mName); + if (DEBUG_MODE) + TecTech.Logger.info("Attempting to bind " + m.mName); if (m.getMolten(1) != null) binds.put(p.getFluid(), m.getMolten(1).getFluid()); else if (m.getGas(1) != null) binds.put(p.getFluid(), m.getGas(1).getFluid()); else if (m.getFluid(1) != null) binds.put(p.getFluid(), m.getFluid(1).getFluid()); @@ -125,7 +129,7 @@ public class TecTech { for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList) { Fluid f = binds.get(r.mFluidOutputs[0].getFluid()); if (f != null) { - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Nerfing Recipe " + r.mFluidOutputs[0].getUnlocalizedName()); r.mFluidOutputs[0] = new FluidStack(f, r.mFluidInputs[0].amount); } diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java index 27f1c8377b..d1a45ec657 100644 --- a/src/main/java/com/github/technus/tectech/Util.java +++ b/src/main/java/com/github/technus/tectech/Util.java @@ -1,6 +1,5 @@ package com.github.technus.tectech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.thing.casing.TT_Container_Casings; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; @@ -23,6 +22,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static gregtech.api.enums.GT_Values.E; /** @@ -138,12 +138,12 @@ public class Util { pointer = block - '0'; //countable air -> net.minecraft.block.BlockAir if (world.getBlock(x, y, z) != blockType[pointer]) { - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Struct-block-error " + x + " " + y + " " + z + " / " + a + " " + b + " " + c + " / " + world.getBlock(x, y, z).getUnlocalizedName() + " " + blockType[pointer].getUnlocalizedName()); return false; } if (world.getBlockMetadata(x, y, z) != blockMeta[pointer]) { - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Struct-meta-id-error " + x + " " + y + " " + z + " / " + a + " " + b + " " + c + " / " + world.getBlockMetadata(x, y, z) + " " + blockMeta[pointer]); return false; } @@ -262,12 +262,12 @@ public class Util { if ((pointer = block - '0') >= 0) { //countable air -> net.minecraft.block.BlockAir if (world.getBlock(x, y, z) != blockType[pointer]) { - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Struct-block-error " + x + " " + y + " " + z + " / " + a + " " + b + " " + c + " / " + world.getBlock(x, y, z).getUnlocalizedName() + " " + blockType[pointer].getUnlocalizedName()); return false; } if (world.getBlockMetadata(x, y, z) != blockMeta[pointer]) { - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Struct-meta-id-error " + x + " " + y + " " + z + " / " + a + " " + b + " " + c + " / " + world.getBlockMetadata(x, y, z) + " " + blockMeta[pointer]); return false; } @@ -276,18 +276,18 @@ public class Util { try { if (igt == null || !(boolean) adder.invoke(imt, addingMethods[pointer], igt, casingTextures[pointer])) { if (world.getBlock(x, y, z) != blockTypeFallback[pointer]) { - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Fallback-struct-block-error " + x + " " + y + " " + z + " / " + a + " " + b + " " + c + " / " + world.getBlock(x, y, z).getUnlocalizedName() + " " + blockTypeFallback[pointer].getUnlocalizedName()); return false; } if (world.getBlockMetadata(x, y, z) != blockMetaFallback[pointer]) { - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Fallback-Struct-meta-id-error " + x + " " + y + " " + z + " / " + a + " " + b + " " + c + " / " + world.getBlockMetadata(x, y, z) + " " + blockMetaFallback[pointer]); return false; } } } catch (InvocationTargetException | IllegalAccessException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return false; } } diff --git a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java index 9344ec286b..87a2cdc54b 100644 --- a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java +++ b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java @@ -12,8 +12,9 @@ public class TecTechConfig extends ConfigManager { public boolean ModAdminErrorLogs_Enabled; //final static to allow compiler to remove the debug code when this is false - public static final boolean DEBUG_MODE = true; + public static boolean DEBUG_MODE = false; public boolean BOOM_ENABLE; + public boolean EASY_SCAN; public boolean NERF_FUSION; public boolean ENABLE_TURRET_EXPLOSIONS; public float TURRET_DAMAGE_FACTOR; @@ -22,24 +23,26 @@ public class TecTechConfig extends ConfigManager { @Override protected void PreInit() { ModAdminErrorLogs_Enabled = false; - //DEBUG_MODE = false; + EASY_SCAN = false; BOOM_ENABLE = true; NERF_FUSION = false; ENABLE_TURRET_EXPLOSIONS = true; - TURRET_DAMAGE_FACTOR=10; - TURRET_EXPLOSION_FACTOR=1; + TURRET_DAMAGE_FACTOR = 10; + TURRET_EXPLOSION_FACTOR = 1; } @Override protected void Init() { ModAdminErrorLogs_Enabled = _mainConfig.getBoolean("AdminErrorLog", "Modules", ModAdminErrorLogs_Enabled, - "If set to true, every op/admin will receive all errors occoured during the startup phase as ingame message on join"); - //DEBUG_MODE = _mainConfig.getBoolean("DebugPrint", "Debug", DEBUG_MODE, - // "Enables logging"); + "If set to true, every op/admin will receive all errors occurred during the startup phase as in game message on join"); + DEBUG_MODE = _mainConfig.getBoolean("DebugMode", "Debug", DEBUG_MODE, + "Enables logging and other purely debug features"); + EASY_SCAN = _mainConfig.getBoolean("EasyScan", "Features", EASY_SCAN, + "Enables tricorder to scan EM i/o hatches directly, too CHEEKY"); BOOM_ENABLE = _mainConfig.getBoolean("BoomEnable", "Features", BOOM_ENABLE, "Set to false to disable explosions on everything bad that you can do"); NERF_FUSION = _mainConfig.getBoolean("NerfFusion", "Features", NERF_FUSION, - "Set to true to enable removal of plasmas heavier than Fe"); + "Set to true to enable removal of plasmas heavier than Fe and other weird ones"); ENABLE_TURRET_EXPLOSIONS = _mainConfig.getBoolean("TurretBoomEnable", "Features", ENABLE_TURRET_EXPLOSIONS, "Set to false to disable explosions caused by EM turrets"); TURRET_DAMAGE_FACTOR = _mainConfig.getFloat("TurretDamageFactor", "Features", TURRET_DAMAGE_FACTOR, 0, Short.MAX_VALUE, diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java index 6e27486466..ce12ad5c3d 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.elementalMatter.classes; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; import com.github.technus.tectech.elementalMatter.interfaces.iHasElementalDefinition; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +9,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.elementalMatter.definitions.cPrimitiveDefinition.nbtE__; /** @@ -37,7 +37,7 @@ public abstract class cElementalDefinition implements iElementalDefinition { try { return (iElementalDefinition) nbtCreationBind.get(nbt.getByte("t")).invoke(null, nbt); } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return nbtE__; } } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java index 6545a82cbc..4f878901ea 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.elementalMatter.classes; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; import net.minecraft.client.Minecraft; import net.minecraft.crash.CrashReport; @@ -10,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import java.util.HashMap; import java.util.Map; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.elementalMatter.definitions.cPrimitiveDefinition.null__; /** @@ -164,9 +164,9 @@ public abstract class cElementalPrimitive extends cElementalDefinition { try { cElementalDefinition.addCreatorFromNBT(nbtType, cElementalPrimitive.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-128); } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } - if(TecTechConfig.DEBUG_MODE) + if(DEBUG_MODE) TecTech.Logger.info("Registered Elemental Matter Class: Primitive "+nbtType+" "+(-128)); } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java index 5108c409cd..7350beea8e 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.elementalMatter.definitions; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.classes.*; import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; import com.github.technus.tectech.gtppAddon.GtppAtomLoader; @@ -14,6 +13,7 @@ import net.minecraftforge.oredict.OreDictionary; import java.util.*; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition.boson_Y__; import static com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition.deadEnd; import static gregtech.api.enums.OrePrefixes.dust; @@ -256,7 +256,7 @@ public final class dAtomDefinition extends cElementalDefinition { if (type != 1) return (negative ? "~? " : "? ") + nomenclature.Name[element]; return negative ? "~" + nomenclature.Name[element] : nomenclature.Name[element]; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return (negative ? "Element: ~" : "Element: ") + element; } } @@ -268,12 +268,12 @@ public final class dAtomDefinition extends cElementalDefinition { try { return (negative ? "~" : "") + nomenclature.Symbol[element] + " N:" + neutralCount + " I:" + (neutralCount+element) + " C: " + getCharge(); } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); try { int s100 = element / 100, s1 = (element / 10) % 10, s10 = (element) % 10; return (negative ? "~" : "") + nomenclature.SymbolIUPAC[10 + s100] + nomenclature.SymbolIUPAC[s10] + nomenclature.SymbolIUPAC[s1] + " N:" + neutralCount + " I:" + (neutralCount+element) + " C: " + getCharge(); } catch (Exception E) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return (negative ? "~" : "") + "? N:" + neutralCount + " I:" + (neutralCount+element) + " C: " + getCharge(); } } @@ -316,7 +316,7 @@ public final class dAtomDefinition extends cElementalDefinition { deadEnd }; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } return getNaturalDecayInstant(); @@ -332,7 +332,7 @@ public final class dAtomDefinition extends cElementalDefinition { deadEnd }; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } return getNaturalDecayInstant(); @@ -349,7 +349,7 @@ public final class dAtomDefinition extends cElementalDefinition { deadEnd }; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } return getNaturalDecayInstant(); @@ -366,7 +366,7 @@ public final class dAtomDefinition extends cElementalDefinition { deadEnd }; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } return getNaturalDecayInstant(); @@ -392,7 +392,7 @@ public final class dAtomDefinition extends cElementalDefinition { decaysInto.add(new cElementalDefinitionStack(new dAtomDefinition(newAtom.toArray(new cElementalDefinitionStack[newAtom.size()])), 1)); return new cElementalDecay[]{new cElementalDecay(0.95F, decaysInto.toArray(new cElementalDefinitionStack[decaysInto.size()])), eBosonDefinition.deadEnd}; } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); for (cElementalDefinitionStack things : newAtom) { decaysInto.add(things); } @@ -426,7 +426,7 @@ public final class dAtomDefinition extends cElementalDefinition { try { return new dAtomDefinition(false, antiElements); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return null; } } @@ -483,7 +483,7 @@ public final class dAtomDefinition extends cElementalDefinition { try { return new dAtomDefinition(stacks); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return null; } } @@ -535,7 +535,7 @@ public final class dAtomDefinition extends cElementalDefinition { new cElementalDefinitionStack(dHadronDefinition.hadron_p, key), new cElementalDefinitionStack(dHadronDefinition.hadron_n, stableIsotopes.get(key).first()), new cElementalDefinitionStack(eLeptonDefinition.lepton_e, key))); - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Added Stable Atom:" + key + " " + stableIsotopes.get(key).first() + " " + stableAtoms.get(key).getMass()); } for (int key : mostStableUnstableIsotopes.keySet()) { @@ -543,7 +543,7 @@ public final class dAtomDefinition extends cElementalDefinition { new cElementalDefinitionStack(dHadronDefinition.hadron_p, key), new cElementalDefinitionStack(dHadronDefinition.hadron_n, mostStableUnstableIsotopes.get(key).lastEntry().getValue()), new cElementalDefinitionStack(eLeptonDefinition.lepton_e, key))); - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Added Unstable Atom:" + key + " " + mostStableUnstableIsotopes.get(key).lastEntry().getValue() + " " + unstableAtoms.get(key).getMass()); } alpha = new cElementalDefinitionStack( @@ -552,15 +552,15 @@ public final class dAtomDefinition extends cElementalDefinition { new cElementalDefinitionStack(dHadronDefinition.hadron_n, 2)) , 1); } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } try { cElementalDefinition.addCreatorFromNBT(nbtType, dAtomDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)64); } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } - if(TecTechConfig.DEBUG_MODE) + if(DEBUG_MODE) TecTech.Logger.info("Registered Elemental Matter Class: Atom "+nbtType+" "+64); } @@ -727,7 +727,7 @@ public final class dAtomDefinition extends cElementalDefinition { ); transformation.addOredict(new cElementalDefinitionStack(temp, 144),OrePrefixes.dust, Materials.Plutonium241,1); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } if(Loader.isModLoaded("miscutils")) new GtppAtomLoader().run(); diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java index 5665288bbb..db94932cd1 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java @@ -1,13 +1,13 @@ package com.github.technus.tectech.elementalMatter.definitions; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.classes.*; import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; import net.minecraft.nbt.NBTTagCompound; import java.util.ArrayList; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition.boson_Y__; /** @@ -216,7 +216,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi new cElementalDecay(0.001F, new dHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1], boson_Y__), eBosonDefinition.deadEnd}; //decay into quarks } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return new cElementalDecay[]{eBosonDefinition.deadEnd}; } } @@ -252,7 +252,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi try { return new dHadronDefinition(false, antiElements); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return null; } } @@ -303,7 +303,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi try { return new dHadronDefinition(stacks); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return null; } } @@ -321,7 +321,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi hadron_n = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2))); hadron_n_ = (dHadronDefinition) (hadron_n.getAnti()); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); protonMass = -1; neutronMass = -1; } @@ -333,9 +333,9 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi try { cElementalDefinition.addCreatorFromNBT(nbtType, dHadronDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-64); } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } - if(TecTechConfig.DEBUG_MODE) + if(DEBUG_MODE) TecTech.Logger.info("Registered Elemental Matter Class: Hadron "+nbtType+" "+(-64)); } diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java index 3ca018928a..0060ae261b 100644 --- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java @@ -1,12 +1,12 @@ package com.github.technus.tectech.magicAddon.definitions; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.classes.*; import com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition; import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; import net.minecraft.nbt.NBTTagCompound; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay; import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectDefinitionCompat; @@ -113,7 +113,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme try { return new dComplexAspectDefinition(stacks); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return null; } } @@ -191,9 +191,9 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme try { cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-96); } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } - if(TecTechConfig.DEBUG_MODE) + if(DEBUG_MODE) TecTech.Logger.info("Registered Elemental Matter Class: ComplexAspect "+nbtType+" "+(-96)); } diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java index 2b9f917418..aa1d85f109 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.recipe; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition; import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStackMap; import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; @@ -14,6 +13,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; + public class TT_recipe extends GT_Recipe { public static final String E_RECIPE_ID = "eRecipeID"; public final cElementalDefinitionStackMap input[],output[], eCatalyst[]; @@ -219,7 +220,7 @@ public class TT_recipe extends GT_Recipe { try { return mRecipeMap.get(cElementalDefinition.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID))); }catch (Exception e){ - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return null; } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java index 332f028684..835a606897 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; import com.github.technus.tectech.elementalMatter.classes.tElementalException; import com.github.technus.tectech.elementalMatter.interfaces.iElementalInstanceContainer; @@ -22,6 +21,7 @@ import java.util.Collections; import java.util.List; import static com.github.technus.tectech.auxiliary.Reference.MODID; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; /** * Created by Tec on 15.03.2017. @@ -50,7 +50,7 @@ public class DebugContainer_EM extends Item { try { content.putUnifyAll(cElementalInstanceStackMap.fromNBT(tNBT.getCompoundTag("content"))); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); return true; } ((iElementalInstanceContainer) metaTE).purgeOverflow(); diff --git a/src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java index 99535b8e23..7d666a3218 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStackMap; import com.github.technus.tectech.elementalMatter.classes.tElementalException; import cpw.mods.fml.common.registry.GameRegistry; @@ -15,6 +14,7 @@ import java.util.Collections; import java.util.List; import static com.github.technus.tectech.auxiliary.Reference.MODID; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; /** * Created by Tec on 15.03.2017. @@ -40,7 +40,7 @@ public class DefinitionContainer_EM extends Item { try { oldMap=cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content")); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } tNBT.setTag("info", definitions.getInfoNBT()); @@ -58,7 +58,7 @@ public class DefinitionContainer_EM extends Item { try { return cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content")); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } return null; @@ -74,7 +74,7 @@ public class DefinitionContainer_EM extends Item { try { oldMap=cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content")); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } tNBT.removeTag("info"); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java index a054961b72..4bbd7b957e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -212,7 +212,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta @Override public String[] getInfoData() { - if(DEBUG_MODE) { + if(TecTech.ModConfig.EASY_SCAN) { if (id > 0) { if (content == null || content.size() == 0) return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "No Stacks"}; @@ -227,7 +227,14 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta if (content == null || content.size() == 0) return new String[]{"No Stacks"}; return content.getElementalInfo(); } else { - return new String[0]; + if(id>0){ + if (content == null || content.size() == 0) + return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "No Stacks"}; + return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "Contains EM"}; + } + if (content == null || content.size() == 0) + return new String[]{"No Stacks"}; + return new String[]{"Contains EM"}; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java index 40d11f5f05..ec703ac61e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java @@ -2,7 +2,6 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Rack; import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Rack; import cpw.mods.fml.common.Loader; @@ -27,6 +26,7 @@ import java.util.Map; import static com.github.technus.tectech.CommonValues.multiCheckAt; import static com.github.technus.tectech.Util.getUniqueIdentifier; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; /** * Created by Tec on 03.04.2017. @@ -307,7 +307,8 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch { this.maxHeat = maxHeat; this.subZero = subZero; componentBinds.put(unlocalizedName, this); - if (TecTechConfig.DEBUG_MODE) TecTech.Logger.info("Component registered: " + unlocalizedName); + if (DEBUG_MODE) + TecTech.Logger.info("Component registered: " + unlocalizedName); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index bb39b661e9..b234d2912a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -4,12 +4,11 @@ import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.Util; import com.github.technus.tectech.Vec3pos; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.dataFramework.QuantumDataPacket; +import com.github.technus.tectech.thing.metaTileEntity.IConstructable; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Rack; -import com.github.technus.tectech.thing.metaTileEntity.IConstructable; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -24,10 +23,11 @@ import net.minecraft.util.EnumChatFormatting; import java.util.ArrayList; import static com.github.technus.tectech.Util.StructureBuilder; +import static com.github.technus.tectech.Util.V; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.Util.V; /** * Created by danie_000 on 17.12.2016. @@ -272,7 +272,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB try { adderMethodMap.put("addRackToMachineList", GT_MetaTileEntity_EM_computer.class.getMethod("addRackToMachineList", IGregTechTileEntity.class, int.class)); } catch (NoSuchMethodException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java index 48d32a47df..bab172f231 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java @@ -3,7 +3,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import cofh.api.energy.IEnergyContainerItem; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.thing.metaTileEntity.IConstructable; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -15,6 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.GregTech_API.mEUtoRF; @@ -147,8 +147,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa if (this.getEUVar() < 0) this.setEUVar(0); return remove; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) - e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } return 0; } @@ -163,8 +162,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa if (this.getEUVar() < 0) this.setEUVar(0); return RF; } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) - e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } return 0; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java index 87a706f132..46bd48a794 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java @@ -2,7 +2,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.elementalMatter.classes.*; import com.github.technus.tectech.elementalMatter.interfaces.iHasElementalDefinition; import com.github.technus.tectech.thing.block.QuantumGlassBlock; @@ -16,13 +15,12 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import static com.github.technus.tectech.Util.StructureBuilder; -import static com.github.technus.tectech.Util.isInputEqual; +import static com.github.technus.tectech.Util.*; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refMass; import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refUnstableMass; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.Util.V; /** * Created by danie_000 on 17.12.2016. @@ -101,7 +99,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock //ORE DICT quantization int[] oreIDs = OreDictionary.getOreIDs(is); for (int ID : oreIDs) { - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + "." + is.getItemDamage() + " " + OreDictionary.getOreName(ID)); aOredictQuantizationInfo aOQI = bTransformationInfo.oredictQuantization.get(ID); if (aOQI == null) continue; @@ -114,7 +112,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock } } else { //Do ITEM STACK quantization - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) TecTech.Logger.info("Quantifier-Item-recipe " + is.getItem().getUnlocalizedName() + "." + is.getItemDamage()); iHasElementalDefinition into = aIQI.output(); if (into != null && isInputEqual(true, false, diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java index 518a1c7a0a..bd79ad38ad 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java @@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.Util; -import com.github.technus.tectech.auxiliary.TecTechConfig; +import com.github.technus.tectech.Vec3pos; import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStack; import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; @@ -11,7 +11,6 @@ import com.github.technus.tectech.elementalMatter.classes.tElementalException; import com.github.technus.tectech.thing.metaTileEntity.hatch.*; import com.github.technus.tectech.thing.metaTileEntity.multi.gui.GT_Container_MultiMachineEM; import com.github.technus.tectech.thing.metaTileEntity.multi.gui.GT_GUIContainer_MultiMachineEM; -import com.github.technus.tectech.Vec3pos; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -41,6 +40,7 @@ import java.util.Map; import static com.github.technus.tectech.CommonValues.*; import static com.github.technus.tectech.Util.*; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; /** @@ -336,7 +336,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt outputEM[i] = cElementalInstanceStackMap.fromNBT( aNBT.getCompoundTag("outputEM").getCompoundTag(Integer.toString(i))); } catch (tElementalException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); outputEM[i] = new cElementalInstanceStackMap(); } } else outputEM = new cElementalInstanceStackMap[0]; @@ -802,7 +802,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt if (euVar > getEUVar() || EU > maxEUinputMax || (euVar - 1) / maxEUinputMin + 1 > eMaxAmpereFlow) {// euVar==0? --> (euVar - 1) / maxEUinputMin + 1 = 1! - if (TecTechConfig.DEBUG_MODE) { + if (DEBUG_MODE) { TecTech.Logger.debug("L1 " + euVar + " " + getEUVar() + " " + (euVar > getEUVar())); TecTech.Logger.debug("L2 " + EU + " " + maxEUinputMax + " " + (EU > maxEUinputMax)); TecTech.Logger.debug("L3 " + euVar + " " + eMaxAmpereFlow); @@ -1502,7 +1502,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt return; } } catch (Exception e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } @@ -1530,7 +1530,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt adderMethodMap.put("addDataConnectorToMachineList", GT_MetaTileEntity_MultiblockBase_EM.class.getMethod("addDataConnectorToMachineList", IGregTechTileEntity.class, int.class)); adderMethod = GT_MetaTileEntity_MultiblockBase_EM.class.getMethod("addThing", String.class, IGregTechTileEntity.class, int.class); } catch (NoSuchMethodException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } } @@ -1539,7 +1539,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt try { return (boolean) adderMethodMap.get(methodName).invoke(this, igt, casing); } catch (InvocationTargetException | IllegalAccessException e) { - if (TecTechConfig.DEBUG_MODE) e.printStackTrace(); + if (DEBUG_MODE) e.printStackTrace(); } return false; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java index ecd17d7581..4ea525acd2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java @@ -2,7 +2,6 @@ package com.github.technus.tectech.thing.metaTileEntity.single; import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_Container_DebugStructureWriter; import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_GUIContainer_DebugStructureWriter; import cpw.mods.fml.relauncher.Side; @@ -21,6 +20,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureWriter; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; /** * Created by Tec on 23.03.2017. @@ -104,7 +104,7 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isAllowedToWork()) { result = StructureWriter(this.getBaseMetaTileEntity(), numbers[0], numbers[1], numbers[2], numbers[3], numbers[4], numbers[5], false); - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) for (String s : result) TecTech.Logger.info(s); aBaseMetaTileEntity.disableWorking(); @@ -114,7 +114,7 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { result = StructureWriter(this.getBaseMetaTileEntity(), numbers[0], numbers[1], numbers[2], numbers[3], numbers[4], numbers[5], true); - if (TecTechConfig.DEBUG_MODE) + if (DEBUG_MODE) for (String s : result) TecTech.Logger.info(s); } diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java index b19b1f3560..90318ef390 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java @@ -1,7 +1,6 @@ package openmodularturrets.blocks.turretheads; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.Reference; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; @@ -27,7 +26,7 @@ public class TurretHeadEM extends Block implements ITileEntityProvider { this.setStepSound(Block.soundTypeMetal); this.setBlockBounds(0.2F, 0.0F, 0.2F, 0.8F, 1F, 0.8F); this.setBlockName("turretHeadEM"); - this.setBlockTextureName(Reference.MODID+":turretHeadEM"); + //this.setBlockTextureName(Reference.MODID+":turretHeadEM"); } @Override |