From 11494f1b654a9088896e3e282267e90bb912fde6 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 8 Mar 2019 18:46:29 +0000
Subject: $ More work on fluid overhaul.

---
 .../core/item/base/itemblock/FluidItemBlock.java   | 61 +++++++++++++++++
 .../core/item/base/itemblock/ItemBlockFluid.java   | 78 ----------------------
 2 files changed, 61 insertions(+), 78 deletions(-)
 create mode 100644 src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
 delete mode 100644 src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java

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

diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
new file mode 100644
index 0000000000..96b5425437
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
@@ -0,0 +1,61 @@
+package gtPlusPlus.core.item.base.itemblock;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+
+import gtPlusPlus.core.fluids.BlockFluidBase;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
+public class FluidItemBlock extends ItemBlock{
+
+	protected final int blockColour;
+	final BlockFluidBase baseBlock;
+	String name;
+
+	public FluidItemBlock(final Block block) {
+		super(block);
+		this.baseBlock = (BlockFluidBase) block;
+		this.blockColour = this.baseBlock.getRenderColor(1);
+		this.name = this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
+		//GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this));
+	}
+
+	public int getRenderColor(final int aMeta) {
+		return this.blockColour;
+	}
+
+	@Override
+	public String getItemStackDisplayName(final ItemStack iStack) {
+		/*if (this.thisFluid != null){
+			this.name = "Molten "+this.thisFluid.getLocalizedName();
+			return this.name;
+		}*/
+		this.name = "Molten "+this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
+		return this.name;
+	}
+
+	@Override
+	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
+		if (this.blockColour == 0){
+			return MathUtils.generateSingularRandomHexValue();
+		}
+		return this.blockColour;
+	}
+
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		/*list.add("Temperature: "+MathUtils.celsiusToKelvin(this.thisFluid.getMeltingPointC())+"K");
+		if (this.sRadiation > 0){
+			list.add(CORE.GT_Tooltip_Radioactive);
+		}*/
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java
deleted file mode 100644
index 84fae41bb0..0000000000
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package gtPlusPlus.core.item.base.itemblock;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.core.fluids.BlockFluidBase;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
-public class ItemBlockFluid extends ItemBlock{
-
-	protected final int blockColour;
-	protected final int sRadiation;
-	protected Material thisFluid;
-	final BlockFluidBase baseBlock;
-	String name;
-
-	public ItemBlockFluid(final Block block) {
-		super(block);
-		this.baseBlock = (BlockFluidBase) block;
-		this.blockColour = this.baseBlock.getRenderColor(1);
-		this.thisFluid = this.baseBlock.getFluidMaterial();
-		this.sRadiation=ItemUtils.getRadioactivityLevel(this.baseBlock.getUnlocalizedName());
-		this.name = this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
-		//GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this));
-	}
-
-	public final Material setFluidMaterial(final Material M){
-		return this.thisFluid=M;
-	}
-
-	public int getRenderColor(final int aMeta) {
-		return this.blockColour;
-	}
-
-	@Override
-	public String getItemStackDisplayName(final ItemStack iStack) {
-		if (this.thisFluid != null){
-			this.name = "Molten "+this.thisFluid.getLocalizedName();
-			return this.name;
-		}
-		this.name = "Molten "+this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
-		return this.name;
-	}
-
-	@Override
-	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
-		if (this.blockColour == 0){
-			return MathUtils.generateSingularRandomHexValue();
-		}
-		return this.blockColour;
-
-	}
-
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		list.add("Temperature: "+MathUtils.celsiusToKelvin(this.thisFluid.getMeltingPointC())+"K");
-		if (this.sRadiation > 0){
-			list.add(CORE.GT_Tooltip_Radioactive);
-		}
-		super.addInformation(stack, aPlayer, list, bool);
-	}
-
-	public String GetProperName() {
-		String tempIngot;
-
-		tempIngot = "Molten "+this.baseBlock.getLocalizedName();
-
-		return tempIngot;
-	}
-
-}
-- 
cgit