Code cleanup, fix many misc. crashes

calmilamsy · calmilamsy · commit 3b705d5f27de · 2024-07-07T19:39:20.000+01:00
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/api/config/ConfigCategory.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/api/config/ConfigCategory.java
@@ -1,7 +1,5 @@
 package net.modificationstation.stationapi.api.config;
 
-import net.modificationstation.stationapi.api.util.Identifier;
-
 import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/api/config/GCAPI.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/api/config/GCAPI.java
@@ -1,17 +1,11 @@
 package net.modificationstation.stationapi.api.config;
 
-import net.fabricmc.loader.api.ModContainer;
-import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.impl.config.ConfigRootEntry;
 import net.modificationstation.stationapi.impl.config.EventStorage;
 import net.modificationstation.stationapi.impl.config.GCCore;
 import net.modificationstation.stationapi.impl.config.GlassYamlFile;
-import net.modificationstation.stationapi.impl.config.object.ConfigCategoryHandler;
 import org.jetbrains.annotations.Nullable;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
-import uk.co.benjiweber.expressions.tuple.QuadTuple;
-import uk.co.benjiweber.expressions.tuple.TriTuple;
 
 import java.io.*;
 import java.util.concurrent.atomic.*;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/GCCore.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/GCCore.java
@@ -17,17 +17,15 @@
 import net.modificationstation.stationapi.api.config.GeneratedConfig;
 import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.util.ReflectionHelper;
-import net.modificationstation.stationapi.impl.config.object.ConfigHandlerBase;
 import net.modificationstation.stationapi.impl.config.object.ConfigCategoryHandler;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
+import net.modificationstation.stationapi.impl.config.object.ConfigHandlerBase;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.simpleyaml.configuration.file.YamlFileWrapper;
 import uk.co.benjiweber.expressions.function.SeptFunction;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
-import uk.co.benjiweber.expressions.tuple.QuadTuple;
 
 import java.io.*;
 import java.lang.reflect.*;
@@ -276,7 +274,6 @@ private static void readDeeper(Object rootConfigObject, Field configField, Glass
                 }
                 configEntry.multiplayerLoaded = isMultiplayer && configEntry.multiplayerSynced;
                 category.values.put(field.getType(), configEntry);
-                configEntry.saveToField();
                 totalReadFields.getAndIncrement();
             }
         }
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/factory/DefaultFactoryProvider.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/factory/DefaultFactoryProvider.java
@@ -1,8 +1,8 @@
 package net.modificationstation.stationapi.impl.config.factory;
 
 import com.google.common.collect.ImmutableMap;
-import net.modificationstation.stationapi.api.config.ConfigFactoryProvider;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
+import net.modificationstation.stationapi.api.config.ConfigFactoryProvider;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
 import net.modificationstation.stationapi.impl.config.object.entry.BooleanConfigEntryHandler;
 import net.modificationstation.stationapi.impl.config.object.entry.FloatConfigEntryHandler;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/ConfigCategoryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/ConfigCategoryHandler.java
@@ -4,7 +4,6 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.loader.api.ModContainer;
-import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import net.minecraft.client.gui.screen.Screen;
 import net.modificationstation.stationapi.api.config.HasDrawable;
 import net.modificationstation.stationapi.impl.config.screen.RootScreenBuilder;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/ConfigEntryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/ConfigEntryHandler.java
@@ -5,9 +5,9 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.resource.language.TranslationStorage;
+import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.api.config.DefaultOnVanillaServer;
 import net.modificationstation.stationapi.api.config.HasDrawable;
-import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.api.config.TriBoolean;
 import net.modificationstation.stationapi.api.config.ValueOnVanillaServer;
 import net.modificationstation.stationapi.impl.config.screen.widget.IconWidget;
@@ -55,10 +55,6 @@ public void saveToField() throws IllegalAccessException {
         parentField.set(parentObject, value);
     }
 
-    public ConfigEntry getMaxLength() {
-        return configEntry;
-    }
-
     /**
      * Called when resetting the entry to the default value.
      * Yes, I'm making you write this part yourself, I don't know how your custom objects work and how to properly deep clone them.
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/BaseListConfigEntryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/BaseListConfigEntryHandler.java
@@ -5,9 +5,9 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;
+import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.api.config.ConfigEntryWithButton;
 import net.modificationstation.stationapi.api.config.HasDrawable;
-import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
 import net.modificationstation.stationapi.impl.config.screen.BaseListScreenBuilder;
 import net.modificationstation.stationapi.impl.config.screen.widget.FancyButtonWidget;
@@ -59,8 +59,13 @@ public T[] getDrawableValue() {
 
     @Override
     public boolean isValueValid() {
-//        return value.length <= configEntry.maxArrayLength() && value.length >= configEntry.minArrayLength() && listContentsValid();
-        return true;
+        if (value.length > configEntry.maxArrayLength()) {
+            return false;
+        }
+        if(value.length < configEntry.minArrayLength()) {
+            return false;
+        }
+        return listContentsValid();
     }
 
     public boolean listContentsValid() {
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/FloatConfigEntryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/FloatConfigEntryHandler.java
@@ -3,12 +3,11 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;
 import net.modificationstation.stationapi.api.config.CharacterUtils;
-import net.modificationstation.stationapi.api.config.HasDrawable;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
+import net.modificationstation.stationapi.api.config.HasDrawable;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
 import net.modificationstation.stationapi.impl.config.screen.widget.ExtensibleTextFieldWidget;
 import org.jetbrains.annotations.NotNull;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.lang.reflect.*;
 import java.util.*;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/FloatListConfigEntryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/FloatListConfigEntryHandler.java
@@ -3,12 +3,9 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.Screen;
-import net.modificationstation.stationapi.api.config.CharacterUtils;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.impl.config.screen.BaseListScreenBuilder;
 import net.modificationstation.stationapi.impl.config.screen.FloatListScreenBuilder;
-import net.modificationstation.stationapi.impl.config.screen.IntegerListScreenBuilder;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.lang.reflect.*;
 import java.util.*;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/IntegerConfigEntryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/IntegerConfigEntryHandler.java
@@ -3,12 +3,11 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;
 import net.modificationstation.stationapi.api.config.CharacterUtils;
-import net.modificationstation.stationapi.api.config.HasDrawable;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
+import net.modificationstation.stationapi.api.config.HasDrawable;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
 import net.modificationstation.stationapi.impl.config.screen.widget.ExtensibleTextFieldWidget;
 import org.jetbrains.annotations.NotNull;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.lang.reflect.*;
 import java.util.*;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/IntegerListConfigEntryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/IntegerListConfigEntryHandler.java
@@ -3,14 +3,11 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.Screen;
-import net.modificationstation.stationapi.api.config.CharacterUtils;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.impl.config.screen.BaseListScreenBuilder;
 import net.modificationstation.stationapi.impl.config.screen.IntegerListScreenBuilder;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.lang.reflect.*;
-import java.util.*;
 
 public class IntegerListConfigEntryHandler extends BaseListConfigEntryHandler<Integer> {
 
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/StringConfigEntryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/StringConfigEntryHandler.java
@@ -2,9 +2,8 @@
 
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;
-import net.modificationstation.stationapi.api.config.CharacterUtils;
-import net.modificationstation.stationapi.api.config.HasDrawable;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
+import net.modificationstation.stationapi.api.config.HasDrawable;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
 import net.modificationstation.stationapi.impl.config.screen.widget.ExtensibleTextFieldWidget;
 import org.jetbrains.annotations.NotNull;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/StringListConfigEntryHandler.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/object/entry/StringListConfigEntryHandler.java
@@ -3,14 +3,11 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.Screen;
-import net.modificationstation.stationapi.api.config.CharacterUtils;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.impl.config.screen.BaseListScreenBuilder;
 import net.modificationstation.stationapi.impl.config.screen.StringListScreenBuilder;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.lang.reflect.*;
-import java.util.*;
 
 public class StringListConfigEntryHandler extends BaseListConfigEntryHandler<String> {
 
@@ -33,7 +30,7 @@ public BaseListScreenBuilder<String> createListScreen(Screen parent) {
 
     @Override
     public String strToVal(String str) {
-        return null;
+        return str;
     }
 
     @Override
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/BaseListScreenBuilder.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/BaseListScreenBuilder.java
@@ -13,7 +13,6 @@
 import net.modificationstation.stationapi.impl.config.screen.widget.TexturedButtonWidget;
 import net.modificationstation.stationapi.mixin.config.client.EntryListWidgetAccessor;
 import org.lwjgl.input.Mouse;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.awt.*;
 import java.util.List;
@@ -121,7 +120,7 @@ public void render(int mouseX, int mouseY, float delta) {
         textRenderer.drawWithShadow(configEntry.description, (width / 2) - (textRenderer.getWidth(configEntry.description) / 2), 18, 8421504);
 
         ConfigEntry maxLength = configEntry.parentField.getAnnotation(ConfigEntry.class);
-        if (maxLength.minArrayLength() < textFieldWidgets.size() || maxLength.maxArrayLength() > textFieldWidgets.size()) {
+        if (textFieldWidgets.size() < maxLength.minArrayLength() || textFieldWidgets.size() > maxLength.maxArrayLength()) {
             String text = "Array is not the right size! (" + textFieldWidgets.size() + " outside of " + maxLength.minArrayLength() + " / " + maxLength.maxArrayLength() + ")";
             textRenderer.drawWithShadow(text, (width / 2) - (textRenderer.getWidth(text) / 2), 34, CharacterUtils.getIntFromColour(Color.RED));
         }
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/FloatListScreenBuilder.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/FloatListScreenBuilder.java
@@ -3,7 +3,6 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.util.*;
 import java.util.function.*;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/IntegerListScreenBuilder.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/IntegerListScreenBuilder.java
@@ -3,7 +3,6 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.util.*;
 import java.util.function.*;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/RootScreenBuilder.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/RootScreenBuilder.java
@@ -2,19 +2,15 @@
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
-import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.modificationstation.stationapi.api.config.ConfigRoot;
 import net.modificationstation.stationapi.impl.config.ConfigRootEntry;
 import net.modificationstation.stationapi.impl.config.EventStorage;
 import net.modificationstation.stationapi.impl.config.GCCore;
 import net.modificationstation.stationapi.impl.config.object.ConfigCategoryHandler;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.util.*;
-import java.util.function.*;
 
 public class RootScreenBuilder extends ScreenBuilder {
 
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/ScreenBuilder.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/ScreenBuilder.java
@@ -2,7 +2,6 @@
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
-import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -12,9 +11,9 @@
 import net.modificationstation.stationapi.api.config.CharacterUtils;
 import net.modificationstation.stationapi.api.config.ConfigEntryWithButton;
 import net.modificationstation.stationapi.api.config.HasDrawable;
-import net.modificationstation.stationapi.impl.config.object.ConfigHandlerBase;
 import net.modificationstation.stationapi.impl.config.object.ConfigCategoryHandler;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
+import net.modificationstation.stationapi.impl.config.object.ConfigHandlerBase;
 import net.modificationstation.stationapi.mixin.config.client.EntryListWidgetAccessor;
 import org.lwjgl.input.Mouse;
 
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/StringListScreenBuilder.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/impl/config/screen/StringListScreenBuilder.java
@@ -3,7 +3,6 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.modificationstation.stationapi.api.config.ConfigEntry;
 import net.modificationstation.stationapi.impl.config.object.ConfigEntryHandler;
-import uk.co.benjiweber.expressions.tuple.BiTuple;
 
 import java.util.*;
 import java.util.function.*;
diff --git a/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/mixin/config/client/ModMenuMixin.java b/glass-config-api-v3/src/main/java/net/modificationstation/stationapi/mixin/config/client/ModMenuMixin.java
@@ -3,8 +3,6 @@
 import com.google.common.collect.ImmutableMap;
 import io.github.prospector.modmenu.ModMenu;
 import net.minecraft.client.gui.screen.Screen;
-import net.modificationstation.stationapi.api.config.ConfigRoot;
-import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.impl.config.GCCore;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
