Adding default config items images

Author: Otho

src/main/java/me/otho/customItems/CustomItems.java

@@ -28,11 +28,11 @@ public void preInit(FMLPreInitializationEvent event) throws IOException, URISynt
 	{			
 		String folderPath = event.getModConfigurationDirectory().toString()+File.separator+ModReference.MOD_ID+File.separator;
 
-		if(ForgeConfig.remake)
-			JsonConfigurationHandler.unpackConfigFile(CustomItems.class, "defaultConfigs", folderPath);
-								
 		ForgeConfig.init(event.getSuggestedConfigurationFile());
 
+//		if(ForgeConfig.remake)
+//			JsonConfigurationHandler.unpackConfigFile(CustomItems.class, "defaultConfigs", folderPath);
+		
 		customItemsTab.init();
 
 		JsonConfigurationHandler.init(folderPath);

src/main/java/me/otho/customItems/configuration/ForgeConfig.java

@@ -8,9 +8,9 @@ public class ForgeConfig
 {
 	public static Configuration config;
 
-	public static boolean debug;
+	public static boolean debug = true;
 	public static boolean defaultTab;
-	public static boolean remake;
+	public static boolean remake = false;
 
 	public static void init(File configFile)
 	{
@@ -22,8 +22,7 @@ public static void init(File configFile)
 
 	private static void loadConfiguration()
 	{		
-		remake = config.getBoolean("remake", "OPTIONS", true, "Set true if you want to restore the default config on the next time the mod is loaded");
-		debug = config.getBoolean("debug", "DEBUG", false, "Set to true if you wish to output debug info");
+//		remake = config.getBoolean("remake", "OPTIONS", true, "Set true if you want to restore the default config on the next time the mod is loaded");		
 		defaultTab = config.getBoolean("defaultTab", "OPTIONS", true, "Set to false, if you dont want the default creative tab");
 
 		if(config.hasChanged()) {

src/main/java/me/otho/customItems/configuration/JsonConfigurationHandler.java

@@ -9,9 +9,16 @@
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLDecoder;
+import java.util.Arrays;
 import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 
 import me.otho.customItems.registry.Registry;
+import me.otho.customItems.util.LogHelper;
 
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -96,6 +103,7 @@ private static void mergeGson(JsonSchema data, JsonSchema mergeTo)
 	public static boolean unpackConfigFile(Class obj, String path, String destinationPath) throws IOException, URISyntaxException
     {
 		String[] resources = getResourceListing(obj, path);
+		LogHelper.info(Arrays.deepToString(resources));
 		int i;
 		if(resources != null){
 			for(i=0; i< resources.length; i++){			
@@ -131,16 +139,52 @@ public static boolean unpackConfigFile(Class obj, String path, String destinatio
 			}
 		}
 
-		return true;    	
+		LogHelper.info("Failed to load default config files - 2");
+		return false;    	
     }
 
 	public static String[] getResourceListing(Class clazz, String path) throws URISyntaxException, IOException {
 	      URL dirURL = clazz.getClassLoader().getResource(path);
+	      
 	      if (dirURL != null && dirURL.getProtocol().equals("file")) {
 	    	String[] list = new File(dirURL.toURI()).list();
 	        return list;
-	      }	      
+	      }	
+	      
+	      if (dirURL == null) {
+	          /* 
+	           * In case of a jar file, we can't actually find a directory.
+	           * Have to assume the same jar as clazz.
+	           */
+	          String me = clazz.getName().replace(".", "/")+".class";
+	          dirURL = clazz.getClassLoader().getResource(me);
+	        }
 
+	        if (dirURL.getProtocol().equals("jar")) {
+	          /* A JAR path */
+	          String jarPath = dirURL.getPath().substring(5, dirURL.getPath().indexOf("!")); //strip out only the JAR file
+	          JarFile jar = new JarFile(URLDecoder.decode(jarPath, "UTF-8"));
+	          Enumeration<JarEntry> entries = jar.entries(); //gives ALL entries in jar
+	          Set<String> result = new HashSet<String>(); //avoid duplicates in case it is a subdirectory
+	          while(entries.hasMoreElements()) {
+	            String name = entries.nextElement().getName();
+	            if (name.startsWith(path)) { //filter according to the path
+	              String entry = name.substring(path.length());
+	              int checkSubdir = entry.indexOf("/");
+	              if (checkSubdir >= 0) {
+	                // if it is a subdirectory, we just return the directory name
+	                entry = entry.substring(0, checkSubdir);
+	              }
+	              result.add(entry);
+	            }
+	          }
+	          jar.close();
+	          String[] ret = result.toArray(new String[result.size()]);
+	          LogHelper.info("Return: " + ret);
+	          return ret;
+	        } 
+	      
+	      LogHelper.info("Failed to load default config files");
 	      throw new UnsupportedOperationException("Cannot list files for URL "+dirURL);
 	  }