aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r--src/Java/gtPlusPlus/core/util/data/StringUtils.java40
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java12
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java2
3 files changed, 47 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/util/data/StringUtils.java b/src/Java/gtPlusPlus/core/util/data/StringUtils.java
index b64266b5d4..2821a0c1c9 100644
--- a/src/Java/gtPlusPlus/core/util/data/StringUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/StringUtils.java
@@ -1,5 +1,7 @@
package gtPlusPlus.core.util.data;
+import gtPlusPlus.api.objects.data.AutoMap;
+
public class StringUtils {
public static String superscript(String str) {
@@ -131,4 +133,42 @@ public class StringUtils {
return aData;
}
}
+
+ public static String splitAndUppercase(String aInput, String aDelim) {
+ String[] aSplit = aInput.split(aDelim);
+ if (aSplit == null || aSplit.length == 0) {
+ return aInput;
+ }
+ else {
+ AutoMap<String> aTemp = new AutoMap<String>();
+ for (String s : aSplit) {
+ aTemp.put(firstLetterCaps(s));
+ }
+ String aReturn = "";
+ for (String s : aTemp) {
+ aReturn += s;
+ }
+ return aReturn;
+ }
+ }
+
+ public static int characterCount(String aString, char aChar) {
+ return characterCount(aString, ""+aChar);
+ }
+
+ public static int characterCount(String aString, String aChar) {
+ int aLength = aString.length();
+ int aFound = 0;
+ if (aLength == 0 || !aString.contains(aChar)) {
+ return 0;
+ }
+ else {
+ for (int index = 0; index < aLength; index++) {
+ if (aString.substring(index, index+1).equals(aChar)) {
+ aFound++;
+ }
+ }
+ return aFound;
+ }
+ }
}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 2522ba56da..50778e1285 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -124,7 +124,7 @@ public class ItemUtils {
final int meta) {
try {
Item em = null;
- final Item em1 = getItem(FQRN);
+ final Item em1 = getItemFromFQRN(FQRN);
// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
if (em1 != null) {
em = em1;
@@ -158,7 +158,7 @@ public class ItemUtils {
if (MOD) {
try {
Item em = null;
- final Item em1 = getItem(FQRN);
+ final Item em1 = getItemFromFQRN(FQRN);
// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
if (em1 != null) {
if (null == em) {
@@ -181,7 +181,7 @@ public class ItemUtils {
public static ItemStack simpleMetaStack(final String FQRN, final int meta, final int itemstackSize) {
try {
Item em = null;
- final Item em1 = getItem(FQRN);
+ final Item em1 = getItemFromFQRN(FQRN);
// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
if (em1 != null) {
if (null == em) {
@@ -233,7 +233,7 @@ public class ItemUtils {
ItemStack temp;
if (fqrn.toLowerCase().contains(oreDict.toLowerCase())) {
final String sanitizedName = fqrn.replace(oreDict, "");
- temp = ItemUtils.getItemStack(sanitizedName, stackSize);
+ temp = ItemUtils.getItemStackFromFQRN(sanitizedName, stackSize);
return temp;
}
final String[] fqrnSplit = fqrn.split(":");
@@ -258,13 +258,13 @@ public class ItemUtils {
return null;
}
- public static Item getItem(final String fqrn) // fqrn = fully qualified resource name
+ public static Item getItemFromFQRN(final String fqrn) // fqrn = fully qualified resource name
{
final String[] fqrnSplit = fqrn.split(":");
return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]);
}
- public static ItemStack getItemStack(final String fqrn, final int Size) // fqrn = fully qualified resource name
+ public static ItemStack getItemStackFromFQRN(final String fqrn, final int Size) // fqrn = fully qualified resource name
{
final String[] fqrnSplit = fqrn.split(":");
return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size);
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index a5f5c778bf..664ab40e6f 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -212,7 +212,7 @@ public static int mInvalidID = 1;
public static boolean removeCraftingRecipe(Object x){
if (null == x){return false;}
if (x instanceof String){
- final Item R = ItemUtils.getItem((String) x);
+ final Item R = ItemUtils.getItemFromFQRN((String) x);
if (R != null){
x = R;
}