Update 1.2.41

Author: Fox2Code

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinGuiScreen.java

@@ -0,0 +1,9 @@
+package com.fox2code.foxloader.client.mixins;
+
+import com.fox2code.foxloader.config.NoConfigObject;
+import net.minecraft.src.client.gui.GuiScreen;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(GuiScreen.class)
+public class MixinGuiScreen implements NoConfigObject {
+}

client/src/main/resources/foxloader.client.mixins.json

@@ -22,6 +22,7 @@
     "MixinGuiDebug",
     "MixinGuiIngameMenu",
     "MixinGuiMainMenu",
+    "MixinGuiScreen",
     "MixinGuiTextField",
     "MixinItem",
     "MixinItemStack",

common/build.gradle

@@ -7,7 +7,7 @@ group 'com.fox2code'
 version project['foxloader.version']
 
 dependencies {
-    // TODO: Don't forget to update DependencyHelper
+    // TODO: Don't forget to update DependencyHelper and ":dev" project
     api 'org.ow2.asm:asm-util:9.6'
     api 'org.ow2.asm:asm-commons:9.6'
     api 'org.semver4j:semver4j:5.2.2'

common/src/main/java/com/fox2code/foxloader/config/ConfigStructure.java

@@ -61,8 +61,13 @@ private static ConfigMenu parseMenuImpl(
                     Collections.unmodifiableList(configKeys));
         }
 
+        if (cls.isAssignableFrom(NoConfigObject.class)) {
+            return configMenu;
+        }
+
         menuCache.put(cls, configMenu);
         for (Field field : cls.getFields()) {
+            Class<?> fieldType = field.getType();
             ConfigEntry configEntry = field.getAnnotation(ConfigEntry.class);
             if (configEntry == null) continue;
             if ((field.getModifiers() & (Modifier.PUBLIC | Modifier.PRIVATE |
@@ -130,7 +135,7 @@ private static ConfigMenu parseMenuImpl(
                     configKey = new ConfigKey(configEntry, ConfigKey.ConfigElement.BUTTON,
                             subConfigMenu, declaringConfigKey, configTranslation, configPath, field, handler);
                     ConfigMenu subConfigMenuResult =
-                            parseMenuImpl(field.getType(), modContainer, subMenuPrefix,
+                            parseMenuImpl(fieldType, modContainer, subMenuPrefix,
                                     configKey, subMenuConfigKeys, configKeyHashMap, menuCache);
                     if (subConfigMenuResult != subConfigMenu) {
                         // This can happen if the menu was already cached, to avoid infinite loops
@@ -166,7 +171,12 @@ private ConfigStructure(Map<String, ConfigKey> configKeyMap, ConfigMenu rootConf
 
     public void loadJsonConfig(JsonObject jsonObject, Object config) {
         this.cls.cast(config); // Verify input type
-
+        for (ConfigKey configKey : this.configKeyMap.values()) {
+            JsonElement element = getElementJsonObject(jsonObject, configKey.path);
+            if (element != null) {
+                setElementConfigKey(config, configKey, element);
+            }
+        }
     }
 
     public JsonObject saveJsonConfig(Object config) {

common/src/main/java/com/fox2code/foxloader/config/NoConfigObject.java

@@ -0,0 +1,6 @@
+package com.fox2code.foxloader.config;
+
+/**
+ * Used to tell the config API to ignore this object
+ */
+public interface NoConfigObject {}

common/src/main/java/com/fox2code/foxloader/loader/Mod.java

@@ -22,14 +22,14 @@ public final ModContainer getModContainer() {
      * @param configObject to use for the config screen.
      */
     protected final void setConfigObject(Object configObject) {
-        this.getModContainer().configObject = configObject;
+        this.getModContainer().setConfigObject(configObject);
     }
 
     /**
      * @return Object to use for the config screen.
      */
     public final Object getConfigObject() {
-        return this.getModContainer().configObject;
+        return this.getModContainer().getConfigObject();
     }
 
     /**

common/src/main/java/com/fox2code/foxloader/loader/ModContainer.java

@@ -1,6 +1,7 @@
 package com.fox2code.foxloader.loader;
 
 import com.fox2code.foxloader.config.ConfigStructure;
+import com.fox2code.foxloader.config.NoConfigObject;
 import com.fox2code.foxloader.launcher.FoxLauncher;
 import com.fox2code.foxloader.launcher.utils.FastThreadLocal;
 import com.fox2code.foxloader.loader.lua.LuaVMHelper;
@@ -36,6 +37,7 @@ public final class ModContainer {
     public final Logger logger;
     public final boolean unofficial;
     private final boolean injected;
+    private Object configObject;
     String prePatch;
     Mod commonMod;
     String commonModCls;
@@ -46,7 +48,6 @@ public final class ModContainer {
     Mod clientMod;
     String clientModCls;
     String clientMixins;
-    Object configObject;
 
     ModContainer(File file, String id, String name, String version,
                  String description, String jitpack, boolean unofficial) {
@@ -131,7 +132,7 @@ public String getFileName() {
 
     void setConfigObject(Object configObject) {
         this.configObject = configObject;
-        if (configObject != null) {
+        if (configObject != null && !(configObject instanceof NoConfigObject)) {
             ConfigStructure configStructure = ConfigStructure.parseFromClass(configObject.getClass(), this);
             File configFileDestination = new File(ModLoader.config, this.id + ".json");
             if (configFileDestination.exists()) {
@@ -161,7 +162,7 @@ public Object getConfigObject() {
     }
 
     public void saveModConfig() {
-        if (this.configObject == null) return;
+        if (this.configObject == null || this.configObject instanceof NoConfigObject) return;
         ConfigStructure configStructure = ConfigStructure.parseFromClass(this.configObject.getClass(), this);
         File configFileDestination = new File(ModLoader.config, this.id + ".json");
         try {

common/src/main/java/com/fox2code/foxloader/loader/ModLoader.java

@@ -115,13 +115,15 @@ static void initializeModdedInstance(boolean client) {
                     (dir, name) -> name.endsWith(".lua")))) {
                 loadModContainerFromLua(mod);
             }
-            for (File mod : Objects.requireNonNull(modsVersioned.listFiles(
-                    (dir, name) -> name.endsWith(".jar")))) {
-                loadModContainerFromJar(mod, false);
-            }
-            for (File mod : Objects.requireNonNull(modsVersioned.listFiles(
-                    (dir, name) -> name.endsWith(".lua")))) {
-                loadModContainerFromLua(mod);
+            if (modsVersioned.isDirectory()) {
+                for (File mod : Objects.requireNonNull(modsVersioned.listFiles(
+                        (dir, name) -> name.endsWith(".jar")))) {
+                    loadModContainerFromJar(mod, false);
+                }
+                for (File mod : Objects.requireNonNull(modsVersioned.listFiles(
+                        (dir, name) -> name.endsWith(".lua")))) {
+                    loadModContainerFromLua(mod);
+                }
             }
         }
         // Inject mod that the gradle dev plugin asked us to load
@@ -515,6 +517,7 @@ public static class Contributors {
             addContributor("a5adabf9-0c1f-4d03-855b-61e334cd96d7", "Fox2Code");
             addContributor("76982056-c381-46f6-ab25-2415e1e4d554", "kivattt");
             addContributor("898febf0-4bd0-4a77-892c-2b1cbf534830", "_Dereku");
+            addContributor("66580d8e-19ad-4564-a8f1-448d021be321", "Chocohead");
         }
 
         private static void addContributor(String uuid, String name) {

dev/build.gradle

@@ -24,7 +24,7 @@ configurations {
 dependencies {
     //compileOnly gradleApi()
     //compileOnly localGroovy()
-    api 'com.fox2code:JFallback:0.0.1'
+    api 'com.fox2code:JFallback:0.0.2'
     api 'com.google.code.gson:gson:2.10.1'
     api 'org.semver4j:semver4j:5.2.2'
     api 'org.ow2.asm:asm-commons:9.6'

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 
 # FoxLoader properties
-foxloader.version=1.2.40
+foxloader.version=1.2.41
 foxloader.lastReIndevTransformerChanges=1.2.39
 # https://www.jitpack.io/#com.fox2code/FoxLoader