Some changes

mchorse · May 30, 2023 · 4a022e6 · 4a022e6
1 parent c31b005
commit 4a022e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2860'
+    minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2859'
 
     compileOnly files("run/libs/blockbuster-${blockbuster}-${mcversion}-dev.jar")
     compileOnly files("run/libs/metamorph-${metamorph}-${mcversion}-dev.jar")
@@ -335,3 +335,7 @@ task copyLangStrings {
         print("Done!")
     }
 }
+
+configurations.configureEach {
+    exclude group: "net.minecraftforge", module: "mergetool"
+}
diff --git a/src/main/java/mchorse/mappet/client/gui/scripts/GuiDocumentationOverlayPanel.java b/src/main/java/mchorse/mappet/client/gui/scripts/GuiDocumentationOverlayPanel.java
@@ -23,13 +23,9 @@
 import net.minecraft.client.resources.Language;
 import net.minecraft.launchwrapper.Launch;
 
+import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
@@ -74,20 +70,21 @@ private static void parseDocs()
 
         if (dev || docs == null)
         {
-
             InputStream localeStream = null;
             Language language = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage();
 
             if (!language.equals(Minecraft.getMinecraft().getLanguageManager().getLanguage("en_us")))
             {
                 try
                 {
-                    Path path = Paths.get(ClientProxy.configFolder.getPath(), "documentation");
-                    Files.createDirectories(path);
-                    localeStream = new FileInputStream(path.resolve(language.getLanguageCode() + ".json").toFile());
+                    File folder = new File(ClientProxy.configFolder.getPath(), "mappet/documentation");
+
+                    folder.mkdirs();
+
+                    localeStream = new FileInputStream(new File(folder, language.getLanguageCode() + ".json"));
                 }
-                catch (FileNotFoundException ignored1) {}
-                catch (IOException e) {}
+                catch (Exception e)
+                {}
             }
 
             InputStream stream = GuiDocumentationOverlayPanel.class.getResourceAsStream("/assets/mappet/docs.json");