From 5cb0af0351131c95882c33f56801d3ac6bb79b0f Mon Sep 17 00:00:00 2001
From: unknown <gtandemmodding@gmail.com>
Date: Sat, 12 Mar 2022 10:11:14 +1100
Subject: Add new material: MAR-M247

---
 .../common/register/WerkstoffMaterialPool.java     | 16 ++++++++++++-
 .../com/elisis/gtnhlanth/loader/RecipeLoader.java  | 28 +++++++++++++++++++---
 2 files changed, 40 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index 68a2b4e424..4b14476edd 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -116,7 +116,7 @@ public class WerkstoffMaterialPool implements Runnable {
             subscriptNumbers("Zr"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
-            new Werkstoff.GenerationFeatures().disable().addMetalItems().enforceUnification(),
+            new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(),
             offsetID + 7,
             TextureSet.SET_DULL
             
@@ -1087,6 +1087,20 @@ public class WerkstoffMaterialPool implements Runnable {
     		TextureSet.SET_DULL
     	);
     
+    public static final Werkstoff MARM247 = new Werkstoff(
+    		new short[] {255, 133, 145},
+    		"MAR-M247",
+    		new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680),
+    		Werkstoff.Types.COMPOUND,
+    		new Werkstoff.GenerationFeatures().disable()
+    				.onlyDust()	
+    				.addMolten()
+    				.addMetalItems() 				
+    				,
+    		offsetID3 + 15,
+    		TextureSet.SET_METALLIC
+    	);
+    
     
     public static void runInit() {
     	
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index 4100becc03..503204f093 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -628,10 +628,10 @@ public class RecipeLoader {
         GT_Values.RA.addElectromagneticSeparatorRecipe(
         		WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), 
         		WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1), 
-        		WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dustSmall, 1),  // Maybe also holmium
+        		WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 1),  // Maybe also holmium
         		null, 
         		new int[] {
-        				9000, 10
+        				9000, 500
         		}, 
         		600, 
         		1920
@@ -1140,6 +1140,27 @@ public class RecipeLoader {
 		GT_Values.RA.addAssemblerRecipe(new ItemStack[]
 				{ItemList.Hull_EV.get(1L), ItemList.Super_Tank_HV.get(2L), ItemList.Electric_Motor_EV.get(4L), ItemList.Electric_Pump_EV.get(2L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), GT_Utility.getIntegratedCircuit(1)},
 				Materials.Polytetrafluoroethylene.getMolten(720), LanthItemList.DISSOLUTION_TANK, 400, 960);
+		
+		
+		GT_Values.RA.addMixerRecipe(
+				Materials.Nichrome.getDust(4),
+				Materials.Aluminium.getDust(2),
+				WerkstoffMaterialPool.Hafnium.get(OrePrefixes.dust, 1),
+				Materials.Tantalum.getDust(2),
+				Materials.Tungsten.getDust(5),
+				WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1),
+				Materials.Titanium.getDust(1),
+				null,
+				null,
+				null,
+				null,
+				WerkstoffMaterialPool.MARM247.get(OrePrefixes.dust, 16),
+				null,
+				null,
+				null,
+				800,
+				7680
+			);
 	}
     
     //public static void loadZylon
@@ -1311,6 +1332,7 @@ public class RecipeLoader {
                     }
                 }
             }
+            /*
             GT_Recipe tRecipe = recipe.copy();
             if (GT_Utility.isStackValid(fluidInput)) {
             	if (fluidInput.getLocalizedName() == MyMaterial.plutoniumBasedLiquidFuel.getDefaultName()) {
@@ -1319,7 +1341,7 @@ public class RecipeLoader {
                 	remove.add(tRecipe);
             	}
             	
-            }
+            }*/
         }
         GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.removeAll(remove);
         GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.addAll(reAdd);
-- 
cgit