Merge pull request #152 from GTNewHorizons/FixEOH2

Fix material referencing and some EOH stuff

4 files changed, 35 insertions, 35 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index fe620f19c1..118d614277 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,13 +2,13 @@
 
 dependencies {
     shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
-    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.268:dev")
-    compile('com.github.GTNewHorizons:ModularUI:1.0.56:dev')
+    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.275:dev")
+    compile('com.github.GTNewHorizons:ModularUI:1.0.61:dev')
     compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev')
-    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.24-GTNH:dev')
-    compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.7:dev')
-    compile('com.github.GTNewHorizons:CodeChickenCore:1.1.7:dev')
-    compile('com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev')
+    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.29-GTNH:dev')
+    compile('com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev')
+    compile('com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev')
+    compile('com.github.GTNewHorizons:StructureLib:1.2.2:dev')
     compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compile('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.26:dev')
 
@@ -18,8 +18,8 @@ dependencies {
 
     compileOnly('com.github.GTNewHorizons:OpenModularTurrets:2.2.11-247:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.9-GTNH:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:GTplusplus:1.7.203:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-152-GTNH:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:GTplusplus:1.7.213:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-156-GTNH:dev') {transitive=false}
 
     compileOnly('curse.maven:cofh-lib-220333:2388748') {transitive=false}
     compileOnly('curse.maven:computercraft-67504:2269339') {transitive=false}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index ee7e902f46..cd93641235 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -5069,8 +5069,8 @@ public class DreamCraftRecipeLoader {
 
                             ItemList.Field_Generator_UMV.get(16), ItemList.Robot_Arm_UMV.get(16), ItemList.ZPM4.get(4),
                             GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
-                    new FluidStack[] { FluidUtils.getFluidStack("time", 144_000),
-                            FluidUtils.getFluidStack("space", 144_000),
+                    new FluidStack[] { FluidUtils.getFluidStack("temporalFluid", 144_000),
+                            FluidUtils.getFluidStack("spatialFluid", 144_000),
                             FluidUtils.getFluidStack("molten.metastable oganesson", 144 * 256 * 4),
                             FluidUtils.getFluidStack("molten.shirabon", 144 * 256 * 4), },
                     CustomItemList.Machine_Multi_EyeOfHarmony.get(1),
@@ -5111,7 +5111,7 @@ public class DreamCraftRecipeLoader {
 
                     new FluidStack[] { Materials.Neutronium.getMolten(144 * 256 * 4),
                             Materials.CosmicNeutronium.getMolten(144 * 256 * 4),
-                            new FluidStack(solderUEV, 144 * 256 * 2), FluidUtils.getFluidStack("space", 1440) },
+                            new FluidStack(solderUEV, 144 * 256 * 2), FluidUtils.getFluidStack("spatialFluid", 1440) },
                     CustomItemList.EOH_Reinforced_Spatial_Casing.get(4),
                     10_000,
                     (int) TierEU.RECIPE_UMV);
@@ -5164,7 +5164,7 @@ public class DreamCraftRecipeLoader {
                                 getModItem("miscutils", "gtplusplus.blockcasings.5", tier, 8), ME_Singularity,
                                 plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier] },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1),
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5190,7 +5190,7 @@ public class DreamCraftRecipeLoader {
                                 ME_Singularity, ME_Singularity, plateList[absoluteTier],
                                 getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier] },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier1.get(1),
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5216,7 +5216,7 @@ public class DreamCraftRecipeLoader {
                                 ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier],
                                 getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier], },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier2.get(1),
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5245,7 +5245,7 @@ public class DreamCraftRecipeLoader {
                                 ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier],
                                 getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier], },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier3.get(1),
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5271,7 +5271,7 @@ public class DreamCraftRecipeLoader {
                                 ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier],
                                 getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier], },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier4.get(1),
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5297,7 +5297,7 @@ public class DreamCraftRecipeLoader {
                                 ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity,
                                 plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier], },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier5.get(1),
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5326,7 +5326,7 @@ public class DreamCraftRecipeLoader {
                                 ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity,
                                 ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier], },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier6.get(1),
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5353,7 +5353,7 @@ public class DreamCraftRecipeLoader {
                                 ME_Singularity, ME_Singularity, plateList[absoluteTier],
                                 getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier], },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier7.get(1),
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5380,7 +5380,7 @@ public class DreamCraftRecipeLoader {
                                 ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier],
                                 getItemContainer("QuantumCircuit").get(set) },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier], },
                         CustomItemList.SpacetimeCompressionFieldGeneratorTier8.get(1),
                         set * 16_000 * 20,
@@ -5467,7 +5467,7 @@ public class DreamCraftRecipeLoader {
 
                         },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("time", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("temporalFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier] },
                         researchStuff[absoluteTier + 1],
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5559,8 +5559,8 @@ public class DreamCraftRecipeLoader {
 
                         },
                         new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
-                                FluidUtils.getFluidStack("time", 1_440 * (absoluteTier + 1)),
-                                FluidUtils.getFluidStack("space", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("temporalFluid", 1_440 * (absoluteTier + 1)),
+                                FluidUtils.getFluidStack("spatialFluid", 1_440 * (absoluteTier + 1)),
                                 specialFluid[absoluteTier] },
                         researchStuff[absoluteTier + 1],
                         (absoluteTier + 1) * 4_000 * 20,
@@ -5605,7 +5605,7 @@ public class DreamCraftRecipeLoader {
 
                     new FluidStack[] { Materials.Neutronium.getMolten(144 * 256 * 4),
                             Materials.CosmicNeutronium.getMolten(144 * 256 * 4),
-                            new FluidStack(solderUEV, 144 * 256 * 2), FluidUtils.getFluidStack("space", 1440) },
+                            new FluidStack(solderUEV, 144 * 256 * 2), FluidUtils.getFluidStack("spatialFluid", 1440) },
                     CustomItemList.EOH_Reinforced_Temporal_Casing.get(4),
                     10_000,
                     (int) TierEU.RECIPE_UMV);
diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
index 074163d9ae..99f25832eb 100644
--- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
@@ -145,12 +145,12 @@ public class EyeOfHarmonyRecipe {
         // Tier 8 - 576 Universium
         // Tier 9 - 2304 Universium
 
-        if (rocketTierOfRecipe <= 3) {
+        if (rocketTierOfRecipe <= 2) {
             fluidStackArrayList.add(Materials.WhiteDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe)));
         }
 
-        if ((4 <= rocketTierOfRecipe) && (rocketTierOfRecipe <= 7)) {
-            fluidStackArrayList.add(Materials.BlackDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe - 4)));
+        if ((3 <= rocketTierOfRecipe) && (rocketTierOfRecipe <= 7)) {
+            fluidStackArrayList.add(Materials.BlackDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe - 3)));
         }
 
         if (rocketTierOfRecipe >= 8) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
index 51cfa1745f..6bfc669573 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
@@ -1008,14 +1008,6 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
 
             currentRecipe = eyeOfHarmonyRecipeStorage.recipeLookUp(aStack);
             if (processRecipe(currentRecipe)) {
-                // Get circuit damage, clamp it and then use it later for overclocking.
-                ItemStack circuit = mInputBusses.get(0).getStackInSlot(0);
-                if (circuit != null) {
-                    currentCircuitMultiplier = Math.max(0, Math.min(circuit.getItemDamage(), 24));
-                } else {
-                    currentCircuitMultiplier = 0;
-                }
-
                 return true;
             }
 
@@ -1034,6 +1026,14 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
 
     public boolean processRecipe(EyeOfHarmonyRecipe recipeObject) {
 
+        // Get circuit damage, clamp it and then use it later for overclocking.
+        ItemStack circuit = mInputBusses.get(0).getStackInSlot(0);
+        if (circuit != null) {
+            currentCircuitMultiplier = (long) clamp(circuit.getItemDamage(), 0, 24);
+        } else {
+            currentCircuitMultiplier = 0;
+        }
+
         // Debug mode, overwrites the required fluids to initiate the recipe to 100L of each.
         if (EOH_DEBUG_MODE) {
             if ((getHydrogenStored() < 100) || (getHeliumStored() < 100)) {