diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-20 21:51:41 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-10-20 21:51:41 +0200 |
| commit | efb34b3274b9dd04d715fbd982bc5c504315c7f9 (patch) | |
| tree | 02a1dda7bc40814bd7071a1f86c9d07b3054cbcb /src/main/java/gregtech/common/GT_Proxy.java | |
| parent | ba53c6004c1a64968e49a9292055853e775aeaf8 (diff) | |
| parent | 71501031505f8f107b4511b7e7650f4eb3953fd4 (diff) | |
| download | GT5-Unofficial-efb34b3274b9dd04d715fbd982bc5c504315c7f9.tar.gz GT5-Unofficial-efb34b3274b9dd04d715fbd982bc5c504315c7f9.tar.bz2 GT5-Unofficial-efb34b3274b9dd04d715fbd982bc5c504315c7f9.zip | |
Merge pull request #252 from JonnyNova/char_comparison
Replace homegrown character comparision for builtin ones
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 5e6e2498c5..6d99de6516 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1124,7 +1124,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GT_Log.ore.println(tModToName + " is invalid due to being solely uppercased."); return; } - if (GT_Values.CU.contains(Character.valueOf(aEvent.Name.charAt(0)))) { + if (Character.isUpperCase(aEvent.Name.charAt(0))) { GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); } } else { @@ -1141,8 +1141,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } String tName = aEvent.Name.replaceFirst(aPrefix.toString(), ""); if (tName.length() > 0) { - if ((GT_Values.CU.contains(Character.valueOf(tName.charAt(0)))) || (GT_Values.CN.contains(Character.valueOf(tName.charAt(0)))) - || (tName.charAt(0) == '_')) { + char firstChar = tName.charAt(0); + if (Character.isUpperCase(firstChar) || Character.isLowerCase(firstChar) || firstChar == '_') { if (aPrefix.mIsMaterialBased) { aMaterial = Materials.get(tName); if (aMaterial != aMaterial.mMaterialInto) { |