From f7390af19986b4e4370379bb46dee71f12b717e8 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 13 May 2019 15:45:29 +1000
Subject: + Added High Quality Industrial Diamond. + Added various material
 components. + Added a debug machine used for calling the Garbage Collector. +
 Added recipe to obtain Hot Water. + Added way to obtain Dragonsblood. + Added
 lots of quick access fluids directly to FluidUtils. % Updated English Locale.
 $ Fixed issue preventing all Multiblocks from forming. $ Fixed some minor
 texture issues.

---
 .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 52 +++++++++++++++++++++-
 .../core/util/minecraft/MaterialUtils.java         | 45 +++++++++++++++++++
 .../core/util/minecraft/PlayerUtils.java           |  4 ++
 3 files changed, 100 insertions(+), 1 deletion(-)

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

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index 0ae751a20b..09263bb639 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -25,14 +25,64 @@ public class FluidUtils {
 		return FluidUtils.getFluidStack("water", amount);
 	}
 	
-	public static FluidStack getlava(final int amount){
+	public static FluidStack getDistilledWater(final int amount){
+		return FluidUtils.getFluidStack("ic2distilledwater", amount);
+	}
+
+	public static FluidStack getHotWater(final int amount) {
+		return FluidUtils.getFluidStack("ic2hotwater", amount);
+	}
+	
+	public static FluidStack getLava(final int amount){
 		return FluidUtils.getFluidStack("lava", amount);
 	}
 	
+	public static FluidStack getPahoehoeLava(final int amount){
+		return FluidUtils.getFluidStack("ic2pahoehoelava", amount);
+	}
+	
 	public static FluidStack getMilk(final int amount){
 		return FluidUtils.getFluidStack("milk", amount);
 	}
 	
+	public static FluidStack getColdCoolant(final int amount){
+		return FluidUtils.getFluidStack("ic2coolant", amount);
+	}
+	
+	public static FluidStack getHotCoolant(final int amount){
+		return FluidUtils.getFluidStack("ic2hotcoolant", amount);
+	}
+	
+	public static FluidStack getSteam(final int amount){
+		return FluidUtils.getFluidStack("steam", amount);
+	}
+	
+	public static FluidStack getIC2Steam(final int amount){
+		return FluidUtils.getFluidStack("ic2steam", amount);
+	}
+	
+	public static FluidStack getSuperHeatedSteam(final int amount){
+		return FluidUtils.getFluidStack("ic2superheatedsteam", amount);
+	}
+	
+	@Deprecated
+	/**
+	 * Do not use - Gives third tier steam - Not implemented
+	 * @param amount
+	 * @return
+	 */
+	public static FluidStack getHyperSteam(final int amount){
+		return FluidUtils.getFluidStack("water", amount);
+	}
+	
+	public static FluidStack getUUA(final int amount){
+		return FluidUtils.getFluidStack("uuamplifier", amount);
+	}
+	
+	public static FluidStack getUUM(final int amount){
+		return FluidUtils.getFluidStack("ic2uumatter", amount);
+	}
+	
 	public static FluidStack getFluidStack(final String fluidName, final int amount){
 		Logger.WARNING("Trying to get a fluid stack of "+fluidName);
 		try {
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index ce665945c4..364430b07d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -15,6 +15,9 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.TypeCounter;
 import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
+import gtPlusPlus.core.item.base.BaseItemComponent;
+import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
+import gtPlusPlus.core.item.base.plates.BaseItemPlateHeavy;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
@@ -440,6 +443,48 @@ public class MaterialUtils {
 		}
 		return resultList;
 	}
+	
+	public static void generateComponentAndAssignToAMaterial(ComponentTypes aType, Material aMaterial) {
+		generateComponentAndAssignToAMaterial(aType, aMaterial, true);
+	}
+	
+	public static void generateComponentAndAssignToAMaterial(ComponentTypes aType, Material aMaterial, boolean generateRecipes) {		
+		Item aGC;
+		if (aType == ComponentTypes.PLATEHEAVY) {
+			aGC = new BaseItemPlateHeavy(aMaterial);
+		}
+		else {
+			aGC = new BaseItemComponent(aMaterial, aType);			
+		}
+		if (aGC != null) {
+			String aFormattedLangName = aType.getName();
+			
+			if (!aFormattedLangName.startsWith(" ")) {
+				if (aFormattedLangName.contains("@")) {
+					String[] aSplit = aFormattedLangName.split("@");
+					aFormattedLangName = aSplit[0] + " " + aMaterial.getLocalizedName() + " " + aSplit[1];
+				}
+			}
+			
+			if (aFormattedLangName.equals(aType.getName())) {
+				aFormattedLangName = aMaterial.getLocalizedName() + aFormattedLangName;
+				
+			}
+			
+			
+			
+			Logger.MATERIALS("[Lang] "+aGC.getUnlocalizedName()+".name="+aFormattedLangName);
+			aMaterial.registerComponentForMaterial(aType, ItemUtils.getSimpleStack(aGC));			
+		}				
+	}
+	
+	
+	
+	
+	
+	
+	
+	
 	public static void generateSpecialDustAndAssignToAMaterial(Material aMaterial) {
 		generateSpecialDustAndAssignToAMaterial(aMaterial, true);
 	}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
index 7dd127203e..2fb7344a28 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
@@ -174,4 +174,8 @@ public class PlayerUtils {
 		return false;
 	}
 
+	public static void messageAllPlayers(String string) {
+		Utils.sendServerMessage(string);		
+	}
+
 }
-- 
cgit