update TecTech lib

10 files changed, 34 insertions, 25 deletions

diff --git a/build.gradle b/build.gradle
index d10699dc63..322abfe935 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,7 +102,7 @@ dependencies {
         setChanging(true)
     }*/
     compile files('GT-PlusPlus-1.7.09.GTNH.jar')
-    compile files('libs/TecTech-1.7.10-4.10.6-5fc2d0d2-dev.jar')
+    compile files('libs/TecTech-1.7.10-4.10.7-b1bcea5f-dev.jar')
     compile files('libs/bartworks[1.7.10]-[c9836c6]-0.5.20-dev.jar')
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
     runtime("eu.usrv:YAMCore:${minecraftVersion}-${yamcoreVersion}:deobf");
diff --git a/libs/TecTech-1.7.10-4.10.6-5fc2d0d2-dev.jar b/libs/TecTech-1.7.10-4.10.7-b1bcea5f-dev.jar
index 045fb6fc98..9345357013 100644
--- a/libs/TecTech-1.7.10-4.10.6-5fc2d0d2-dev.jar
+++ b/libs/TecTech-1.7.10-4.10.7-b1bcea5f-dev.jar
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
index b046866409..8cdbee1046 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
@@ -5,13 +5,13 @@ import GoodGenerator.util.DescTextLocalization;
 import GoodGenerator.util.MyRecipeAdder;
 import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.IStructureElement;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.IStructureElement;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -35,7 +35,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.*;
 
 public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM implements TecTechEnabledMulti, IConstructable {
 
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
index 376ea8bfc6..31e975d6f4 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
@@ -3,13 +3,13 @@ package GoodGenerator.Blocks.TEs;
 import GoodGenerator.Loader.Loaders;
 import GoodGenerator.util.DescTextLocalization;
 import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -32,7 +32,8 @@ import thaumcraft.common.config.ConfigBlocks;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM implements TecTechEnabledMulti, IConstructable {
 
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MetalVaporTurbine.java b/src/main/java/GoodGenerator/Blocks/TEs/MetalVaporTurbine.java
new file mode 100644
index 0000000000..febe7c0f3c
--- /dev/null
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MetalVaporTurbine.java
@@ -0,0 +1,4 @@
+package GoodGenerator.Blocks.TEs;
+
+public class MetalVaporTurbine{
+}
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
index 66fe58fe0a..9f65576a5b 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
@@ -6,11 +6,11 @@ import GoodGenerator.util.DescTextLocalization;
 import GoodGenerator.util.MyRecipeAdder;
 import com.github.bartimaeusnek.bartworks.util.Pair;
 import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
@@ -35,7 +35,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implements TecTechEnabledMulti, IConstructable {
 
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java b/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java
index c1b96f4484..9555b3aa9e 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java
@@ -9,10 +9,10 @@ import GoodGenerator.util.CharExchanger;
 import GoodGenerator.util.DescTextLocalization;
 import GoodGenerator.util.ItemRefer;
 import GoodGenerator.util.MyRecipeAdder;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
@@ -39,7 +39,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import static GoodGenerator.util.StructureHelper.addFrame;
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 import static org.apache.commons.lang3.RandomUtils.nextInt;
 
 public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
index 9f589db8bb..8d5962b49c 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
@@ -3,12 +3,12 @@ package GoodGenerator.Blocks.TEs;
 import GoodGenerator.Loader.Loaders;
 import GoodGenerator.util.DescTextLocalization;
 import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -28,8 +28,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static gregtech.api.enums.Textures.BlockIcons.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBase_EM implements TecTechEnabledMulti, IConstructable {
 
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index 6012c66cf3..67b8d62642 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -968,7 +968,7 @@ public class RecipeLoader {
                         ItemList.Field_Generator_LuV.get(4),
                         GT_OreDictUnificator.get(OrePrefixes.cableGt04,Materials.NiobiumTitanium,16),
                         GT_OreDictUnificator.get(OrePrefixes.pipeTiny,Materials.Enderium,16),
-                        WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt,64),
+                        WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt,8),
                         ItemList.Circuit_Wafer_QPIC.get(16),
                         GT_OreDictUnificator.get(OrePrefixes.plate,Materials.CrystallineAlloy,64),
                         GT_OreDictUnificator.get(OrePrefixes.foil,Materials.Indium,64),
diff --git a/src/main/java/GoodGenerator/util/StructureHelper.java b/src/main/java/GoodGenerator/util/StructureHelper.java
index 2c5feadab8..ea3b10eeae 100644
--- a/src/main/java/GoodGenerator/util/StructureHelper.java
+++ b/src/main/java/GoodGenerator/util/StructureHelper.java
@@ -1,7 +1,7 @@
 package GoodGenerator.util;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.structure.IStructureElement;
+import com.gtnewhorizon.structurelib.structure.IStructureElement;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
@@ -18,7 +18,7 @@ import java.util.Arrays;
 
 public class StructureHelper {
 
-    public static <T>IStructureElement<T> addFrame(Materials aMaterials) {
+    public static <T> IStructureElement<T> addFrame(Materials aMaterials) {
         return new IStructureElement<T>() {
 
             private IIcon[] mIcons;