rebase and fix

GregTechCEu · Aug 8, 2021 · 7a2e24b · 7a2e24b
1 parent 1b1e19a
commit 7a2e24b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/main/java/gregtech/integration/jei/GTJeiPlugin.java b/src/main/java/gregtech/integration/jei/GTJeiPlugin.java
@@ -199,9 +199,9 @@ public void register(IModRegistry registry) {
 
         //Material Tree
 		List<MaterialTree> materialTreeList = new CopyOnWriteArrayList<>();
-		for (Material material : Material.MATERIAL_REGISTRY) {
-			if (material instanceof DustMaterial) {
-				materialTreeList.add(new MaterialTree((DustMaterial) material));
+		for (Material material : MaterialRegistry.MATERIAL_REGISTRY) {
+			if (material.hasProperty(PropertyKey.DUST)) {
+				materialTreeList.add(new MaterialTree(material));
 			}
 		}
 		registry.addRecipes(materialTreeList, GTValues.MODID + ":" + "material_tree");

diff --git a/src/main/java/gregtech/integration/jei/recipe/primitive/MaterialTree.java b/src/main/java/gregtech/integration/jei/recipe/primitive/MaterialTree.java
@@ -2,8 +2,8 @@
 
 import com.google.common.collect.ImmutableList;
 import gregtech.api.unification.OreDictUnifier;
-import gregtech.api.unification.material.type.DustMaterial;
-import gregtech.api.unification.material.type.IngotMaterial;
+import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.ore.OrePrefix;
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.ingredients.VanillaTypes;
@@ -34,7 +34,7 @@ public class MaterialTree implements IRecipeWrapper {
             OrePrefix.gear,
             OrePrefix.frameGt,
             OrePrefix.nugget,
-            OrePrefix.pipeNormal,
+            OrePrefix.pipeNormalFluid,
             OrePrefix.plate,
             OrePrefix.plateDense,
             OrePrefix.gemChipped,
@@ -57,7 +57,7 @@ public class MaterialTree implements IRecipeWrapper {
 	private final long avgP;
 	private final long avgN;
 
-	public MaterialTree(DustMaterial material) {
+	public MaterialTree(Material material) {
 	    // adding an empty list to itemInputs/fluidInputs makes checking if a prefix exists much easier
 		List<ItemStack> inputDusts = new ArrayList<>();
 		for (OrePrefix prefix : PREFIXES) {
@@ -69,10 +69,9 @@ public MaterialTree(DustMaterial material) {
 			this.itemInputs.add(matItemsStack);
 		}
 
-		FluidStack matFluid = material.getFluid(1000);
 		List<FluidStack> matFluidsStack = new ArrayList<>();
-		if (matFluid != null) {
-			matFluidsStack.add(matFluid);
+		if (material.hasProperty(PropertyKey.FLUID)) {
+			matFluidsStack.add(material.getFluid(1000));
 		}
 		this.fluidInputs.add(matFluidsStack);
 
@@ -81,8 +80,8 @@ public MaterialTree(DustMaterial material) {
 		avgM = material.getAverageMass();
 		avgP = material.getAverageProtons();
 		avgN = material.getAverageNeutrons();
-		if (material instanceof IngotMaterial) {
-			blastTemp = ((IngotMaterial) material).blastFurnaceTemperature;
+		if (material.hasProperty(PropertyKey.BLAST)) {
+			blastTemp = material.getBlastTemperature();
 		}
 		else {
 			blastTemp = 0;

diff --git a/src/main/java/gregtech/integration/jei/recipe/primitive/MaterialTreeCategory.java b/src/main/java/gregtech/integration/jei/recipe/primitive/MaterialTreeCategory.java
@@ -61,7 +61,7 @@ public class MaterialTreeCategory extends PrimitiveRecipeCategory<MaterialTree,
             129, 85,  // gear 15
             129, 117, // frameGt
             54, 85,   // nugget
-            54, 117,  // pipeNormal
+            54, 117,  // pipeNormalFluid
             54, 147,  // plate
             79, 135,  // plateDense 20
             79, 135,  // gemChipped (override)
@@ -178,7 +178,7 @@ public void drawExtras(Minecraft minecraft) {
         drawArrow(minecraft, "up_14", 160, 103, itemExists.get(27) && itemExists.get(28));
     	// wire -> fine wire
         drawArrow(minecraft, "down_12", 160, 135, itemExists.get(27) && itemExists.get(26));
-        // plate -> normal pipe
+        // plate -> normal fluid pipe
         drawArrow(minecraft, "up_12", 60, 135, itemExists.get(19) && itemExists.get(18));
         // hot ingot -> ingot
         drawArrow(minecraft, "down_16", 35, 85, itemExists.get(3) && itemExists.get(4));