diff options
Diffstat (limited to 'src/main/java')
28 files changed, 122 insertions, 111 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 b03f9b1a8a..f5963a070c 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 = false; + 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,21 +23,26 @@ public class TecTechConfig extends ConfigManager { @Override protected void PreInit() { ModAdminErrorLogs_Enabled = 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"); + "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, @@ -49,4 +55,4 @@ public class TecTechConfig extends ConfigManager { protected void PostInit() { } -}
\ No newline at end of file +} 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/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index ad1517adb2..9a1e1be66c 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -8,7 +8,7 @@ import com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompatE import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.casing.TT_Container_Casings; -import com.github.technus.tectech.thing.item.ConstructibleTriggerItem; +import com.github.technus.tectech.thing.item.ConstructableTriggerItem; import com.github.technus.tectech.thing.item.DebugContainer_EM; import com.github.technus.tectech.thing.item.ParametrizerMemoryCard; import cpw.mods.fml.common.ProgressManager; @@ -118,7 +118,7 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft TT_Container_Casings.sBlockCasingsTT.setCreativeTab(mainTab); TT_Container_Casings.sHintCasingsTT.setCreativeTab(mainTab); DebugContainer_EM.INSTANCE.setCreativeTab(mainTab); - ConstructibleTriggerItem.INSTANCE.setCreativeTab(mainTab); + ConstructableTriggerItem.INSTANCE.setCreativeTab(mainTab); ParametrizerMemoryCard.INSTANCE.setCreativeTab(mainTab); } diff --git a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java index a92a5a663d..7411bc9335 100644 --- a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java @@ -6,7 +6,7 @@ import com.github.technus.tectech.thing.block.QuantumStuffBlock; import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT; import com.github.technus.tectech.thing.casing.GT_Block_HintTT; import com.github.technus.tectech.thing.casing.TT_Container_Casings; -import com.github.technus.tectech.thing.item.ConstructibleTriggerItem; +import com.github.technus.tectech.thing.item.ConstructableTriggerItem; import com.github.technus.tectech.thing.item.DebugContainer_EM; import com.github.technus.tectech.thing.item.DefinitionContainer_EM; import com.github.technus.tectech.thing.item.ParametrizerMemoryCard; @@ -37,7 +37,7 @@ public class ThingsLoader implements Runnable { TecTech.Logger.info("TurretBaseEM registered"); } - ConstructibleTriggerItem.run(); + ConstructableTriggerItem.run(); ParametrizerMemoryCard.run(); TecTech.Logger.info("Useful item registered"); 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)); |