Reenable resourcepack injection, but in a sub-folder. Automatically c…

…reate folder structure. Remove the book list setting from the config.
gigaherz · Jan 26, 2017 · fc0645a · fc0645a
1 parent 1ae5470
commit fc0645a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/src/main/java/gigaherz/guidebook/GuidebookMod.java b/src/main/java/gigaherz/guidebook/GuidebookMod.java
@@ -70,14 +70,10 @@ public void preInit(FMLPreInitializationEvent event)
         logger = event.getModLog();
 
         Configuration config = new Configuration(event.getSuggestedConfigurationFile());
-        String[] books = config.get("Books", "BookList", new String[]{GuidebookMod.location("xml/guidebook.xml").toString()}).getStringList();
         String[] give = config.get("Books", "GiveOnFirstJoin", new String[0]).getStringList();
         bookGUIScale = config.get("general", "BookGUIScale", -1, "-1 for same as GUI scale, 0 for auto, 1+ for small/medium/large").getInt();
         config.save();
 
-        for (String book : books)
-        { BookRegistry.registerBook(new ResourceLocation(book)); }
-
         giveOnFirstJoin = Lists.newArrayList(give);
 
         booksDirectory = new File(event.getModConfigurationDirectory(), "books");

diff --git a/src/main/java/gigaherz/guidebook/client/ClientProxy.java b/src/main/java/gigaherz/guidebook/client/ClientProxy.java
@@ -44,7 +44,7 @@ public static void registerModels(ModelRegistryEvent event)
     @Override
     public void preInit()
     {
-        //injectCustomResourcePack();
+        injectCustomResourcePack();
 
         MinecraftForge.EVENT_BUS.post(new BookRegistryEvent());
     }
@@ -54,16 +54,29 @@ public void preInit()
     @SuppressWarnings("unchecked")
     private void injectCustomResourcePack()
     {
-        File booksFolder = GuidebookMod.booksDirectory;
+        File resourcesFolder = new File(GuidebookMod.booksDirectory, "resources");
 
-        if (!booksFolder.exists() || !booksFolder.isDirectory())
+        if (!resourcesFolder.exists())
+        {
+            GuidebookMod.logger.info("The resources folder does not exist, creating...");
+            if (!resourcesFolder.mkdirs())
+            {
+                GuidebookMod.logger.info("The resources folder could not be created, and it won't be injected as a resource pack folder.");
+                return;
+            }
+        }
+
+        if (!resourcesFolder.exists() || !resourcesFolder.isDirectory())
+        {
+            GuidebookMod.logger.info("There's a file called books, but it's not a directory, so it won't be injected as a resource pack folder.");
             return;
+        }
 
         try
         {
             List<IResourcePack> rp = (List<IResourcePack>) _defaultResourcePacks.get(Minecraft.getMinecraft());
 
-            rp.add(new FolderResourcePack(booksFolder)
+            rp.add(new FolderResourcePack(resourcesFolder)
             {
                 String prefix = "assets/" + GuidebookMod.MODID + "/";
 

diff --git a/src/main/java/gigaherz/guidebook/guidebook/client/BookRegistry.java b/src/main/java/gigaherz/guidebook/guidebook/client/BookRegistry.java
@@ -120,8 +120,21 @@ private static void loadRawBookFiles(IResourceManager manager)
     {
         File booksFolder = GuidebookMod.booksDirectory;
 
+        if (!booksFolder.exists())
+        {
+            GuidebookMod.logger.info("The books folder does not exist, creating...");
+            if (!booksFolder.mkdirs())
+            {
+                GuidebookMod.logger.info("The books folder could not be created. Books can't be loaded from it.");
+                return;
+            }
+        }
+
         if (!booksFolder.exists() || !booksFolder.isDirectory())
+        {
+            GuidebookMod.logger.info("There's a file called books, but it's not a directory. Books can't be loaded from it.");
             return;
+        }
 
         Collection<File> xmlFiles = FileUtils.listFiles(booksFolder, new String[]{"xml"}, true);