From a47d4add073d3dafe6357b526ca5963466528feb Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Tue, 27 Dec 2016 04:21:20 +1000
Subject: % Changed the Autogenerated Fluid textures again. + Created
 Thorium-232, a step towards ThF4. + Added centrifuge recipe for
 Th->Th232(Bonus U232 0.10%). + Added THORIUM_HEXAFLUORIDE &
 THORIUM_TETRAFLUORIDE into ALLOY.java % Fixed fluid extractor recipes not
 being added for every dust. + Added more fluid extractor and fluid solidifier
 recipes for each material.

- Removed old "uraniumHexafluoride", "uraniumTetrafluoride", "thoriumTetrafluoride" fluids and IC2 cells.

% Changed Multitank Controller Logic, maybe broke things.

+ Added getNugget and getCell to Material.java
% Changed MaterialGenerator.java to use the materials radioactivity level, not the old method based on name.
% Moved material blacklist for BlastSmelting Recipe generation out of material/MaterialGenerator.java.
---
 .../gtPlusPlus/core/item/base/dusts/BaseItemDust.java     | 10 ----------
 .../core/item/base/dusts/BaseItemDustUnique.java          | 15 ++++++++-------
 2 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/item/base')

diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 7a7ebd0eb8..69d5363240 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -8,7 +8,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
-import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 
@@ -75,15 +74,6 @@ public class BaseItemDust extends Item{
 		}
 		addFurnaceRecipe();
 		addMacerationRecipe();
-		
-		GT_Values.RA.addFluidExtractionRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(materialName), 1), //Input
-				null, //Input 2
-				FluidUtils.getFluidStack("molten."+Utils.sanitizeString(materialName), 144), //Fluid Output
-				0, //Chance
-				1*20, //Duration
-				16 //Eu Tick
-				);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index d5dd78a49b..eaccd31f30 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -6,6 +6,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 
 import java.util.List;
@@ -69,13 +70,13 @@ public class BaseItemDustUnique extends Item{
 	public String getItemStackDisplayName(ItemStack iStack) {
 
 		if (getUnlocalizedName().contains("DustTiny")){
-			name = "Tiny Pile of "+materialName + " Dust";
+			name = "Tiny Pile of "+MaterialUtils.subscript(materialName) + " Dust";
 		}
 		else if (getUnlocalizedName().contains("DustSmall")){
-			name = "Small Pile of "+materialName + " Dust";
+			name = "Small Pile of "+MaterialUtils.subscript(materialName) + " Dust";
 		}
 		else {
-			name = materialName + " Dust";
+			name = MaterialUtils.subscript(materialName) + " Dust";
 		}
 		return name;
 	}
@@ -90,13 +91,13 @@ public class BaseItemDustUnique extends Item{
 	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
 		//if (pileType != null && materialName != null && pileType != "" && materialName != "" && !pileType.equals("") && !materialName.equals("")){
 		if (getUnlocalizedName().contains("DustTiny")){
-			list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust.");	
+			list.add(EnumChatFormatting.GRAY+"A tiny pile of " + MaterialUtils.subscript(materialName) + " dust.");	
 		}
 		else if (getUnlocalizedName().contains("DustSmall")){
-			list.add(EnumChatFormatting.GRAY+"A small pile of " + materialName + " dust.");	
+			list.add(EnumChatFormatting.GRAY+"A small pile of " + MaterialUtils.subscript(materialName) + " dust.");	
 		}
 		else {
-			list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
+			list.add(EnumChatFormatting.GRAY+"A pile of " + MaterialUtils.subscript(materialName) + " dust.");
 		}
 		if (sRadiation > 0){
 			list.add(CORE.GT_Tooltip_Radioactive);
@@ -106,7 +107,7 @@ public class BaseItemDustUnique extends Item{
 	}
 
 	public final String getMaterialName() {
-		return materialName;
+		return MaterialUtils.subscript(materialName);
 	}
 
 	@Override
-- 
cgit