From 9fe3f693f1d6d015f45898818b7958b3a57a9f4a Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 26 Jul 2019 04:23:36 +0100
Subject: + Added config option to adjust ingame BGM delays. (Should be
 working) + Added a Pest Killer for quick removal of Butterflies and Bats. +
 Added Hydrogen Cyanide. % Replaced existing assets for the Bat King. %
 Replaced Bat King Logic, it's now an offensive mob. $ Fixed Bat King model
 scaling.

---
 src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index c7032ab7c7..936e711ac2 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -83,6 +83,22 @@ public final class MISC_MATERIALS {
                        new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8),
                        new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
                });
+       
+       public static final Material HYDROGEN_CYANIDE = new Material(
+	            "Hydrogen Cyanide",
+	            MaterialState.PURE_LIQUID, //State
+	            null, //Material Colour
+	            4, //Melting Point in C
+	            26, //Boiling Point in C
+	            -1, //Protons
+	            -1,
+	            false, //Uses Blast furnace?
+	            //Material Stacks with Percentage of required elements.
+	            new MaterialStack[]{
+	                    new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
+	                    new MaterialStack(ELEMENT.getInstance().CARBON, 1),
+	                    new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)
+	            });
 
 	
 	
-- 
cgit 


From c720e39d84cd3e2166034eb3f7119b3aa38f5ec5 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sat, 17 Aug 2019 14:12:58 +0100
Subject: + Added Multiblock Rocket Engine. Closes #464. + Added Liquid
 Hydrogen. + Added Carbon Dioxide if it doesn't exit (.08 compat)

---
 .../gtPlusPlus/core/material/MISC_MATERIALS.java   | 125 ++++++++++++---------
 src/Java/gtPlusPlus/core/material/Material.java    |   7 +-
 2 files changed, 74 insertions(+), 58 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 936e711ac2..bf6e0ef9e7 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -6,17 +6,17 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class MISC_MATERIALS {	
-	
+
 	/*
 	 * Some of these materials purely exist as data objects, items will most likely be assigned seperately.
 	 * Most are just compositions which will have dusts assigned to them.
 	 */
-	
+
 	public static void run() {
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_OXIDE, false);
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false);
 	}
-	
+
 	public static final Material STRONTIUM_OXIDE = new Material(
 			"Strontium Oxide", 
 			MaterialState.SOLID, 
@@ -33,8 +33,8 @@ public final class MISC_MATERIALS {
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
-					});
-	
+			});
+
 	public static final Material STRONTIUM_HYDROXIDE = new Material(
 			"Strontium Hydroxide", 
 			MaterialState.SOLID, 
@@ -51,55 +51,70 @@ public final class MISC_MATERIALS {
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
 					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
-					});
-	
-	   public static final Material SELENIUM_DIOXIDE = new Material(
-	            "Selenium Dioxide",
-	            MaterialState.PURE_LIQUID, //State
-	            null, //Material Colour
-	            -1, //Melting Point in C
-	            -1, //Boiling Point in C
-	            -1, //Protons
-	            -1,
-	            false, //Uses Blast furnace?
-	            //Material Stacks with Percentage of required elements.
-	            new MaterialStack[]{
-	                    new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
-	                    new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
-	            });
-	   
-       public static final Material SELENIOUS_ACID = new Material(
-               "Selenious Acid",
-               MaterialState.PURE_LIQUID, //State
-               null, //Material Colour
-               -1, //Melting Point in C
-               -1, //Boiling Point in C
-               -1, //Protons
-               -1,
-               false, //Uses Blast furnace?
-               //Material Stacks with Percentage of required elements.
-               new MaterialStack[]{
-                       new MaterialStack(SELENIUM_DIOXIDE, 1),
-                       new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8),
-                       new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
-               });
-       
-       public static final Material HYDROGEN_CYANIDE = new Material(
-	            "Hydrogen Cyanide",
-	            MaterialState.PURE_LIQUID, //State
-	            null, //Material Colour
-	            4, //Melting Point in C
-	            26, //Boiling Point in C
-	            -1, //Protons
-	            -1,
-	            false, //Uses Blast furnace?
-	            //Material Stacks with Percentage of required elements.
-	            new MaterialStack[]{
-	                    new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
-	                    new MaterialStack(ELEMENT.getInstance().CARBON, 1),
-	                    new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)
-	            });
+			});
+
+	public static final Material SELENIUM_DIOXIDE = new Material(
+			"Selenium Dioxide",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
+			});
+
+	public static final Material SELENIOUS_ACID = new Material(
+			"Selenious Acid",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(SELENIUM_DIOXIDE, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
+			});
+
+	public static final Material HYDROGEN_CYANIDE = new Material(
+			"Hydrogen Cyanide",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			4, //Melting Point in C
+			26, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)
+			});
+
+	public static final Material CARBON_DIOXIDE = new Material(
+			"Carbon Dioxide",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-56, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
+			});
+
+
 
-	
-	
 }
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 6b6be32107..6e5cd0f8f0 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -463,9 +463,10 @@ public class Material {
 			}
 
 			if (generateFluid){
-				final Materials isValid = Materials.get(this.getLocalizedName());
-				if (FluidUtils.getFluidStack(localizedName, 1) != null){
-					this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid();
+				final Materials isValid = Materials.get(this.getLocalizedName());				
+				FluidStack aTest = FluidUtils.getWildcardFluidStack(localizedName, 1);				
+				if (aTest != null){
+					this.vMoltenFluid = aTest.getFluid();
 				}
 				else if (isValid == null || isValid == Materials._NULL){
 					queueFluidGeneration();
-- 
cgit 


From 7403427bbb0026962665c2f46d4108ae5777814d Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sat, 24 Aug 2019 18:36:58 +0100
Subject: + Added new processing chain for Rare Earth. 3 different processing
 chains can be used to obtain various resources. Closes #530. % Adjusted some
 auto-generated recipe processing times for Ore materials. % Adjusted some
 material components of a few Ore materials. $ Added some placeholder names
 for unnamed blocks from other mods.

---
 .../gtPlusPlus/core/material/MISC_MATERIALS.java   | 75 ++++++++++++++++++++++
 src/Java/gtPlusPlus/core/material/Material.java    |  4 +-
 src/Java/gtPlusPlus/core/material/ORES.java        | 28 ++++++--
 3 files changed, 101 insertions(+), 6 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index bf6e0ef9e7..236af1b060 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.core.material;
 
+import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
+import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
@@ -114,6 +116,79 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
 			});
+	
+	
+	
+	
+	/*
+	 * Rare Earth Materials
+	 */
+	
+	public static final Material RARE_EARTH_LOW = new Material(
+			"Rare Earth (I)", //Material Name
+			MaterialState.ORE, //State
+			TextureSets.GEM_A.get(), //Texture Set
+			null, //Material Colour
+			1200,
+			2500,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ORES.GREENOCKITE, 1),
+					new MaterialStack(ORES.LANTHANITE_CE, 1),					
+					new MaterialStack(ORES.AGARDITE_CD, 1),					
+					new MaterialStack(ORES.XENOTIME, 1),
+					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
+					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
+					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
+					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Cobaltite), 1),
+					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1)
+			});
+	
+	public static final Material RARE_EARTH_MID = new Material(
+			"Rare Earth (II)", //Material Name
+			MaterialState.ORE, //State
+			TextureSets.ENRICHED.get(), //Texture Set
+			null, //Material Colour
+			3500,
+			5000,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ORES.LANTHANITE_ND, 1),
+					new MaterialStack(ORES.AGARDITE_ND, 1),					
+					new MaterialStack(ORES.YTTRIAITE, 1),					
+					new MaterialStack(ORES.CROCROITE, 1),					
+					new MaterialStack(ORES.NICHROMITE, 1),					
+					new MaterialStack(ORES.ZIRCON, 1),
+					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
+					new MaterialStack(ELEMENT.STANDALONE.WHITE_METAL, 1),
+					new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1)			
+			});
+	
+	public static final Material RARE_EARTH_HIGH = new Material(
+			"Rare Earth (III)", //Material Name
+			MaterialState.ORE, //State
+			TextureSets.REFINED.get(), //Texture Set
+			null, //Material Colour
+			5200,
+			7500,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ORES.GADOLINITE_Y, 1),
+					new MaterialStack(ORES.LEPERSONNITE, 1),
+					new MaterialStack(ORES.FLORENCITE, 1),					
+					new MaterialStack(ORES.FLUORCAPHITE, 1),
+					new MaterialStack(ORES.LAUTARITE, 1),
+					new MaterialStack(ORES.DEMICHELEITE_BR, 1),					
+					new MaterialStack(ORES.ALBURNITE, 1),
+					new MaterialStack(ORES.KASHINITE, 1),
+					new MaterialStack(ORES.AGARDITE_LA, 1),
+			});
 
 
 
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 6e5cd0f8f0..5fca2fb2fe 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -94,8 +94,8 @@ public class Material {
 		this(materialName, defaultState, null, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
 	}
 
-	public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){
-		this(materialName, defaultState, set, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
+	public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba, int meltingPoint, int boilingPoint, int protons, int neutrons, int radiationLevel, MaterialStack[] materialStacks){
+		this(materialName, defaultState, set, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, false, "", radiationLevel, false, materialStacks);
 	}
 	
 	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index 0e1691a557..c2556b60f1 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -90,9 +90,10 @@ public final class ORES {
 			-1,
 			-1, //Radiation
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().LEAD, 1),
-					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
+					new MaterialStack(ELEMENT.getInstance().LEAD, 2),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+					new MaterialStack(ELEMENT.getInstance().CAESIUM, 1),
 			});	
 
 	public static final Material NICHROMITE = new Material(
@@ -126,7 +127,10 @@ public final class ORES {
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+					new MaterialStack(ELEMENT.getInstance().IRON, 4),
+					new MaterialStack(ELEMENT.getInstance().TIN, 1),
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 2)
 			});	
 
 	//Samarskite_Y
@@ -260,6 +264,7 @@ public final class ORES {
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
 			});
@@ -794,6 +799,21 @@ public final class ORES {
 					new MaterialStack(ELEMENT.getInstance().SULFUR, 16),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 15)
 			});
+
+	public static final Material GREENOCKITE = new Material(
+			"Greenockite", //Material Name
+			MaterialState.ORE, //State
+			TextureSets.GEM_A.get(), //Texture Set
+			new short[]{110, 193, 25, 0}, //Material Colour
+			-1,
+			-1,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CADMIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 2),
+			});
 	
 
 	public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material(
-- 
cgit 


From b851ee133b5f0a0d1ca5837d9dac3cdfec922561 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sat, 24 Aug 2019 21:21:48 +0100
Subject: + Added new recipes for Hydrogen Chloride, Sodium Hydroxide, Brine. +
 Added new UV/IR laser lens. $ Fixed Chemical formula not showing up correctly
 on some mixed materials. $ Fixed Tooltips of Rare Earth materials being too
 long. $ Fixed Voltage of Rare Earth materials being a tier too high.

---
 .../gtPlusPlus/core/material/MISC_MATERIALS.java   | 116 +++++++++++++++++++--
 src/Java/gtPlusPlus/core/material/Material.java    |  21 +++-
 .../core/material/nuclear/FLUORIDES.java           |  55 +---------
 3 files changed, 131 insertions(+), 61 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 236af1b060..aa80f784a9 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -3,8 +3,8 @@ package gtPlusPlus.core.material;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
-import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class MISC_MATERIALS {	
@@ -17,6 +17,7 @@ public final class MISC_MATERIALS {
 	public static void run() {
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_OXIDE, false);
 		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false);
+		WATER.registerComponentForMaterial(FluidUtils.getWater(1000));
 	}
 
 	public static final Material STRONTIUM_OXIDE = new Material(
@@ -52,7 +53,7 @@ public final class MISC_MATERIALS {
 			false,
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
-					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
+					new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
 			});
 
 	public static final Material SELENIUM_DIOXIDE = new Material(
@@ -116,14 +117,12 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
 			});
-	
-	
-	
-	
+
+
 	/*
 	 * Rare Earth Materials
 	 */
-	
+
 	public static final Material RARE_EARTH_LOW = new Material(
 			"Rare Earth (I)", //Material Name
 			MaterialState.ORE, //State
@@ -145,7 +144,7 @@ public final class MISC_MATERIALS {
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Cobaltite), 1),
 					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1)
 			});
-	
+
 	public static final Material RARE_EARTH_MID = new Material(
 			"Rare Earth (II)", //Material Name
 			MaterialState.ORE, //State
@@ -167,7 +166,7 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.STANDALONE.WHITE_METAL, 1),
 					new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1)			
 			});
-	
+
 	public static final Material RARE_EARTH_HIGH = new Material(
 			"Rare Earth (III)", //Material Name
 			MaterialState.ORE, //State
@@ -190,6 +189,105 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ORES.AGARDITE_LA, 1),
 			});
 
+	public static final Material WATER = new Material(
+			"Water",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
+			});
+
+	//OH
+	public static final Material HYDROXIDE = new Material(
+			"Hydroxide", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1)
+			});
+
+	//NH3
+	public static final Material AMMONIA = new Material(
+			"Ammonia", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-77, //Melting Point in C
+			-33, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3)
+			});
+
+	//NH4
+	public static final Material AMMONIUM = new Material(
+			"Ammonium", //Material Name
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)
+			});
+
+
+	public static final Material HYDROGEN_CHLORIDE = new Material(
+			"Hydrogen Chloride",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
+					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
+			});
+
+
+	public static final Material SODIUM_CHLORIDE = new Material(
+			"Sodium Chloride",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
+			});
+
+
+	public static final Material SODIUM_HYDROXIDE = new Material(
+			"Sodium Hydroxide",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+					new MaterialStack(HYDROXIDE, 1),
+			});
+
+	public static final Material SALT_WATER = new Material(
+			"Salt Water",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(WATER, 3),
+					new MaterialStack(SODIUM_CHLORIDE, 1),
+			});
+
+	public static final Material BRINE = new Material(
+			"Brine",
+			MaterialState.PURE_LIQUID,
+			new MaterialStack[]{
+					new MaterialStack(SALT_WATER, 1),
+					new MaterialStack(SODIUM_CHLORIDE, 2),
+			});
+
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 5fca2fb2fe..904d1fb4df 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -85,8 +85,17 @@ public class Material {
 
 
 	public static AutoMap<Materials> invalidMaterials = new AutoMap<Materials>();
+	
+
+	public Material(final String materialName, final MaterialState defaultState, final MaterialStack... inputs){
+		this(materialName, defaultState, null, inputs);
+	}
+	
+	public Material(final String materialName, final MaterialState defaultState, final short[] rgba, final MaterialStack... inputs){
+		this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", 0, false, false, inputs);
+	}
 
-	public Material(String materialName, MaterialState defaultState, short[] rgba, int radiationLevel, MaterialStack[] materialStacks) {
+	public Material(final String materialName, final MaterialState defaultState, final short[] rgba, int radiationLevel, MaterialStack... materialStacks) {
 		this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", radiationLevel, false, materialStacks);
 	}
 
@@ -1335,7 +1344,17 @@ public class Material {
 	}
 	
 	
+	public boolean registerComponentForMaterial(FluidStack aStack) {
+		return registerComponentForMaterial(this, aStack);
+	}
 	
+	private static boolean registerComponentForMaterial(Material componentMaterial, FluidStack aStack) {		
+		if (componentMaterial != null && aStack != null && componentMaterial.vMoltenFluid == null) {
+			componentMaterial.vMoltenFluid = aStack.getFluid();
+			return true;
+		}
+		return false;
+	}
 	
 	public boolean registerComponentForMaterial(ComponentTypes aPrefix, ItemStack aStack) {
 		return registerComponentForMaterial(this, aPrefix.getGtOrePrefix(), aStack);
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index b7a5f6074d..bfa08d3c29 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.material.nuclear;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
@@ -166,54 +167,6 @@ public class FLUORIDES {
 
 	//LFTR sub components
 	
-	//OH
-	public static final Material HYDROXIDE = new Material(
-			"Hydroxide", //Material Name
-			MaterialState.PURE_LIQUID, //State
-			null, //Material Colour
-			-1, //Melting Point in C
-			-1, //Boiling Point in C
-			-1, //Protons
-			-1,
-			false, //Uses Blast furnace?
-			//Material Stacks with Percentage of required elements.
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1)
-			});
-	
-	//NH3
-	public static final Material AMMONIA = new Material(
-			"Ammonia", //Material Name
-			MaterialState.PURE_LIQUID, //State
-			null, //Material Colour
-			-77, //Melting Point in C
-			-33, //Boiling Point in C
-			-1, //Protons
-			-1,
-			false, //Uses Blast furnace?
-			//Material Stacks with Percentage of required elements.
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3)
-			});
-	
-	//NH4
-	public static final Material AMMONIUM = new Material(
-			"Ammonium", //Material Name
-			MaterialState.PURE_LIQUID, //State
-			null, //Material Colour
-			-1, //Melting Point in C
-			-1, //Boiling Point in C
-			-1, //Protons
-			-1,
-			false, //Uses Blast furnace?
-			//Material Stacks with Percentage of required elements.
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1),
-					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)
-			});
-	
 	//(NH4)HF2
 	public static final Material AMMONIUM_BIFLUORIDE = new Material(
 			"Ammonium Bifluoride", //Material Name
@@ -226,7 +179,7 @@ public class FLUORIDES {
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(FLUORIDES.AMMONIUM, 1),
+					new MaterialStack(MISC_MATERIALS.AMMONIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
 					new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
 			});
@@ -244,7 +197,7 @@ public class FLUORIDES {
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
-					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
+					new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
 			});
 	
 	// (NH4)2Be(OH)2 / (NH4)2BeF4
@@ -259,7 +212,7 @@ public class FLUORIDES {
 			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(FLUORIDES.AMMONIUM, 2),
+					new MaterialStack(MISC_MATERIALS.AMMONIUM, 2),
 					new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1)
 			});
 	
-- 
cgit 


From 89d30a5cfcc2d3d5773647350edf913f156062b3 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 27 Sep 2019 02:48:32 +0100
Subject: + Added ability for Pollution Scrubbers to remove pollution if it's
 disabled. Useful if you disable it after starting, as GT will then ignore it
 forever in the chunks it's left in. % Adjusted Melting point of CO2. %
 Adjusted the fuel usage on the LRE, I think? (I don't remember) $ Removed
 logging from decayable NEI handler. $ Fixed potential bad handling of fluid
 assignment to GT++ materials. $ Fixed incorrect handling of Sulphur Dioxide.
 $ Hopefully something here fixes the corruption of all canning recipes. :<

---
 .../gtPlusPlus/core/material/MISC_MATERIALS.java   |  2 +-
 src/Java/gtPlusPlus/core/material/Material.java    | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index aa80f784a9..0e661fd429 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -107,7 +107,7 @@ public final class MISC_MATERIALS {
 			"Carbon Dioxide",
 			MaterialState.PURE_LIQUID, //State
 			null, //Material Colour
-			-56, //Melting Point in C
+			-1, //Melting Point in C
 			-1, //Boiling Point in C
 			-1, //Protons
 			-1,
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 904d1fb4df..dbcbeac32a 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -477,28 +477,26 @@ public class Material {
 				if (aTest != null){
 					this.vMoltenFluid = aTest.getFluid();
 				}
-				else if (isValid == null || isValid == Materials._NULL){
-					queueFluidGeneration();
-				}
 				else {
-					if (isValid.mFluid != null){
-						this.vMoltenFluid = isValid.mFluid;
-					}
-					else if (isValid.mGas != null){
-						this.vMoltenFluid = isValid.mGas;
-					}
-					else {
+					if (isValid == null || isValid == Materials._NULL){
 						queueFluidGeneration();
 					}
+					else {		
+						FluidStack aTest2 = FluidUtils.getWildcardFluidStack(localizedName, 1);	
+						if (aTest2 != null){
+							this.vMoltenFluid = aTest2.getFluid();
+						}
+						else {
+							queueFluidGeneration();
+						}
+					}
 				}
-
 				this.vPlasma = this.generatePlasma();
 			}
 			else {
 				this.vMoltenFluid = null;
 				this.vPlasma = null;
 			}
-
 			String ratio = "";
 			if (this.vSmallestRatio != null) {
 				for (int hu=0;hu<this.vSmallestRatio.length;hu++){
-- 
cgit 


From ab84b1d95f8c4880891debc594a41f57941de78a Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 10 Oct 2019 17:45:37 +0100
Subject: + Added some new functions to ReflectionUtils.java. + Added an
 alternative way to Obtain Blizz rods, dust and Cryotheum dust if GalaxySpace
 is loaded. Closes #557. $ Fixed bug in DecayableRecipeHandler.java. $ Fixed
 instance where I was directly referencing forestry code. $ Rewrote how
 canning/uncanning recipes are handled, hopefully fixes the corruption of the
 recipe map. > I potentially broke some of my own canning recipes, so be aware
 of any missing and let me know.

---
 .../core/material/MaterialGenerator.java           | 61 ++++++++++++++--------
 1 file changed, 38 insertions(+), 23 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 44c02bc70d..1757b461ee 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -2,13 +2,6 @@ package gtPlusPlus.core.material;
 
 import java.util.Set;
 
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.Recipe_GT;
-
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -24,7 +17,11 @@ import gtPlusPlus.core.item.base.gears.BaseItemGear;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngotHot;
 import gtPlusPlus.core.item.base.nugget.BaseItemNugget;
-import gtPlusPlus.core.item.base.ore.*;
+import gtPlusPlus.core.item.base.ore.BaseItemCentrifugedCrushedOre;
+import gtPlusPlus.core.item.base.ore.BaseItemCrushedOre;
+import gtPlusPlus.core.item.base.ore.BaseItemImpureDust;
+import gtPlusPlus.core.item.base.ore.BaseItemPurifiedCrushedOre;
+import gtPlusPlus.core.item.base.ore.BaseItemPurifiedDust;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate;
 import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
 import gtPlusPlus.core.item.base.rings.BaseItemRing;
@@ -36,7 +33,21 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.loaders.*;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_AlloySmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Assembler;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelter;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Extruder;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluids;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MaterialProcessing;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Ore;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 public class MaterialGenerator {
@@ -48,21 +59,28 @@ public class MaterialGenerator {
 	@SuppressWarnings("unused")
 	private static volatile Block tempBlock;
 	
-	public static void addFluidExtractionRecipe(ItemStack a, Object b, FluidStack c, int a1, int a2, int a3) {
-		GT_Recipe r = new Recipe_GT(
+	/**
+	 * Called Reflectively from CORE.RA.addFluidExtractionRecipe
+	 */
+	private static void addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, int aDuration, int aEU) {
+		/*GT_Recipe r = new Recipe_GT(
 				true,
-				new ItemStack[] {a,  b != null ? (ItemStack) b : null},
+				new ItemStack[] {aEmpty,  aRemains != null ? aRemains : null},
 				new ItemStack[] {},
 				null,
 				new int[] {},
 				new FluidStack[] {},
 				new FluidStack[] {c},
-				a2, a3, a1);
-		new RecipeGen_FluidCanning(r, true);
+				a2, a3, a1);*/
+		//new RecipeGen_FluidCanning(r, true);
+		new RecipeGen_FluidCanning(true, aEmpty, aRemains, aFluid, aDuration, aEU);
 	}
-	
-	public static void addFluidCannerRecipe(ItemStack aFullContainer, ItemStack aEmpty, FluidStack rFluidIn, FluidStack rFluidOut) {		
-		GT_Recipe r = new Recipe_GT(
+
+	/**
+	 * Called Reflectively from CORE.RA.addFluidCannerRecipe
+	 */
+	private static void addFluidCannerRecipe(ItemStack aFullContainer, ItemStack aEmpty, FluidStack aFluid) {		
+		/*GT_Recipe r = new Recipe_GT(
 				true,
 				new ItemStack[] {aEmpty},
 				new ItemStack[] {aFullContainer},
@@ -70,12 +88,9 @@ public class MaterialGenerator {
 				new int[] {},
 				new FluidStack[] {rFluidIn},
 				new FluidStack[] {rFluidOut},
-				0, 0, 0);
-		new RecipeGen_FluidCanning(r, false);
-	}
-	
-	public static void generateFluidExtractorRecipe(GT_Recipe recipe, boolean extracting) {
-		new RecipeGen_FluidCanning(recipe, extracting);
+				0, 0, 0);*/
+		//new RecipeGen_FluidCanning(r, false);
+		new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluid, null, null);
 	}
 	
 	public static void generate(final Material matInfo){
-- 
cgit 


From 4a2fa070a2ae91173cf15785c63b4090016323d4 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 11 Oct 2019 18:14:07 +0100
Subject: $ Fixed many tiny bugs, found by static code analysis. $ Fixed
 Canning handling further. $ Adjusted the Charcoal Pit fix.

---
 src/Java/gtPlusPlus/core/material/Material.java    | 17 ++++---------
 .../core/material/MaterialGenerator.java           | 28 ++++++++++++++++++----
 2 files changed, 28 insertions(+), 17 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index dbcbeac32a..d95b17e75c 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -237,7 +237,7 @@ public class Material {
 					int hashSize = MathUtils.howManyPlaces(aValueForGen);
 
 					String a = String.valueOf(aValueForGen);
-					String b = null;
+					String b = "";
 					
 					if (hashSize < 9) {
 						int aSecondHash = this.materialState.hashCode();
@@ -379,9 +379,6 @@ public class Material {
 						aDataSet.put(m.getStackMaterial().vRadiationLevel);
 					}
 					byte aAverage = MathUtils.getByteAverage(aDataSet);
-					if (aAverage > Byte.MAX_VALUE || aAverage < Byte.MIN_VALUE) {
-						aAverage = 0;
-					}
 					if (aAverage > 0) {
 						Logger.MATERIALS(this.getLocalizedName()+" is radioactive due to trace elements. Level: "+aAverage+".");
 						this.isRadioactive = true;
@@ -531,11 +528,6 @@ public class Material {
 		}
 	}
 
-	public Material(String string, MaterialState solid, TextureSet setShiny, int i, short[] s, int j, int k, int l,
-			int m, boolean b, String string2, int n) {
-		// TODO Auto-generated constructor stub
-	}
-
 	public final TextureSet getTextureSet() {
 		synchronized(this) {
 			return textureSet;
@@ -868,10 +860,9 @@ public class Material {
 			ItemStack a1 = getOre(1);
 			Item a2 = a1.getItem();
 			Block a3 = Block.getBlockFromItem(a2);
-
-			//Logger.DEBUG_MATERIALS("[Invalid Ore] Is a1 valid? "+(a1 != null));
-			//Logger.DEBUG_MATERIALS("[Invalid Ore] Is a2 valid? "+(a2 != null));
-			//Logger.DEBUG_MATERIALS("[Invalid Ore] Is a3 valid? "+(a3 != null));
+			if (a3 != null) {
+				return a3;
+			}
 
 			Block x = Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ore"+Utils.sanitizeString(this.unlocalizedName), stacksize).getItem());
 			if (x != null){
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 1757b461ee..797a033dcc 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -59,10 +59,17 @@ public class MaterialGenerator {
 	@SuppressWarnings("unused")
 	private static volatile Block tempBlock;
 	
+
+	public static boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid) {
+		return addFluidExtractionRecipe(aEmpty, aRemains, aFluid, null, null);
+	}
+	
 	/**
 	 * Called Reflectively from CORE.RA.addFluidExtractionRecipe
+	 * @param aSpecial 
+	 * @return 
 	 */
-	private static void addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, int aDuration, int aEU) {
+	public static boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, Integer aDuration, Integer aEU) {
 		/*GT_Recipe r = new Recipe_GT(
 				true,
 				new ItemStack[] {aEmpty,  aRemains != null ? aRemains : null},
@@ -73,13 +80,22 @@ public class MaterialGenerator {
 				new FluidStack[] {c},
 				a2, a3, a1);*/
 		//new RecipeGen_FluidCanning(r, true);
-		new RecipeGen_FluidCanning(true, aEmpty, aRemains, aFluid, aDuration, aEU);
+		RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(true, aEmpty, aRemains, aFluid, aDuration, aEU);
+		if (g != null && g.valid()) {
+			return true;
+		}
+		return false;
 	}
 
+
+	public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut) {	
+		return addFluidCannerRecipe(aEmpty, aFullContainer, aFluidIn, rFluidOut, null, null);
+	}
 	/**
 	 * Called Reflectively from CORE.RA.addFluidCannerRecipe
+	 * @return 
 	 */
-	private static void addFluidCannerRecipe(ItemStack aFullContainer, ItemStack aEmpty, FluidStack aFluid) {		
+	public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut, Integer aTime, Integer aEu) {		
 		/*GT_Recipe r = new Recipe_GT(
 				true,
 				new ItemStack[] {aEmpty},
@@ -90,7 +106,11 @@ public class MaterialGenerator {
 				new FluidStack[] {rFluidOut},
 				0, 0, 0);*/
 		//new RecipeGen_FluidCanning(r, false);
-		new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluid, null, null);
+		RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
+		if (g != null && g.valid()) {
+			return true;
+		}
+		return false;
 	}
 	
 	public static void generate(final Material matInfo){
-- 
cgit 


From 0ba472ad9bc0f829302f41128df559fa852113ff Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 13 Oct 2019 22:22:06 +0100
Subject: % Tweaked recipes for Round-Robinators. % Tweaked composition of
 Ancient Granite, Black Metal, Rare Earth MID/HIGH.

---
 src/Java/gtPlusPlus/core/material/ELEMENT.java     | 27 ++++++++++++++++++++--
 .../gtPlusPlus/core/material/MISC_MATERIALS.java   |  4 ++--
 2 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 99586b37fe..ba2579aa97 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -217,9 +217,32 @@ public final class ELEMENT {
 		
 		
 		//Runescape materials
-		public static final Material BLACK_METAL = new Material("Black Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {5, 5, 5}, 2350, 4650, 24, 17, false, "҈", 0, new MaterialStack[]{new MaterialStack(getInstance().LEAD, 15), new MaterialStack(getInstance().TUNGSTEN, 25), new MaterialStack(getInstance().CARBON, 60)});//Not a GT Inherited Material
+		public static final Material BLACK_METAL = new Material("Black Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {5, 5, 5}, 2350, 4650, 24, 17, false, "҈", 0, new MaterialStack[]{new MaterialStack(getInstance().LEAD, 15), new MaterialStack(getInstance().MANGANESE, 25), new MaterialStack(getInstance().CARBON, 60)});//Not a GT Inherited Material
 		public static final Material WHITE_METAL = new Material("White Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {255, 255, 255}, 4560, 7580, 35, 41, false, "҉", 0, new MaterialStack[]{new MaterialStack(getInstance().COPPER, 5), new MaterialStack(getInstance().ANTIMONY, 10), new MaterialStack(getInstance().PLATINUM, 10), new MaterialStack(getInstance().TIN, 75)});//Not a GT Inherited Material
-		public static final Material GRANITE = new Material("Ancient Granite", MaterialState.SOLID, TextureSet.SET_SAND, new short[] {107, 107, 107}, 500, 2000, 16, 12, false, "«»", 0, false);//Not a GT Inherited Material
+		
+		public static final Material GRANITE = new Material(
+				"Ancient Granite", 
+				MaterialState.SOLID, 
+				TextureSet.SET_SAND, 
+				new short[] {107, 107, 107}, 
+				500, 
+				2000,
+				16,
+				12,
+				false,
+				"«»",
+				0,
+				false,
+				new MaterialStack[]{
+						new MaterialStack(getInstance().OXYGEN, 30),
+						new MaterialStack(getInstance().IRON, 20),
+						new MaterialStack(getInstance().SILICON, 20),
+						new MaterialStack(getInstance().ALUMINIUM, 10),
+						new MaterialStack(getInstance().POTASSIUM, 10),
+						new MaterialStack(getInstance().CALCIUM, 5),
+						new MaterialStack(getInstance().SODIUM, 5)
+						});//Not a GT Inherited Material
+		
 		public static final Material RUNITE = new Material("Runite", MaterialState.SOLID, TextureSet.SET_FINE, new short[] {60, 200, 190}, 6750, 11550, 73, 87, true, "§", 0);//Not a GT Inherited Material
 		public static final Material DRAGON_METAL = new Material("Dragonblood", MaterialState.SOLID, TextureSet.SET_SHINY, new short[] {220, 40, 20, 2}, 10160, 17850, 96, 105, true, "۞", 0);//Not a GT Inherited Material
 		
diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 0e661fd429..6e1e6ea5ad 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -142,7 +142,7 @@ public final class MISC_MATERIALS {
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Cobaltite), 1),
-					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1)
+					new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1)
 			});
 
 	public static final Material RARE_EARTH_MID = new Material(
@@ -162,8 +162,8 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ORES.CROCROITE, 1),					
 					new MaterialStack(ORES.NICHROMITE, 1),					
 					new MaterialStack(ORES.ZIRCON, 1),
+					new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1),
 					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
-					new MaterialStack(ELEMENT.STANDALONE.WHITE_METAL, 1),
 					new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1)			
 			});
 
-- 
cgit 


From ae3c2ef515aa844f89d22325d19c6ebbfaf4ab28 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Wed, 16 Oct 2019 20:37:36 +0100
Subject: + Added first batch of Bio Recipes. % Updated some Textures.

---
 src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 6e1e6ea5ad..b38451bba3 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -103,6 +103,21 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)
 			});
 
+	public static final Material CARBON_MONOXIDE = new Material(
+			"Carbon Monoxide",
+			MaterialState.PURE_LIQUID, //State
+			null, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1, //Protons
+			-1,
+			false, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
+			});
+
 	public static final Material CARBON_DIOXIDE = new Material(
 			"Carbon Dioxide",
 			MaterialState.PURE_LIQUID, //State
-- 
cgit 


From 68e266e0a227aaf90294d2a8ffd5081dc3bb640e Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 24 Oct 2019 00:58:51 +0100
Subject: + Added Chemical Plant. + Added more Bio Recipes. $ Fixed Strontium
 Hydroxide generating before it's components. $ Fixed existing Bio Recipes not
 working.

---
 .../gtPlusPlus/core/material/MISC_MATERIALS.java   | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index b38451bba3..8dad69f70a 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -38,24 +38,6 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
 			});
 
-	public static final Material STRONTIUM_HYDROXIDE = new Material(
-			"Strontium Hydroxide", 
-			MaterialState.SOLID, 
-			TextureSet.SET_METALLIC,
-			null,
-			-1,
-			-1,
-			-1,
-			-1, 
-			false, 
-			"Sr(OH)2",
-			0, 
-			false,
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
-					new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
-			});
-
 	public static final Material SELENIUM_DIOXIDE = new Material(
 			"Selenium Dioxide",
 			MaterialState.PURE_LIQUID, //State
@@ -303,6 +285,24 @@ public final class MISC_MATERIALS {
 					new MaterialStack(SODIUM_CHLORIDE, 2),
 			});
 
+	public static final Material STRONTIUM_HYDROXIDE = new Material(
+			"Strontium Hydroxide", 
+			MaterialState.SOLID, 
+			TextureSet.SET_METALLIC,
+			null,
+			-1,
+			-1,
+			-1,
+			-1, 
+			false, 
+			"Sr(OH)2",
+			0, 
+			false,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
+					new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
+			});
+
 
 
 }
-- 
cgit 


From 9ba6d563d1b69bc8aa88d48754c273dae77aa713 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 24 Oct 2019 05:07:27 +0100
Subject: % Tried to adjust the name of IC2 Hot Water. $ Fixed OreDicting ore
 Sodium Hydroxide if GT dusts are detected. $ Fixed bad oredict look-up for
 RP1 cell. $ Rewrote how GT++ Materials look for existing fluids and cells
 during generation, hopefully this didn't break any existing cells or fluids.
 (Please investigate log after loading a world)

---
 src/Java/gtPlusPlus/core/material/Material.java | 129 +++++++++---------------
 1 file changed, 48 insertions(+), 81 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index d95b17e75c..b5922dde53 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -1094,96 +1094,41 @@ public class Material {
 		if (this.materialState == MaterialState.ORE){
 			return null;
 		}
+		
+		Fluid aGTBaseFluid = null;
 
-		final Materials isValid = Materials.get(this.getLocalizedName());
-		//Logger.MATERIALS("Is "+this.getLocalizedName()+" a Gregtech material? "+(isValid != null && isValid != Materials._NULL)+" | Found "+isValid.mDefaultLocalName);
-		if (isValid != Materials._NULL){
-			for (Materials m : invalidMaterials.values()){
-				if (isValid == m){
-					Logger.MATERIALS("Trying to generate a fluid for blacklisted material: "+m.mDefaultLocalName);
-					FluidStack a1 = m.getFluid(1);
-					FluidStack a2 = m.getGas(1);
-					FluidStack a3 = m.getMolten(1);
-					FluidStack a4 = m.getSolid(1);
-					FluidStack a5 = m.getPlasma(1);
-					if (a1 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Fluid.");
-						return a1.getFluid();
-					}
-					if (a2 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Gas.");
-						return a2.getFluid();
-					}
-					if (a3 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Molten.");
-						return a3.getFluid();
-					}
-					if (a4 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Solid.");
-						return a4.getFluid();
-					}
-					if (a5 != null){
-						Logger.MATERIALS("Using a pre-defined Fluid from GT. Plasma.");
-						return a5.getFluid();
-					}
-					Logger.MATERIALS("Using null.");
-					return null;
-				}
-			}
-		}
+		// Clean up Internal Fluid Generation
+		final Materials n1 = MaterialUtils.getMaterial(this.getLocalizedName(), Utils.sanitizeString(this.getLocalizedName()));
+		final Materials n2 = MaterialUtils.getMaterial(this.getUnlocalizedName(), Utils.sanitizeString(this.getUnlocalizedName()));
 
-		if (this.materialState == MaterialState.SOLID){
-			if (isValid.mFluid != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mFluid.");
-				return isValid.mFluid;
-			}
-			else if (isValid.mStandardMoltenFluid != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
-				return isValid.mStandardMoltenFluid;
-			}
-		}
-		else if (this.materialState == MaterialState.GAS){
-			if (isValid.mGas != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mGas.");
-				return isValid.mGas;
-			}
-		}
-		else if (this.materialState == MaterialState.LIQUID || this.materialState == MaterialState.PURE_LIQUID){
-			if (isValid.mFluid != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mFluid.");
-				return isValid.mFluid;
-			}
-			else if (isValid.mGas != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mGas.");
-				return isValid.mGas;
-			}
-			else if (isValid.mStandardMoltenFluid != null){
-				Logger.MATERIALS("Using a pre-defined Fluid from GT. mStandardMoltenFluid.");
-				return isValid.mStandardMoltenFluid;
-			}
-		}
-
-		FluidStack aTest1 = FluidUtils.getFluidStack("molten."+Utils.sanitizeString(this.getLocalizedName()), 1);
-		FluidStack aTest2 = FluidUtils.getFluidStack("fluid."+Utils.sanitizeString(this.getLocalizedName()), 1);
-		FluidStack aTest3 = FluidUtils.getFluidStack(Utils.sanitizeString(this.getLocalizedName()), 1);
+		FluidStack f1 = FluidUtils.getWildcardFluidStack(n1, 1);
+		FluidStack f2 = FluidUtils.getWildcardFluidStack(n2, 1);
+		FluidStack f3 = FluidUtils.getWildcardFluidStack(Utils.sanitizeString(this.getUnlocalizedName(), new char[] {'-', '_'}), 1);
+		FluidStack f4 = FluidUtils.getWildcardFluidStack(Utils.sanitizeString(this.getLocalizedName(), new char[] {'-', '_'}), 1);
 
-		if (aTest1 != null) {
-			Logger.MATERIALS("Found FluidRegistry entry for "+"molten."+Utils.sanitizeString(this.getLocalizedName()));
-			return aTest1.getFluid();
+		if (f1 != null) {
+			aGTBaseFluid = f1.getFluid();
 		}
-		if (aTest2 != null) {
-			Logger.MATERIALS("Found FluidRegistry entry for "+"fluid."+Utils.sanitizeString(this.getLocalizedName()));
-			return aTest2.getFluid();
+		else if (f2 != null) {
+			aGTBaseFluid = f2.getFluid();
 		}
-		if (aTest3 != null) {
-			Logger.MATERIALS("Found FluidRegistry entry for "+Utils.sanitizeString(this.getLocalizedName()));
-			return aTest3.getFluid();
+		else if (f3 != null) {
+			aGTBaseFluid = f3.getFluid();
 		}
+		else if (f4 != null) {
+			aGTBaseFluid = f4.getFluid();
+		}
+		
 
 		ItemStack aFullCell = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1);
+		ItemStack aFullCell2 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getLocalizedName(), 1);
+		ItemStack aFullCell3 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+Utils.sanitizeString(this.getUnlocalizedName(), new char[] {'-', '_'}), 1);
+		ItemStack aFullCell4 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+Utils.sanitizeString(this.getLocalizedName(), new char[] {'-', '_'}), 1);
+		
 		Logger.MATERIALS("Generating our own fluid.");
-		//Generate a Cell if we need to
-		if (aFullCell == null){
+		//Generate a Cell if we need to, but first validate all four searches are invalid
+		
+		if (!ItemUtils.checkForInvalidItems(new ItemStack[] {aFullCell, aFullCell2, aFullCell3, aFullCell4})){
 			if (this.vGenerateCells){
 				Item g = new BaseItemCell(this);
 				aFullCell = ItemUtils.getSimpleStack(g);
@@ -1193,7 +1138,29 @@ public class Material {
 				Logger.MATERIALS("Did not generate a cell for "+this.getUnlocalizedName());
 			}
 		}
+		else {
+			// One cell we searched for was valid, let's register it.
+			if (aFullCell != null) {
+				this.registerComponentForMaterial(ComponentTypes.CELL, aFullCell);
+			}
+			else if (aFullCell2 != null) {
+				this.registerComponentForMaterial(ComponentTypes.CELL, aFullCell2);					
+			}
+			else if (aFullCell3 != null) {
+				this.registerComponentForMaterial(ComponentTypes.CELL, aFullCell3);					
+			}
+			else if (aFullCell4 != null) {
+				this.registerComponentForMaterial(ComponentTypes.CELL, aFullCell4);					
+			}
+		}
 
+		// We found a GT fluid, let's use it.
+		// Good chance we registered the cell from this material too.
+		if (aGTBaseFluid != null) {
+			return aGTBaseFluid;
+		}
+		
+		// This fluid does not exist at all, time to generate it.
 		if (this.materialState == MaterialState.SOLID){
 			return FluidUtils.addGTFluid(
 					this.getUnlocalizedName(),
-- 
cgit 


From b8069dc5a8c0c8c2cfd5e4ec2401f28d6a84e626 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 12 Dec 2019 02:26:10 +0000
Subject: + Added Pellet Mold. + Added Clean Aluminium Mix. $ 5.08 Compliance.
 And looooots of it. $ Fixed most, if not all Fluid Canning & Extraction
 recipes that I broke previously. % Adjusted Textures for Particles. New
 textures thanks to Discord User Никита#8621. % Adjusted Aluminium Processing
 Chain.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Java/gtPlusPlus/core/material/MaterialGenerator.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material')

diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 797a033dcc..20fdfd3c8c 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -70,20 +70,12 @@ public class MaterialGenerator {
 	 * @return 
 	 */
 	public static boolean addFluidExtractionRecipe(ItemStack aEmpty, ItemStack aRemains, FluidStack aFluid, Integer aDuration, Integer aEU) {
-		/*GT_Recipe r = new Recipe_GT(
-				true,
-				new ItemStack[] {aEmpty,  aRemains != null ? aRemains : null},
-				new ItemStack[] {},
-				null,
-				new int[] {},
-				new FluidStack[] {},
-				new FluidStack[] {c},
-				a2, a3, a1);*/
-		//new RecipeGen_FluidCanning(r, true);
 		RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(true, aEmpty, aRemains, aFluid, aDuration, aEU);
 		if (g != null && g.valid()) {
+			//Logger.INFO("[FIND] Adding Extraction recipe for "+ItemUtils.getItemName(aEmpty)+", "+ItemUtils.getItemName(aRemains)+", "+ItemUtils.getFluidName(aFluid));
 			return true;
 		}
+		Logger.INFO("[ERROR] FAILED adding Extraction recipe for "+ItemUtils.getItemName(aEmpty)+", "+ItemUtils.getItemName(aRemains)+", "+ItemUtils.getFluidName(aFluid));
 		return false;
 	}
 
-- 
cgit