fix some loading issues

Mysticpasta1 · Jun 10, 2023 · ca1b1cc · ca1b1cc
1 parent 81ebbbf
commit ca1b1cc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '5.1.+'
     id 'org.spongepowered.mixin' version '0.7.+'
+    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
 }
 
 version = mod_version
@@ -12,7 +13,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    mappings channel: 'official', version: '1.19.2'
+    mappings channel: 'parchment', version: "2022.08.14-1.19.2"
     //accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     runs {
         client {

diff --git a/settings.gradle b/settings.gradle
@@ -2,6 +2,7 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven { url = 'https://maven.minecraftforge.net/' }
+        maven { url = 'https://maven.parchmentmc.org' }
     }
     resolutionStrategy {
         eachPlugin {

diff --git a/src/main/java/net/montoyo/mcef/MCEF.java b/src/main/java/net/montoyo/mcef/MCEF.java
@@ -33,6 +33,7 @@ public class MCEF {
 	public static BaseProxy PROXY = DistExecutor.safeRunForDist(() -> ClientProxy::new, () -> BaseProxy::new);
 	public static boolean skipVersionCheck = false;
 	public static boolean writeMirrorData = false;
+	public static boolean downloadedFromGit = false;
 
 	private static boolean wroteConfig = false;
 

diff --git a/src/main/java/net/montoyo/mcef/easy_forge_compat/Configuration.java b/src/main/java/net/montoyo/mcef/easy_forge_compat/Configuration.java
@@ -47,6 +47,7 @@ public void getBoolean(String optName, String section, boolean defaultValue, Str
 				value::get,
 				(v) -> UnsafeUtil.setBoolean(base, handle, (boolean) v)
 		));
+		UnsafeUtil.setBoolean(base, handle, defaultValue);
 		configBuilder.pop();
 	}
 
@@ -59,6 +60,7 @@ public void getString(String optName, String section, String defaultValue, Strin
 				value::get,
 				(v) -> valueConsumer.accept((String) v)
 		));
+		valueConsumer.accept(defaultValue);
 		configBuilder.pop();
 	}
 
@@ -111,11 +113,6 @@ public void save() {
 				outputStream.write(writer.writeToString(cfg).getBytes(StandardCharsets.UTF_8));
 				outputStream.flush();
 				outputStream.close();
-
-				spec.correct(cfg);
-				spec.setConfig(cfg);
-
-				spec.save();
 			}
 		} catch (Throwable err) {
 			err.printStackTrace();

diff --git a/src/main/java/net/montoyo/mcef/utilities/CefUtil.java b/src/main/java/net/montoyo/mcef/utilities/CefUtil.java
@@ -63,7 +63,8 @@ public static boolean init() {
 
         ipl.onProgressed(0);
         ipl.onTaskChanged("1:Load Config");
-        cfg.load();
+        if (!MCEF.FAVOR_GIT || !MCEF.downloadedFromGit)
+            cfg.load();
         ipl.onProgressed(0.25);
 
         System.out.println("Updating MCEF file listing ");

diff --git a/src/main/java/net/montoyo/mcef/utilities/Log.java b/src/main/java/net/montoyo/mcef/utilities/Log.java
@@ -2,6 +2,7 @@
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * A set of functions to log messages into the MCEF log channel.
@@ -10,20 +11,22 @@
  */
 public class Log {
 
+    private static final Logger LOGGER = LogManager.getLogger("MCEF");
+
     public static void info(String what, Object ... data) {
-        LogManager.getLogger("MCEF").log(Level.INFO, String.format(what, data));
+        LOGGER.log(Level.INFO, String.format(what, data));
     }
 
     public static void warning(String what, Object ... data) {
-        LogManager.getLogger("MCEF").log(Level.WARN, String.format(what, data));
+        LOGGER.log(Level.WARN, String.format(what, data));
     }
 
     public static void error(String what, Object ... data) {
-        LogManager.getLogger("MCEF").log(Level.ERROR, String.format(what, data));
+        LOGGER.log(Level.ERROR, String.format(what, data));
     }
 
     public static void errorEx(String what, Throwable t, Object ... data) {
-        LogManager.getLogger("MCEF").log(Level.ERROR, String.format(what, data), t);
+        LOGGER.log(Level.ERROR, String.format(what, data), t);
     }
 
 }
diff --git a/src/main/java/net/montoyo/mcef/utilities/download/MCEFDownloader.java b/src/main/java/net/montoyo/mcef/utilities/download/MCEFDownloader.java
@@ -213,9 +213,12 @@ private void ensureJcef(String cefBranch, String platform) throws IOException {
     }
 
     public void run() {
-        if (MCEF.FAVOR_GIT)
-            if (ModernDownload.download(listener))
+        if (MCEF.FAVOR_GIT) {
+            if (ModernDownload.download(listener)) {
+                MCEF.downloadedFromGit = true;
                 return;
+            }
+        }
 
         listener.onTaskChanged("1:Fetching mod version info...");