v0.7.5: replaced all uses of java reflection with LibGDX reflection

SPD-classes/src/main/java/com/watabou/glscripts/Script.java

@@ -24,6 +24,7 @@ package com.watabou.glscripts;
 import com.watabou.glwrap.Program;
 import com.watabou.glwrap.Shader;
 import com.watabou.noosa.Game;
+import com.watabou.utils.Reflection;
 
 import java.util.HashMap;
 
@@ -42,11 +43,7 @@ public class Script extends Program {
 			
 			Script script = all.get( c );
 			if (script == null) {
-				try {
-					script = c.newInstance();
-				} catch (Exception e) {
-					Game.reportException(e);
-				}
+				script = Reflection.newInstance( c );
 				all.put( c, script );
 			}
 			

SPD-classes/src/main/java/com/watabou/noosa/Game.java

@@ -33,6 +33,7 @@ import com.watabou.input.KeyEvent;
 import com.watabou.noosa.audio.Music;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.PlatformSupport;
+import com.watabou.utils.Reflection;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -187,14 +188,10 @@ public class Game implements ApplicationListener {
 		
 		if (requestedReset) {
 			requestedReset = false;
-
-			try {
-				requestedScene = sceneClass.newInstance();
+			
+			requestedScene = Reflection.newInstance(sceneClass);
+			if (requestedScene != null){
 				switchScene();
-			} catch (InstantiationException e){
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				e.printStackTrace();
 			}
 
 		}

SPD-classes/src/main/java/com/watabou/noosa/Group.java

@@ -23,6 +23,7 @@ package com.watabou.noosa;
 
 import com.watabou.noosa.particles.Emitter;
 import com.watabou.utils.Random;
+import com.watabou.utils.Reflection;
 
 import java.util.ArrayList;
 
@@ -190,11 +191,11 @@ public class Group extends Gizmo {
 			
 		} else {
 			
-			try {
-				return add( c.newInstance() );
-			} catch (Exception e) {
-				Game.reportException(e);
+			g = Reflection.newInstance(c);
+			if (g != null) {
+				return add(g);
 			}
+			
 		}
 		
 		return null;

SPD-classes/src/main/java/com/watabou/utils/Bundle.java

@@ -97,13 +97,8 @@ public class Bundle {
 			if (aliases.containsKey( clName )) {
 				clName = aliases.get( clName );
 			}
-			try {
-				Class cl = Class.forName( clName );
-				return cl;
-			} catch (ClassNotFoundException e) {
-				Game.reportException(e);
-				return null;
-			}
+			
+			return Reflection.forName( clName );
 		}
 		return null;
 	}
@@ -114,30 +109,24 @@ public class Bundle {
 	
 	private Bundlable get() {
 		if (data == null) return null;
-		try {
-			String clName = getString( CLASS_NAME );
-			if (aliases.containsKey( clName )) {
-				clName = aliases.get( clName );
-			}
-			
-			Class<?> cl = Class.forName( clName );
-			if (cl != null && (!cl.isMemberClass() || Modifier.isStatic(cl.getModifiers()))) {
-				Bundlable object = (Bundlable)cl.newInstance();
-				object.restoreFromBundle( this );
-				return object;
-			} else {
-				return null;
-			}
-		} catch (ClassNotFoundException e ) {
-			Game.reportException(e);
-			return null;
-		} catch (InstantiationException e ) {
-			Game.reportException(e);
-			return null;
-		} catch (IllegalAccessException e ) {
-			Game.reportException(e);
-			return null;
+		
+		String clName = getString( CLASS_NAME );
+		if (aliases.containsKey( clName )) {
+			clName = aliases.get( clName );
 		}
+		
+		Class<?> cl = Reflection.forName( clName );
+		//Skip none-static inner classes as they can't be instantiated through bundle restoring
+		//Classes which make use of none-static inner classes must manage instantiation manually
+		if (cl != null && (!Reflection.isMemberClass(cl) || Reflection.isStatic(cl))) {
+			Bundlable object = (Bundlable) Reflection.newInstance(cl);
+			if (object != null) {
+				object.restoreFromBundle(this);
+				return object;
+			}
+		}
+		
+		return null;
 	}
 	
 	public Bundlable get( String key ) {
@@ -226,13 +215,8 @@ public class Bundle {
 				if (aliases.containsKey( clName )) {
 					clName = aliases.get( clName );
 				}
-				try {
-					Class cl = Class.forName( clName );
-					result[i] = cl;
-				} catch (ClassNotFoundException e) {
-					Game.reportException(e);
-					result[i] = null;
-				}
+				Class cl = Reflection.forName( clName );
+				result[i] = cl;
 			}
 			return result;
 		} catch (JSONException e) {
@@ -404,7 +388,7 @@ public class Bundle {
 			//Classes which make use of none-static inner classes must manage instantiation manually
 			if (object != null) {
 				Class cl = object.getClass();
-				if (!cl.isMemberClass() || Modifier.isStatic(cl.getModifiers())) {
+				if ((!Reflection.isMemberClass(cl) || Reflection.isStatic(cl))) {
 					Bundle bundle = new Bundle();
 					bundle.put(CLASS_NAME, cl.getName());
 					object.storeInBundle(bundle);

SPD-classes/src/main/java/com/watabou/utils/Reflection.java

@@ -0,0 +1,65 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015 Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2019 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.watabou.utils;
+
+import com.badlogic.gdx.utils.reflect.ClassReflection;
+import com.badlogic.gdx.utils.reflect.ReflectionException;
+import com.watabou.noosa.Game;
+
+//wrapper for LibGDX reflection
+public class Reflection {
+	
+	public static boolean isMemberClass( Class cls ){
+		return ClassReflection.isMemberClass(cls);
+	}
+	
+	public static boolean isStatic( Class cls ){
+		return ClassReflection.isStaticClass(cls);
+	}
+	
+	public static <T> T newInstance( Class<T> cls ){
+		try {
+			return ClassReflection.newInstance(cls);
+		} catch (ReflectionException e) {
+			Game.reportException(e);
+			return null;
+		}
+	}
+	
+	public static <T> T newInstanceUnhandled( Class<T> cls ) throws Exception {
+		return ClassReflection.newInstance(cls);
+	}
+	
+	public static Class forName( String name ){
+		try {
+			return ClassReflection.forName( name );
+		} catch (ReflectionException e) {
+			Game.reportException(e);
+			return null;
+		}
+	}
+	
+	public static Class forNameUnhandled( String name ) throws Exception {
+		return ClassReflection.forName( name );
+	}
+	
+}