+ 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.

4 files changed, 45 insertions, 14 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 55f4dfa0be..6f36b359ad 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -6,6 +6,7 @@ import java.util.List;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gtPlusPlus.api.helpers.MaterialHelper;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
@@ -105,6 +106,8 @@ public class AgriculturalChem extends ItemPackage {
 	 * 19 - Sodium Hydroxide // Exists in Newer GT
 	 * 20 - Sodium Carbonate
 	 * 21 - Lithium Chloride
+	 * 22 - Pellet Mold
+	 * 23 - Clean Aluminium Mix
 	 */
 
 	public static ItemStack mAlgaeBiosmass;
@@ -129,6 +132,8 @@ public class AgriculturalChem extends ItemPackage {
 	public static ItemStack mSodiumHydroxide;
 	public static ItemStack mSodiumCarbonate;
 	public static ItemStack mLithiumChloride;
+	public static ItemStack mPelletMold;
+	public static ItemStack mCleanAluminiumMix;
 	
 
 	@Override
@@ -196,6 +201,8 @@ public class AgriculturalChem extends ItemPackage {
 		}		
 		mSodiumCarbonate = ItemUtils.simpleMetaStack(mAgrichemItem1, 20, 1);
 		mLithiumChloride = ItemUtils.simpleMetaStack(mAgrichemItem1, 21, 1);
+		mPelletMold = ItemUtils.simpleMetaStack(mAgrichemItem1, 22, 1);
+		mCleanAluminiumMix = ItemUtils.simpleMetaStack(mAgrichemItem1, 23, 1);
 
 		ItemUtils.addItemToOreDictionary(mGreenAlgaeBiosmass, "biomassGreenAlgae");
 		ItemUtils.addItemToOreDictionary(mBrownAlgaeBiosmass, "biomassBrownAlgae");
@@ -533,8 +540,8 @@ public class AgriculturalChem extends ItemPackage {
 		GT_Values.RA.addCentrifugeRecipe(CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(aManureByprod, 4),
 				FluidUtils.getFluidStack("sulfuricacid", 250), // In Fluid
 				FluidUtils.getFluidStack("sulfuricapatite", 50), // Out Fluid
-				Materials.Phosphorus.getDustSmall(2), Materials.Calcium.getDustSmall(2),
-				Materials.Copper.getDustTiny(1), Materials.Carbon.getDust(1), ItemUtils.getSimpleStack(dustDirt, 1),
+				MaterialHelper.getDustSmall(Materials.Phosphorus, 2), MaterialHelper.getDustSmall(Materials.Calcium, 2),
+				MaterialHelper.getDustTiny(Materials.Copper, 1), MaterialHelper.getDust(Materials.Carbon, 1), ItemUtils.getSimpleStack(dustDirt, 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1),
 				new int[] { 2500, 2500, 750, 1000, 5000, 250 }, // Chances
 				20 * 20, // Time
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 0bea7dfc31..2d063c45d4 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -9,6 +9,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.api.helpers.MaterialHelper;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
@@ -478,15 +479,17 @@ public class RocketFuels extends ItemPackage {
 		}
 
 
+		MaterialHelper.getCells(aMaterial_Water, 1);
+		
 		ItemStack aCellEmpty = CI.emptyCells(1);
-		ItemStack aCellWater = aMaterial_Water.getCells(1);
-		ItemStack aCellOxygen = aMaterial_Oxygen.getCells(1);
-		ItemStack aCellChloramine = aMaterial_Chloramine.getCells(1);
-		ItemStack aCellDimethylamine = aMaterial_Dimethylamine.getCells(1);
-		ItemStack aCellDilutedHydrochloricAcid = aMaterial_DilutedHydrochloricAcid.getCells(1);
-		ItemStack aCellNitrogenDioxide = aMaterial_NitrogenDioxide.getCells(1);
-		ItemStack aCellDinitrogenTetroxide = aMaterial_DinitrogenTetroxide.getCells(1);
-		ItemStack aCellDimethylhydrazine = aMaterial_Dimethylhydrazine.getCells(1);
+		ItemStack aCellWater = MaterialHelper.getCells(aMaterial_Water, 1);
+		ItemStack aCellOxygen = MaterialHelper.getCells(aMaterial_Oxygen, 1);
+		ItemStack aCellChloramine = MaterialHelper.getCells(aMaterial_Chloramine, 1);
+		ItemStack aCellDimethylamine = MaterialHelper.getCells(aMaterial_Dimethylamine, 1);
+		ItemStack aCellDilutedHydrochloricAcid = MaterialHelper.getCells(aMaterial_DilutedHydrochloricAcid, 1);
+		ItemStack aCellNitrogenDioxide = MaterialHelper.getCells(aMaterial_NitrogenDioxide, 1);
+		ItemStack aCellDinitrogenTetroxide = MaterialHelper.getCells(aMaterial_DinitrogenTetroxide, 1);
+		ItemStack aCellDimethylhydrazine = MaterialHelper.getCells(aMaterial_Dimethylhydrazine, 1);
 
 
 
@@ -671,7 +674,17 @@ public class RocketFuels extends ItemPackage {
 
 		//Register default fluids
 		Diesel = MaterialUtils.getMaterial("Fuel", "Diesel").getFluid(1).getFluid();
-		Oil_Heavy = MaterialUtils.getMaterial("OilHeavy", "Oil").getFluid(1).getFluid();		
+		
+		// 5.08 Compat
+		if (!FluidUtils.doesFluidExist("OilHeavy")){
+			Oil_Heavy = FluidUtils.generateFluidNoPrefix("OilHeavy", "Heavy Oil", 200, new short[]{10, 10, 10, 100});
+		}
+		else {
+			Oil_Heavy = MaterialUtils.getMaterial("OilHeavy", "Oil").getFluid(1).getFluid();
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellOilHeavy", 1) == null){				
+				new BaseItemComponent("OilHeavy", "Heavy Oil", new short[] {10, 10, 10});
+			}
+		}		
 
 
 		//Create Kerosene
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
index 1e833a7b00..10eaaf0da9 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -149,7 +149,7 @@ public class StandardBaseParticles extends BaseItemParticle {
 	@Override
 	public void registerIcons(IIconRegister reg) {		
 		for (int i = 0; i < this.icons.length; i++) {
-			this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "particle/"+i);			
+			this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "particle/new/"+i);			
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
index c076bf5c95..21d2c6e120 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -148,8 +148,19 @@ public class ItemGenericToken extends CoreItem {
 	}
 
 	@Override
-	public int getItemStackLimit(ItemStack stack) {
-		return mMaxStackSizes.get(stack.getItemDamage());
+	public int getItemStackLimit(ItemStack aStack) {
+		if (aStack == null) {
+			return getItemStackLimit();
+		}
+		else {
+			Integer aSize = mMaxStackSizes.get(aStack.getItemDamage());
+			if (aSize != null) {
+				return aSize;
+			}
+			else {
+				return getItemStackLimit();
+			}
+		}
 	}
 
 	@Override