+ Added Plasma cells for all missing elements. (Adds a few extra, which will get removed).

+ Added a function to generate Plasma.
- Removed Bedrockium generation.
$ Fixed the chemical symbol for Thallium.
$ Fixed an issue where a String in ClientProxy.java was being set server side.

1 files changed, 39 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index dd1fcfacbc..2a3527e9d1 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -2,9 +2,13 @@ package gtPlusPlus.core.util.fluid;
 
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.fluids.GenericFluid;
 import gtPlusPlus.core.item.base.BaseItemComponent;
+import gtPlusPlus.core.item.base.cell.BaseItemCell;
+import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell;
 import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
@@ -225,6 +229,41 @@ public class FluidUtils {
 	public static Fluid addGTFluidNonMolten(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) {
 		return addGTFluid("fluid."+aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
 	}
+	
+	 public static Fluid addGTPlasma(Material aMaterial) {
+		 Utils.LOG_INFO("Generating a "+aMaterial.getLocalizedName()+" Plasma Cell");
+		 if (aMaterial.vComponentCount != 1){			 
+			 Utils.LOG_INFO("Compound made from: ");
+			 for (MaterialStack x : aMaterial.getComposites()){
+				 Utils.LOG_INFO(x.getStackMaterial().getLocalizedName());
+			 }			 
+			 Utils.LOG_INFO("Material is a composite, not generating plasma.");
+			 return null;
+		 }
+		 
+		 ItemStack temp = null;
+		//Generate a Cell if we need to
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+aMaterial.getUnlocalizedName(), 1) == null){
+				Item temp2 = new BaseItemPlasmaCell(aMaterial);
+				temp = aMaterial.getPlasmaCell(1);
+			}
+			else {
+				temp = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+aMaterial.getUnlocalizedName(), 1);
+			}
+			if (temp != null){
+	        return addGTFluid(
+	        		"plasma." + Utils.sanitizeString(aMaterial.getLocalizedName().toLowerCase()),
+	        		"plasma.autogenerated",
+	        		aMaterial.getLocalizedName() + " Plasma",
+	                aMaterial.getRGBA(),
+	                3,
+	                10000,
+	                temp,
+	                ItemList.Cell_Empty.get(1L, new Object[0]),
+	                1000);
+			}
+			return null;
+	    }
 
 	public static Fluid addGTFluid(String aName, final String aTexture, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) {
 		aName = Utils.sanitizeString(aName.toLowerCase());