Merge branch 'master' into bassAdditions

58 files changed, 134 insertions, 122 deletions

diff --git a/src/main/java/com/github/technus/tectech/CommonValues.java b/src/main/java/com/github/technus/tectech/CommonValues.java
index 0b01377a95..aba9944770 100644
--- a/src/main/java/com/github/technus/tectech/CommonValues.java
+++ b/src/main/java/com/github/technus/tectech/CommonValues.java
@@ -6,22 +6,22 @@ import net.minecraft.util.EnumChatFormatting;
  * Created by danie_000 on 11.01.2017.
  */
 public final class CommonValues {
-    public final static String tecMark =
+    public final static String TEC_MARK =
             EnumChatFormatting.BLUE + "Tec" +
                     EnumChatFormatting.DARK_BLUE + "Tech" +
                     EnumChatFormatting.BLUE + ": Elemental Matter";
-    public final static String bassMark =
+    public final static String BASS_MARK =
             EnumChatFormatting.BLUE + "Bass" +
                     EnumChatFormatting.DARK_BLUE + "Tech" +
                     EnumChatFormatting.BLUE + ": Theta Movement";
 
-    public final static byte decayAt = 0;// hatches compute decays
-    public final static byte multiPurge1At = 2;// multiblocks clean their hatches 1
-    public final static byte moveAt = 4;// move stuff around
-    public final static byte recipeAt = 6;// move stuff around
-    public final static byte multiPurge2At = 8;// multiblocks clean their hatches 2
-    public final static byte overflowAt = 10;// then hatches clean themselves
+    public final static byte DECAY_AT = 0;// hatches compute decays
+    public final static byte MULTI_PURGE_1_AT = 2;// multiblocks clean their hatches 1
+    public final static byte MOVE_AT = 4;// move stuff around
+    public final static byte RECIPE_AT = 6;// move stuff around
+    public final static byte MULTI_PURGE_2_AT = 8;// multiblocks clean their hatches 2
+    public final static byte OVERFLOW_AT = 10;// then hatches clean themselves
     // - in case some hatches are not in multiblock structure
-    public final static byte multiCheckAt = 12;// multiblock checks it's state
-    public final static byte disperseAt = 14;// overflow hatches perform disperse
+    public final static byte MULTI_CHECK_AT = 12;// multiblock checks it's state
+    public final static byte DISPERSE_AT = 14;// overflow hatches perform disperse
 }
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index c5e47ed068..3f8f0549c0 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -44,7 +44,6 @@ public class TecTech {
     public static TecTechConfig ModConfig;
     public static XSTR Rnd = null;
     public static CreativeTabs mainTab = null;
-    private static boolean oneTimeFix = false;
 
     public static boolean hasCOFH = false, hasThaumcraft = false;
 
@@ -92,6 +91,8 @@ public class TecTech {
     @EventHandler
     public void PostLoad(FMLPostInitializationEvent PostEvent) {
         GTCustomLoader.postLoad();
+        if (ModConfig.NERF_FUSION) FixBrokenFusionRecipes();
+        fixBlocks();
     }
 
     @EventHandler
@@ -100,11 +101,6 @@ public class TecTech {
 
     @EventHandler
     public void onServerAboutToStart(FMLServerAboutToStartEvent ev) {
-        if (!oneTimeFix) {
-            oneTimeFix = true;
-            if (ModConfig.NERF_FUSION) FixBrokenFusionRecipes();
-            fixBlocks();
-        }
     }
 
     private void FixBrokenFusionRecipes() {
@@ -151,7 +147,6 @@ public class TecTech {
                 "GalacticraftMars",
                 "GalaxySpace",
                 "extracells",
-                "ExtraUtilities",
                 "Avaritia",
                 "avaritiaddons",
                 "EnderStorage",
diff --git a/src/main/java/com/github/technus/tectech/auxiliary/Reference.java b/src/main/java/com/github/technus/tectech/auxiliary/Reference.java
index 4363d8ca88..cc5202636a 100644
--- a/src/main/java/com/github/technus/tectech/auxiliary/Reference.java
+++ b/src/main/java/com/github/technus/tectech/auxiliary/Reference.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.auxiliary;
 
-public class Reference {
+public final class Reference {
     public static final String MODID = "tectech";
     public static final String NAME = "TecTech - Tec Technology!";
     public static final String VERSION = "GRADLETOKEN_VERSION";
diff --git a/src/main/java/com/github/technus/tectech/loader/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index cd64c9f537..c870d7d829 100644
--- a/src/main/java/com/github/technus/tectech/loader/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.loader;
+package com.github.technus.tectech.compatibility.dreamcraft;
 
 /**
  * Created by Tec on 06.08.2017.
diff --git a/src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index 1cefb4c170..13e76073a5 100644
--- a/src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.gtppAddon;
+package com.github.technus.tectech.compatibility.gtpp;
 
 import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStack;
 import gregtech.api.enums.OrePrefixes;
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompat.java
index 2cc647ea7f..dc0c55439d 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompat.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.magicAddon;
+package com.github.technus.tectech.compatibility.thaumcraft;
 
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM;
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java
index 8e5b774a50..fd50ff3af1 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java
@@ -1,8 +1,8 @@
-package com.github.technus.tectech.magicAddon;
+package com.github.technus.tectech.compatibility.thaumcraft;
 
 import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack;
-import com.github.technus.tectech.magicAddon.definitions.iElementalAspect;
+import com.github.technus.tectech.compatibility.thaumcraft.definitions.iElementalAspect;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 import thaumcraft.api.aspects.Aspect;
@@ -11,7 +11,7 @@ import thaumcraft.api.aspects.IAspectContainer;
 import thaumcraft.common.tiles.TileEssentiaReservoir;
 import thaumcraft.common.tiles.TileJarFillable;
 
-import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectToDef;
+import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectToDef;
 
 /**
  * Created by Tec on 21.05.2017.
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompat.java
index 3c5d8cc507..8e2c3a6684 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompat.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.magicAddon.definitions;
+package com.github.technus.tectech.compatibility.thaumcraft.definitions;
 
 
 import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition;
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java
index 8623b9a845..c8ce016a20 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.magicAddon.definitions;
+package com.github.technus.tectech.compatibility.thaumcraft.definitions;
 
 import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition;
 import com.github.technus.tectech.elementalMatter.classes.tElementalException;
@@ -7,7 +7,7 @@ import thaumcraft.api.aspects.Aspect;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.magicAddon.definitions.ePrimalAspectDefinition.*;
+import static com.github.technus.tectech.compatibility.thaumcraft.definitions.ePrimalAspectDefinition.*;
 
 /**
  * Created by Tec on 21.05.2017.
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
index 0060ae261b..667072a62e 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.magicAddon.definitions;
+package com.github.technus.tectech.compatibility.thaumcraft.definitions;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.elementalMatter.classes.*;
@@ -8,7 +8,7 @@ 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;
+import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectDefinitionCompat;
 
 /**
  * Created by Tec on 06.05.2017.
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java
index eafc57b756..ff203da5bc 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java
@@ -1,9 +1,9 @@
-package com.github.technus.tectech.magicAddon.definitions;
+package com.github.technus.tectech.compatibility.thaumcraft.definitions;
 
 import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive;
 
 import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay;
-import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectDefinitionCompat;
+import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectDefinitionCompat;
 
 /**
  * Created by Tec on 06.05.2017.
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/iElementalAspect.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/iElementalAspect.java
index c8ec3c40b4..0f96d3d4be 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/iElementalAspect.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/iElementalAspect.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.magicAddon.definitions;
+package com.github.technus.tectech.compatibility.thaumcraft.definitions;
 
 /**
  * Created by Tec on 21.05.2017.
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 00762221e4..4ad1d4e9b1 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -1,10 +1,10 @@
-package com.github.technus.tectech.magicAddon.thing.metaTileEntity.multi;
+package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap;
-import com.github.technus.tectech.magicAddon.definitions.ePrimalAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.definitions.ePrimalAspectDefinition;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
@@ -19,7 +19,7 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.Util.StructureBuilder;
-import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat.essentiaContainerCompat;
 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.enums.GT_Values.E;
@@ -131,7 +131,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
     @Override
     public String[] getDescription() {
         return new String[]{