Semi fluid (#463)

* add EV and IV semi fluid generators single block
add crafting recipe
change recipe to be more gt like

* BS+SA

* add pollution values

* spotless

5 files changed, 136 insertions, 16 deletions

diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index c4f6d4ad42..306377f4f9 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -286,7 +286,7 @@ public class CORE {
         public static int pollutionPerSecondMultiIndustrialChisel = 50;
         // pollution single blocks
         public static int basePollutionPerSecondSemiFluidGenerator = 40;
-        public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[] {0, 2.0, 4.0, 8.0};
+        public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[] {0, 2.0, 4.0, 8.0, 12.0, 16, 0};
         public static int basePollutionPerSecondBoiler = 35;
         public static double[] pollutionReleasedByTierBoiler = new double[] {0, 1.0, 1.43, 1.86};
         public static int baseMinPollutionPerSecondRocketFuelGenerator = 250;
diff --git a/src/main/java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/ALLOY.java
index d4baa1dab1..a3c373b860 100644
--- a/src/main/java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/main/java/gtPlusPlus/core/material/ALLOY.java
@@ -16,7 +16,9 @@ public final class ALLOY {
     public static final Material TUNGSTENSTEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.TungstenSteel);
     public static final Material STAINLESS_STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.StainlessSteel);
     public static final Material OSMIRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmiridium);
-
+    public static final Material POLYETHYLENE = MaterialUtils.generateMaterialFromGtENUM(Materials.Plastic);
+    public static final Material POLYTETRAFLUOROETHYLENE =
+            MaterialUtils.generateMaterialFromGtENUM(Materials.Polytetrafluoroethylene);
     public static final Material ENERGYCRYSTAL = new Material(
             "Energy Crystal", // Material Name
             MaterialState.SOLID, // State
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index e4ea47b836..46a73e4007 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1971,44 +1971,69 @@ public class RECIPES_Machines {
             // TODO
 
             // Semi-Fluid Generators
-            ItemStack[][] aSemiFluidInputs = new ItemStack[3][6];
+            ItemStack[][] aSemiFluidInputs = new ItemStack[5][10];
             aSemiFluidInputs[0] = new ItemStack[] {
                 CI.getNumberedBioCircuit(14),
                 CI.getTieredMachineHull(1, 1),
+                CI.getElectricMotor(1, 2),
                 CI.getElectricPiston(1, 2),
-                CI.getTieredComponent(OrePrefixes.circuit, 1, 2),
-                CI.getPlate(1, 4),
+                CI.getTieredComponent(OrePrefixes.cableGt01, 1, 1),
+                CI.getTieredComponent(OrePrefixes.circuit, 1, 1),
                 CI.getGear(1, 2)
             };
             aSemiFluidInputs[1] = new ItemStack[] {
-                CI.getNumberedCircuit(14),
+                CI.getNumberedBioCircuit(14),
                 CI.getTieredMachineHull(2, 1),
+                CI.getElectricMotor(2, 2),
                 CI.getElectricPiston(2, 2),
-                CI.getTieredComponent(OrePrefixes.circuit, 2, 2),
-                CI.getPlate(2, 4),
+                CI.getTieredComponent(OrePrefixes.cableGt01, 2, 1),
+                CI.getTieredComponent(OrePrefixes.circuit, 2, 1),
                 CI.getGear(2, 2)
             };
             aSemiFluidInputs[2] = new ItemStack[] {
-                CI.getNumberedAdvancedCircuit(14),
+                CI.getNumberedBioCircuit(14),
                 CI.getTieredMachineHull(3, 1),
+                CI.getElectricMotor(3, 2),
                 CI.getElectricPiston(3, 2),
-                CI.getTieredComponent(OrePrefixes.circuit, 3, 2),
-                CI.getPlate(3, 4),
+                CI.getTieredComponent(OrePrefixes.cableGt01, 3, 1),
+                CI.getTieredComponent(OrePrefixes.circuit, 3, 1),
                 CI.getGear(3, 2)
             };
+            aSemiFluidInputs[3] = new ItemStack[] {
+                CI.getNumberedBioCircuit(14),
+                CI.getTieredMachineHull(4, 1),
+                CI.getElectricMotor(4, 2),
+                CI.getElectricPiston(4, 2),
+                CI.getTieredComponent(OrePrefixes.cableGt01, 4, 1),
+                CI.getTieredComponent(OrePrefixes.circuit, 4, 1),
+                CI.getGear(4, 2)
+            };
+            aSemiFluidInputs[4] = new ItemStack[] {
+                CI.getNumberedBioCircuit(14),
+                CI.getTieredMachineHull(5, 1),
+                CI.getElectricMotor(5, 2),
+                CI.getElectricPiston(5, 2),
+                CI.getTieredComponent(OrePrefixes.cableGt01, 5, 1),
+                CI.getTieredComponent(OrePrefixes.circuit, 5, 1),
+                CI.getGear(5, 2)
+            };
             FluidStack[] aSemiFluidFluidInputs = new FluidStack[] {
-                ALLOY.BRONZE.getFluidStack(144 * 8),
-                ALLOY.STEEL.getFluidStack(144 * 8),
-                ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8),
+                ALLOY.POLYETHYLENE.getFluidStack(144),
+                ALLOY.POLYETHYLENE.getFluidStack(144),
+                ALLOY.POLYETHYLENE.getFluidStack(144),
+                ALLOY.POLYETHYLENE.getFluidStack(144),
+                ALLOY.POLYTETRAFLUOROETHYLENE.getFluidStack(144)
             };
 
             // ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);
             ItemStack[] aSemifluids = new ItemStack[] {
                 GregtechItemList.Generator_SemiFluid_LV.get(1),
                 GregtechItemList.Generator_SemiFluid_MV.get(1),
-                GregtechItemList.Generator_SemiFluid_HV.get(1)
+                GregtechItemList.Generator_SemiFluid_HV.get(1),
+                GregtechItemList.Generator_SemiFluid_EV.get(1),
+                GregtechItemList.Generator_SemiFluid_IV.get(1)
             };
-            for (int o = 0; o < 3; o++) {
+            for (int o = 0; o < 5; o++) {
                 CORE.RA.addSixSlotAssemblingRecipe(
                         aSemiFluidInputs[o],
                         aSemiFluidFluidInputs[o],
@@ -2016,6 +2041,91 @@ public class RECIPES_Machines {
                         20 * 30,
                         MaterialUtils.getVoltageForTier(o + 1));
             }
+            GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_LV.get(1L), new Object[] {
+                "PCP",
+                "EME",
+                "GWG",
+                'M',
+                ItemList.Hull_LV,
+                'P',
+                ItemList.Electric_Piston_LV,
+                'E',
+                ItemList.Electric_Motor_LV,
+                'C',
+                OrePrefixes.circuit.get(Materials.Basic),
+                'W',
+                OrePrefixes.cableGt01.get(Materials.Tin),
+                'G',
+                ALLOY.TUMBAGA.getGear(2)
+            });
+            GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_MV.get(1L), new Object[] {
+                "PCP",
+                "EME",
+                "GWG",
+                'M',
+                ItemList.Hull_MV,
+                'P',
+                ItemList.Electric_Piston_MV,
+                'E',
+                ItemList.Electric_Motor_MV,
+                'C',
+                OrePrefixes.circuit.get(Materials.Good),
+                'W',
+                OrePrefixes.cableGt01.get(Materials.AnyCopper),
+                'G',
+                ALLOY.EGLIN_STEEL.getGear(2)
+            });
+            GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_HV.get(1L), new Object[] {
+                "PCP",
+                "EME",
+                "GWG",
+                'M',
+                ItemList.Hull_HV,
+                'P',
+                ItemList.Electric_Piston_HV,
+                'E',
+                ItemList.Electric_Motor_HV,
+                'C',
+                OrePrefixes.circuit.get(Materials.Advanced),
+                'W',
+                OrePrefixes.cableGt01.get(Materials.Gold),
+                'G',
+                ALLOY.INCONEL_625.getGear(2)
+            });
+            GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_EV.get(1L), new Object[] {
+                "PCP",
+                "EME",
+                "GWG",
+                'M',
+                ItemList.Hull_EV,
+                'P',
+                ItemList.Electric_Piston_EV,
+                'E',
+                ItemList.Electric_Motor_EV,
+                'C',
+                OrePrefixes.circuit.get(Materials.Data),
+                'W',
+                OrePrefixes.cableGt01.get(Materials.Aluminium),
+                'G',
+                ALLOY.INCOLOY_DS.getGear(1)
+            });
+            GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_IV.get(1L), new Object[] {
+                "PCP",
+                "EME",
+                "GWG",
+                'M',
+                ItemList.Hull_IV,
+                'P',
+                ItemList.Electric_Piston_IV,
+                'E',
+                ItemList.Electric_Motor_IV,
+                'C',
+                OrePrefixes.circuit.get(Materials.Elite),
+                'W',
+                OrePrefixes.cableGt01.get(Materials.Tungsten),
+                'G',
+                ALLOY.NITINOL_60.getGear(1)
+            });
 
             if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) {
                 // Industrial Blast Smelter
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index e08cae7c00..355b1c7477 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -872,6 +872,8 @@ public enum GregtechItemList implements GregtechItemContainer {
     Generator_SemiFluid_LV,
     Generator_SemiFluid_MV,
     Generator_SemiFluid_HV,
+    Generator_SemiFluid_EV,
+    Generator_SemiFluid_IV,
 
     // Advanced Mixer 4x4
     Machine_Advanced_LV_Mixer,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
index b98f193df0..c8881c7490 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java
@@ -16,6 +16,12 @@ public class GregtechSemiFluidgenerators {
         GregtechItemList.Generator_SemiFluid_HV.set(new GT_MetaTileEntity_SemiFluidGenerator(
                         839, "basicgenerator.semifluid.tier.03", "Turbo Semi-Fluid Generator", 3)
                 .getStackForm(1L));
+        GregtechItemList.Generator_SemiFluid_EV.set(new GT_MetaTileEntity_SemiFluidGenerator(
+                        993, "basicgenerator.semifluid.tier.04", "Turbo Semi-Fluid Generator II", 4)
+                .getStackForm(1L));
+        GregtechItemList.Generator_SemiFluid_IV.set(new GT_MetaTileEntity_SemiFluidGenerator(
+                        994, "basicgenerator.semifluid.tier.05", "Turbo Semi-Fluid Generator III", 5)
+                .getStackForm(1L));
         GregtechItemList.Controller_LargeSemifluidGenerator.set(new GregtechMetaTileEntity_LargeSemifluidGenerator(
                         31026, "gtpp.multimachine.semifluidgenerator", "Large Semifluid Burner")
                 .getStackForm(1L));