update version and add new machine base

5 files changed, 93 insertions, 22 deletions

diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java b/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java
index 4b16ee8332..f811d9c5f1 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java
@@ -3,17 +3,20 @@ package GoodGenerator.Blocks.TEs;
 
 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.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Plasma;
 import net.minecraft.item.ItemStack;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class MegaPlasmaTurbine extends GT_MetaTileEntity_LargeTurbine_Plasma implements TecTechEnabledMulti, IConstructable {
 
+    private IStructureDefinition<MegaPlasmaTurbine> multiDefinition = null;
+
     public MegaPlasmaTurbine(String name){super(name);}
 
     public MegaPlasmaTurbine(int id, String name, String nameRegional){
@@ -37,26 +40,11 @@ public class MegaPlasmaTurbine extends GT_MetaTileEntity_LargeTurbine_Plasma imp
 
     @Override
     public List<GT_MetaTileEntity_Hatch_EnergyTunnel> getTecTechEnergyTunnels() {
-        return null;
+        return new ArrayList<>();
     }
 
     @Override
     public List<GT_MetaTileEntity_Hatch_EnergyMulti> getTecTechEnergyMultis() {
-        return null;
-    }
-
-    @Override
-    public long[] getCurrentInfoData() {
-        return new long[0];
-    }
-
-    @Override
-    public String[] getInfoDataArray(GT_MetaTileEntity_MultiBlockBase multiBlockBase) {
-        return new String[0];
-    }
-
-    @Override
-    public boolean isMachineBlockUpdateRecursive() {
-        return false;
+        return new ArrayList<>();
     }
 }
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
index 782d6e51e7..51c3477e68 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
@@ -2,7 +2,6 @@ package GoodGenerator.Blocks.TEs;
 
 import GoodGenerator.Items.MyMaterial;
 import GoodGenerator.Loader.Loaders;
-import GoodGenerator.Main.GoodGenerator;
 import GoodGenerator.util.MyRecipeAdder;
 import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
@@ -10,8 +9,6 @@ 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 cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
new file mode 100644
index 0000000000..cf24ba9099
--- /dev/null
+++ b/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
@@ -0,0 +1,84 @@
+package GoodGenerator.Blocks.TEs;
+
+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 gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
+import net.minecraft.item.ItemStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.github.technus.tectech.mechanics.structure.StructureUtility.transpose;
+
+public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBase_EM implements TecTechEnabledMulti, IConstructable {
+
+    private IStructureDefinition<UniversalChemicalFuelEngine> multiDefinition = null;
+
+    public UniversalChemicalFuelEngine(String name){super(name);}
+
+    public UniversalChemicalFuelEngine(int id, String name, String nameRegional){
+        super(id,name,nameRegional);
+    }
+
+    @Override
+    public IStructureDefinition<UniversalChemicalFuelEngine> getStructure_EM(){
+        if (multiDefinition == null){
+            multiDefinition = StructureDefinition
+                    .<UniversalChemicalFuelEngine>builder()
+                    .addShape(mName,
+                            transpose(new String[][]{
+                                    {},
+                                    {},
+                                    {},
+                                    {},
+                                    {},
+                                    {},
+                            })
+                    )
+                    .build();
+        }
+        return multiDefinition;
+    }
+
+    @Override
+    public void construct(ItemStack itemStack, boolean b) {
+
+    }
+
+    @Override
+    public String[] getStructureDescription(ItemStack itemStack) {
+        return new String[0];
+    }
+
+    @Override
+    public boolean isCorrectMachinePart(ItemStack aStack) {
+        return true;
+    }
+
+    @Override
+    public List<GT_MetaTileEntity_Hatch_Energy> getVanillaEnergyHatches() {
+        return this.mEnergyHatches;
+    }
+
+    @Override
+    public List<GT_MetaTileEntity_Hatch_EnergyTunnel> getTecTechEnergyTunnels() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<GT_MetaTileEntity_Hatch_EnergyMulti> getTecTechEnergyMultis() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new MultiNqGenerator(this.mName);
+    }
+}
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java
index 00b7ca6e35..8c1c7cf214 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/GoodGenerator/Items/MyMaterial.java
@@ -336,7 +336,7 @@ public class MyMaterial implements Runnable {
 
     public static final Werkstoff ether = new Werkstoff(
             new short[]{0xeb,0xbc,0x2f},
-            "ether",
+            "Ether",
             subscriptNumbers("CH3CH2OCH2CH3"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java
index 238fcbffff..f247851867 100644
--- a/src/main/java/GoodGenerator/Loader/Loaders.java
+++ b/src/main/java/GoodGenerator/Loader/Loaders.java
@@ -35,6 +35,7 @@ public class Loaders {
     public static final Block FRF_Coil_3 = new Casing("FRF_Coil_3",new String[]{GoodGenerator.MOD_ID+":FRF_Coils/3"});
     public static final Block radiationProtectionSteelFrame = new Frame("radiationProtectionSteelFrame",new String[]{GoodGenerator.MOD_ID+":radiationProtectionSteelFrame"});
     public static final Block fieldRestrictingGlass = new Frame("fieldRestrictingGlass",new String[]{GoodGenerator.MOD_ID+":fieldRestrictingGlass"});
+    public static final Block titaniumPlatedCylinder = new Frame("titaniumPlatedCylinder",new String[]{GoodGenerator.MOD_ID+":titaniumPlatedCylinder"});
 
     public static ItemStack MAR;
     public static ItemStack FRF;
@@ -47,6 +48,7 @@ public class Loaders {
         GameRegistry.registerBlock(FRF_Coil_1,MyItemBlocks.class,"FRF_Coil_1");
         GameRegistry.registerBlock(FRF_Coil_2,MyItemBlocks.class,"FRF_Coil_2");
         GameRegistry.registerBlock(FRF_Coil_3,MyItemBlocks.class,"FRF_Coil_3");
+        GameRegistry.registerBlock(titaniumPlatedCylinder,MyItemBlocks.class,"titaniumPlatedCylinder");
         GameRegistry.registerItem(radiationProtectionPlate,"radiationProtectionPlate",GoodGenerator.MOD_ID);
         GameRegistry.registerItem(wrappedUraniumIngot,"wrappedUraniumIngot",GoodGenerator.MOD_ID);
         GameRegistry.registerItem(highDensityUraniumNugget,"highDensityUraniumNugget",GoodGenerator.MOD_ID);