From fe15444a942c8d2b7740246c4fdb83d3f772950e Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 1 Jul 2018 20:08:50 +1000
Subject: + Added lang file updates. % More work on Spawners. % More work on
 Villagers.

---
 src/Java/gtPlusPlus/core/util/Utils.java           | 23 ++++++++++++----------
 .../gtPlusPlus/core/util/data/StringUtils.java     |  8 +++++++-
 .../core/util/reflect/ReflectionUtils.java         |  6 +++---
 3 files changed, 23 insertions(+), 14 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 2dd4517f79..c600e48f3c 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -831,23 +831,26 @@ public class Utils {
 	}
 
 	public static boolean createNewMobSpawner(int aID, Entity aEntity) {
-		Class<Entity> c;		
 		if (aEntity instanceof Entity) {
-			c = (Class<Entity>) aEntity.getClass();
+			Class c = aEntity.getClass();
 			return createNewMobSpawner(aID, c);
 		}
 		return false;
 	}
 	
 	public static boolean createNewMobSpawner(int aID, Class aEntity) {	
-		Logger.INFO("[Spawn] Generating new spawner for entity with class ("+aEntity.getCanonicalName()+").");
-		if (TileEntityGenericSpawner.registerNewMobSpawner(aID, aEntity)) {
-			EntityRegistration x = EntityRegistry.instance().lookupModSpawn(aEntity, false);
-			if (x != null) {
-				Logger.INFO("[Spawn] Registration for "+x.getEntityName()+" successful");
-				return true;
-			}
-		}
+			Logger.INFO("[Spawn] Generating new spawner for entity with class ("+aEntity.getSimpleName()+").");
+			if (TileEntityGenericSpawner.registerNewMobSpawner(aID, (Class<Entity>) aEntity)) {
+				EntityRegistration x = EntityRegistry.instance().lookupModSpawn((Class<? extends Entity>) aEntity, true);
+				if (x != null) {
+					Logger.INFO("[Spawn] Registration for "+x.getEntityName()+" successful");
+					return true;
+				}
+				else {
+					Logger.INFO("[Spawn] Registration for "+aEntity.getSimpleName()+" successful");
+					return true;				
+				}
+			}	
 		Logger.INFO("[Spawn] Mob Spawner creation for "+aEntity.getName()+" failed");	
 		return false;
 	}
diff --git a/src/Java/gtPlusPlus/core/util/data/StringUtils.java b/src/Java/gtPlusPlus/core/util/data/StringUtils.java
index 3ad5f3bb8b..e58b68665a 100644
--- a/src/Java/gtPlusPlus/core/util/data/StringUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/StringUtils.java
@@ -29,7 +29,7 @@ public class StringUtils {
 		str = str.replaceAll("9", "\u2089");
 		return str;
 	}
-	
+
 	public static boolean containsSuperOrSubScript(final String s){
 		if (s.contains(StringUtils.superscript("0"))) {
 			return true;
@@ -110,4 +110,10 @@ public class StringUtils {
 			return "\u00A7"; // Returns §.
 		}
 	}	
+
+	public static String firstLetterCaps(String data) {
+		String firstLetter = data.substring(0,1).toUpperCase();
+		String restLetters = data.substring(1).toLowerCase();
+		return firstLetter + restLetters;
+	}
 }
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index af384565a9..fc8923b21a 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -23,15 +23,15 @@ public class ReflectionUtils {
 		try {
 			Field k = clazz.getDeclaredField(fieldName);
 			makeAccessible(k);
-			Logger.REFLECTION("Got Field from Class. "+fieldName+" did exist within "+clazz.getCanonicalName()+".");
+			//Logger.REFLECTION("Got Field from Class. "+fieldName+" did exist within "+clazz.getCanonicalName()+".");
 			return k;
 		} catch (final NoSuchFieldException e) {
 			final Class<?> superClass = clazz.getSuperclass();
 			if (superClass == null) {
-				Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within "+clazz.getCanonicalName()+".");
+				//Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within "+clazz.getCanonicalName()+".");
 				throw e;
 			}
-			Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within "+clazz.getCanonicalName()+". Trying super class.");
+			//Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within "+clazz.getCanonicalName()+". Trying super class.");
 			return getField(superClass, fieldName);
 		}
 	}
-- 
cgit