diff options
author | Alkalus <draknyte1@hotmail.com> | 2017-08-03 12:49:32 +1000 |
---|---|---|
committer | Alkalus <draknyte1@hotmail.com> | 2017-08-03 12:49:32 +1000 |
commit | 24944a2edfd5172546c049e3eb2efddc69a18b49 (patch) | |
tree | 385392df24388b65595ba40d1ae442aa7704c269 /src/Java/gtPlusPlus/core/util/materials | |
parent | a3c1e4183ab1d9681ec95698a7536871f56bd25b (diff) | |
download | GT5-Unofficial-24944a2edfd5172546c049e3eb2efddc69a18b49.tar.gz GT5-Unofficial-24944a2edfd5172546c049e3eb2efddc69a18b49.tar.bz2 GT5-Unofficial-24944a2edfd5172546c049e3eb2efddc69a18b49.zip |
+ Added 4 types of custom RTG pellets.
+ Added 3 new materials for the custom pellets.
% Created StringUtils.java and migrated Super/Subscript formatting functions to it.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/materials')
-rw-r--r-- | src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index eff0016f8e..863ba2b3b8 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -5,6 +5,7 @@ import java.util.List; import gregtech.api.enums.*; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -40,7 +41,7 @@ public class MaterialUtils { final boolean blastFurnace = material.mBlastFurnaceRequired; final int durability = material.mDurability; MaterialState materialState; - final String chemicalFormula = MaterialUtils.subscript(Utils.sanitizeString(material.mChemicalFormula)); + final String chemicalFormula = StringUtils.subscript(Utils.sanitizeString(material.mChemicalFormula)); final Element element = material.mElement; int radioactivity = 0; if (material.isRadioactive()){ @@ -117,34 +118,6 @@ public class MaterialUtils { return true; } - public static String superscript(String str) { - str = str.replaceAll("0", "\u2070"); - str = str.replaceAll("1", "\u00B9"); - str = str.replaceAll("2", "\u00B2"); - str = str.replaceAll("3", "\u00B3"); - str = str.replaceAll("4", "\u2074"); - str = str.replaceAll("5", "\u2075"); - str = str.replaceAll("6", "\u2076"); - str = str.replaceAll("7", "\u2077"); - str = str.replaceAll("8", "\u2078"); - str = str.replaceAll("9", "\u2079"); - return str; - } - - public static String subscript(String str) { - str = str.replaceAll("0", "\u2080"); - str = str.replaceAll("1", "\u2081"); - str = str.replaceAll("2", "\u2082"); - str = str.replaceAll("3", "\u2083"); - str = str.replaceAll("4", "\u2084"); - str = str.replaceAll("5", "\u2085"); - str = str.replaceAll("6", "\u2086"); - str = str.replaceAll("7", "\u2087"); - str = str.replaceAll("8", "\u2088"); - str = str.replaceAll("9", "\u2089"); - return str; - } - public static int getTierOfMaterial(final int M){ if ((M >= 0) && (M <= 1000)){ return 1; |