From 0e86a46abd45cb15cb90799d2d196ddf2f71ccc5 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Fri, 24 Feb 2017 18:09:08 +1000 Subject: % More Tooltips cleaned up. + Added a boolean to check if DreamCraft is installed (Which will only ever be true if you're playing GT:NH). --- src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java | 4 ++-- src/Java/gtPlusPlus/core/lib/CORE.java | 4 ++++ src/Java/gtPlusPlus/core/lib/LoadedMods.java | 10 ++++++++++ src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 8c38ad82d0..8903360943 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -134,9 +134,9 @@ public class BaseItemComponent extends Item{ //list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring."); } if (componentMaterial != null){ - if (!componentMaterial.vChemicalFormula.equals("??")) { + if (!componentMaterial.vChemicalFormula.equals("??") && !componentMaterial.vChemicalFormula.equals("?")) { if (componentType != ComponentTypes.CELL || componentType != ComponentTypes.PLASMACELL){ - list.add(componentMaterial.vChemicalFormula); + list.add(Utils.sanitizeString(componentMaterial.vChemicalFormula)); } else { list.add(Utils.sanitizeString(componentMaterial.vChemicalFormula)); diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 1a538dbfb3..a74e5c9a77 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -47,6 +47,10 @@ public class CORE { public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."; public static final String noItem = ""; + public static boolean isNewHorizonsLoaded = LoadedMods.DreamCraft; + //Because I want to be lazy. + public static boolean GTNH = isNewHorizonsLoaded; + /** * A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items. */ diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index e947137ccd..158038d420 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -38,6 +38,7 @@ public class LoadedMods { public static boolean IHL = false; public static boolean OpenComputers = false; //OpenComputers public static boolean Computronics = false; //computronics + public static boolean DreamCraft = false; //GT: New Horizons @@ -62,6 +63,15 @@ public class LoadedMods { totalMods++; } + // + + if (Loader.isModLoaded("dreamcraft") == true){ + DreamCraft = true; + Utils.LOG_INFO("Components enabled for: DreamCraft"); + Utils.LOG_INFO("Components enabled for: GT: New Horizons"); + totalMods++; + } + if (Loader.isModLoaded("PlayerAPI") == true){ PlayerAPI = true; Utils.LOG_INFO("Components enabled for: PlayerAPI"); diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index 8e821cd850..680ce004b9 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -53,7 +53,7 @@ public class MaterialUtils { boolean blastFurnace = material.mBlastFurnaceRequired; int durability = material.mDurability; MaterialState materialState; - String chemicalFormula = MaterialUtils.subscript(material.mChemicalFormula); + String chemicalFormula = MaterialUtils.subscript(Utils.sanitizeString(material.mChemicalFormula)); Element element = material.mElement; int radioactivity = 0; if (material.isRadioactive()){ -- cgit