Merge branch 'development' into task/improved-script-loader

src/main/java/org/parabot/core/asm/redirect/SystemRedirect.java

@@ -23,11 +23,23 @@ public class SystemRedirect {
         System.exit(i);
     }
 
+    private static String getClassPath(){
+        String classPath = System.getProperty("java.class.path");
+        StringBuilder finalClassPath = new StringBuilder();
+        for (String path : classPath.split(":")) {
+            if (!path.toLowerCase().contains("parabot")) {
+                finalClassPath.append(path).append(":");
+            }
+        }
+
+        return finalClassPath.toString();
+    }
+
     public static String getProperty(String s) {
         String value;
         switch (s) {
             case "java.class.path":
-                value = ".";
+                value = getClassPath();
                 break;
             default:
                 value = System.getProperty(s);
@@ -42,14 +54,14 @@ public class SystemRedirect {
         String value = null;
         switch (s2) {
             case "java.class.path":
-                value = ".";
+                value = getClassPath();
                 break;
         }
 
         if (value == null) {
             switch (s) {
                 case "java.class.path":
-                    value = ".";
+                    value = getClassPath();
                     break;
                 default:
                     value = System.getProperty(s);

src/main/java/org/parabot/core/ui/ReflectUI.java

@@ -240,12 +240,24 @@ public class ReflectUI extends JFrame {
         builder.append("<b>Static: </b>").append(refField.isStatic() ? "yes" : "no").append("<br/>");
         builder.append("<b>Array: </b>").append(refField.isArray() ? refField.getArrayDimensions() + " dimension(s)" : "no").append("<br/>");
 
-        if (refField.isArray() && refField.getASMType().getClassName().contains("String") && refField.getArrayDimensions() == 1) {
+        if (refField.isArray()) {
+            if (refField.getArrayDimensions() == 1) {
+                if (refField.getASMType().getClassName().contains("int")) {
+                    int[] ints = (int[]) refField.asObject();
+                    String values = "";
+                    for (int i = 0; i < ints.length; i++) {
+                        values += (ints[i] + (i < ints.length - 1 ? ", " : ""));
+                    }
+
+                    builder.append("<b>Values: </b>").append(values).append("<br/>");
+                } else if (refField.getASMType().getClassName().contains("String")) {
                     String[] strings = (String[]) refField.asObject();
                     String values = StringUtils.implode(", ", strings);
 
                     builder.append("<b>Values: </b>").append(values).append("<br/>");
                 }
+            }
+        }
         selectionInfoPane.setText(builder.toString());
 
         fillBasicInfoPane();