clean the long power use base and add item util for tiered material (#108)

2 files changed, 44 insertions, 2 deletions

diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java
index e6c50f6ec1..795686f676 100644
--- a/src/main/java/goodgenerator/util/MaterialFix.java
+++ b/src/main/java/goodgenerator/util/MaterialFix.java
@@ -11,12 +11,18 @@ import gregtech.api.util.GT_Utility;
 
 public class MaterialFix {
     public static void MaterialFluidExtractionFix(Werkstoff material) {
-        if (material.hasItemType(OrePrefixes.ingot))
+        if (material.hasItemType(OrePrefixes.ingot)) {
             GT_Values.RA.addFluidExtractionRecipe(
                     material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8);
-        if (material.hasItemType(OrePrefixes.plate))
+            GT_Values.RA.addFluidSolidifierRecipe(
+                    ItemList.Shape_Mold_Ingot.get(0), material.getMolten(144), material.get(OrePrefixes.ingot), 32, 48);
+        }
+        if (material.hasItemType(OrePrefixes.plate)) {
             GT_Values.RA.addFluidExtractionRecipe(
                     material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8);
+            GT_Values.RA.addFluidSolidifierRecipe(
+                    ItemList.Shape_Mold_Plate.get(0), material.getMolten(144), material.get(OrePrefixes.plate), 32, 48);
+        }
         if (material.hasItemType(OrePrefixes.gearGtSmall))
             GT_Values.RA.addFluidExtractionRecipe(
                     material.get(OrePrefixes.gearGtSmall), null, material.getMolten(144), 0, 32, 8);
diff --git a/src/main/java/goodgenerator/util/StackUtils.java b/src/main/java/goodgenerator/util/StackUtils.java
index 1d7dcc3ac8..bf06f821ac 100644
--- a/src/main/java/goodgenerator/util/StackUtils.java
+++ b/src/main/java/goodgenerator/util/StackUtils.java
@@ -1,11 +1,14 @@
 package goodgenerator.util;
 
+import goodgenerator.items.MyMaterial;
+import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Utility;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 public class StackUtils {
 
@@ -78,4 +81,37 @@ public class StackUtils {
     public static HashMap<ItemStack, Integer> getTotalItems(ItemStack[] items) {
         return getTotalItems(Arrays.asList(items));
     }
+
+    public static FluidStack getTieredFluid(int aTier, int aAmount) {
+        switch (aTier) {
+            case 0: // ULV
+                return Materials.RedAlloy.getMolten(aAmount);
+            case 1: // LV
+                return Materials.TinAlloy.getMolten(aAmount);
+            case 2: // MV
+                return Materials.RoseGold.getMolten(aAmount);
+            case 3: // HV
+                return MyMaterial.zircaloy4.getMolten(aAmount);
+            case 4: // EV
+                return MyMaterial.incoloy903.getMolten(aAmount);
+            case 5: // IV
+                return MyMaterial.titaniumBetaC.getMolten(aAmount);
+            case 6: // LuV
+                return MyMaterial.artheriumSn.getMolten(aAmount);
+            case 7: // ZPM
+                return MyMaterial.dalisenite.getMolten(aAmount);
+            case 8: // UV
+                return MyMaterial.tairitsu.getMolten(aAmount);
+            case 9: // UHV
+                return MyMaterial.preciousMetalAlloy.getMolten(aAmount);
+            case 10: // UEV
+                return MyMaterial.enrichedNaquadahAlloy.getMolten(aAmount);
+            case 11: // UIV
+                return MyMaterial.metastableOganesson.getMolten(aAmount);
+            case 12: // UMV
+                return Materials.SpaceTime.getMolten(aAmount);
+            default:
+                return MyMaterial.shirabon.getMolten(aAmount);
+        }
+    }
 }