MidnightLib 0.6.1 - Fix reset button for color fields

- Fix reset button never being inactive for color config options
- Always make color button non-interactive

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=22w19a
+	minecraft_version=1.19-rc2
-	yarn_mappings=22w19a+build.1
+	yarn_mappings=1.19-rc2+build.1
-	loader_version=0.14.5
+	loader_version=0.14.6
 
 # Mod Properties
-	mod_version = 0.4.1
+	mod_version = 0.6.1
 	maven_group = eu.midnightdust
 	archives_base_name = midnightlib
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.52.3+1.19
+	fabric_version=0.55.1+1.19
-	mod_menu_version = 2.0.2
+	mod_menu_version = 4.0.0-beta.4

src/main/java/eu/midnightdust/core/MidnightLibClient.java

@@ -9,13 +9,18 @@ import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MidnightLibClient implements ClientModInitializer {
+    public static List<String> hiddenMods = new ArrayList<>();
 
     public static final String MOD_ID = "midnightlib";
 
     @Override
     public void onInitializeClient() {
         MidnightConfig.init("midnightlib", MidnightLibConfig.class);
+        hiddenMods.add("puzzle");
 
         EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
         if (MidnightLibConfig.special_hats) HatLoader.init();

src/main/java/eu/midnightdust/core/MidnightLibServer.java

@@ -12,7 +12,7 @@ public class MidnightLibServer implements DedicatedServerModInitializer {
     public void onInitializeServer() {
         MidnightConfig.configClass.forEach((modid, config) -> {
             for (Field field : config.getFields()) {
-                if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class))
+                if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class) && !field.isAnnotationPresent(MidnightConfig.Hidden.class))
                     new AutoCommand(field, modid).register();
             }
         });

src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java

@@ -4,10 +4,10 @@ import eu.midnightdust.lib.config.MidnightConfig;
 import net.fabricmc.loader.api.FabricLoader;
 
 public class MidnightLibConfig extends MidnightConfig {
-    @Comment public static Comment midnightlib_description;
+    @Comment(centered = true) public static Comment midnightlib_description;
     @Entry // Enable or disable the MidnightConfig overview screen button
     public static ConfigButton config_screen_list = FabricLoader.getInstance().isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
-    @Comment public static Comment midnighthats_description;
+    @Comment(centered = true) public static Comment midnighthats_description;
     @Entry // Enable or disable hats for contributors, friends and donors.
     public static boolean special_hats = true;
 

src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java

@@ -1,5 +1,7 @@
 package eu.midnightdust.core.screen;
 
+import eu.midnightdust.core.MidnightLibClient;
+import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.lib.config.MidnightConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -8,9 +10,9 @@ import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.*;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.*;
 import java.util.*;
 
@@ -31,9 +33,14 @@ public class MidnightConfigOverviewScreen extends Screen {
         this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
         if (this.client != null && this.client.world != null) this.list.setRenderBackground(false);
         this.addSelectableChild(this.list);
-        MidnightConfig.configClass.forEach((modid, configClass) ->
+        List<String> sortedMods = new ArrayList<>(MidnightConfig.configClass.keySet());
+        Collections.sort(sortedMods);
+        sortedMods.forEach((modid) -> {
+            if (!MidnightLibClient.hiddenMods.contains(modid)) {
                 list.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, Text.translatable(modid +".midnightconfig.title"), (button) ->
-                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid)))));
+                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))));
+            }
+        });
         super.init();
     }
     @Override

src/main/java/eu/midnightdust/lib/config/AutoCommand.java

@@ -4,7 +4,7 @@ import com.mojang.brigadier.arguments.DoubleArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
@@ -27,7 +27,7 @@ public class AutoCommand {
         command();
         LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
 
-        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(finalized));
+        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, registrationEnvironment) -> dispatcher.register(finalized));
     }
 
     private void command() {

src/main/java/eu/midnightdust/lib/config/AutoModMenu.java

@@ -2,12 +2,14 @@ package eu.midnightdust.lib.config;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
+import eu.midnightdust.core.MidnightLibClient;
 import eu.midnightdust.core.config.MidnightLibConfig;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class AutoModMenu implements ModMenuApi {
+
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
         return parent -> MidnightLibConfig.getScreen(parent,"midnightlib");
@@ -16,7 +18,11 @@ public class AutoModMenu implements ModMenuApi {
     @Override
     public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
         HashMap<String, ConfigScreenFactory<?>> map = new HashMap<>();
-        MidnightConfig.configClass.forEach((modid, cClass) -> map.put(modid, parent -> MidnightConfig.getScreen(parent, modid)));
+        MidnightConfig.configClass.forEach((modid, cClass) -> {
+                    if (!MidnightLibClient.hiddenMods.contains(modid))
+                        map.put(modid, parent -> MidnightConfig.getScreen(parent, modid));
+                }
+        );
         return map;
     }
-}
+}

src/main/java/eu/midnightdust/lib/config/MidnightConfig.java

@@ -13,13 +13,13 @@ import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.ElementListWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -40,7 +40,7 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-/** MidnightConfig v2.1.0 by TeamMidnightDust & Motschen
+/** MidnightConfig v2.2.0 by TeamMidnightDust & Motschen
  *  Single class config library - feel free to copy!
  *
  *  Based on https://github.com/Minenash/TinyConfig
@@ -59,6 +59,7 @@ public abstract class MidnightConfig {
         Object widget;
         int width;
         int max;
+        boolean centered;
         Map.Entry<TextFieldWidget,Text> error;
         Object defaultValue;
         Object value;
@@ -81,8 +82,9 @@ public abstract class MidnightConfig {
 
         for (Field field : config.getFields()) {
             EntryInfo info = new EntryInfo();
-            if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class))
+            if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class))
                 if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient(modid, field, info);
+            if (field.isAnnotationPresent(Comment.class)) info.centered = field.getAnnotation(Comment.class).centered();
             if (field.isAnnotationPresent(Entry.class))
                 try {
                     info.defaultValue = field.get(null);
@@ -96,8 +98,7 @@ public abstract class MidnightConfig {
                 try {
                     info.value = info.field.get(null);
                     info.tempValue = info.value.toString();
-                } catch (IllegalAccessException ignored) {
+                } catch (IllegalAccessException ignored) {}
-                }
         }
     }
     @Environment(EnvType.CLIENT)
@@ -117,7 +118,7 @@ public abstract class MidnightConfig {
                 info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
                 textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true);
             } else if (type == boolean.class) {
-                Function<Object, Text> func = value -> Text.literal((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
+                Function<Object, Text> func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
                 info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
                     info.value = !(Boolean) info.value;
                     button.setMessage(func.apply(info.value));
@@ -189,18 +190,18 @@ public abstract class MidnightConfig {
         return new MidnightConfigScreen(parent, modid);
     }
     @Environment(EnvType.CLIENT)
-    private static class MidnightConfigScreen extends Screen {
+    public static class MidnightConfigScreen extends Screen {
         protected MidnightConfigScreen(Screen parent, String modid) {
             super(Text.translatable(modid + ".midnightconfig." + "title"));
             this.parent = parent;
             this.modid = modid;
             this.translationPrefix = modid + ".midnightconfig.";
         }
-        private final String translationPrefix;
+        public final String translationPrefix;
-        private final Screen parent;
+        public final Screen parent;
-        private final String modid;
+        public final String modid;
-        private MidnightConfigListWidget list;
+        public MidnightConfigListWidget list;
-        private boolean reload = false;
+        public boolean reload = false;
 
         // Real Time config update //
         @Override
@@ -209,8 +210,18 @@ public abstract class MidnightConfig {
             for (EntryInfo info : entries) {
                 try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
             }
+            updateResetButtons();
         }
-        private void loadValues() {
+        public void updateResetButtons() {
+            if (this.list != null) {
+                for (ButtonEntry entry : this.list.children()) {
+                    if (entry.buttons != null && entry.buttons.size() > 1 && entry.buttons.get(1) instanceof ButtonWidget button) {
+                        button.active = !Objects.equals(entry.info.value.toString(), entry.info.defaultValue.toString());
+                    }
+                }
+            }
+        }
+        public void loadValues() {
             try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
             catch (Exception e) { write(modid); }
 
@@ -223,7 +234,7 @@ public abstract class MidnightConfig {
             }
         }
         @Override
-        protected void init() {
+        public void init() {
             super.init();
             if (!reload) loadValues();
 
@@ -262,7 +273,7 @@ public abstract class MidnightConfig {
                     if (info.widget instanceof Map.Entry) {
                         Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
                         if (info.field.getType().isEnum()) widget.setValue(value -> Text.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-                        this.list.addButton(List.of(new ButtonWidget(width - 160, 0,150, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton), name);
+                        this.list.addButton(List.of(new ButtonWidget(width - 160, 0,150, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton), name, info);
                     } else if (info.field.getType() == List.class) {
                         if (!reload) info.index = 0;
                         TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
@@ -282,7 +293,7 @@ public abstract class MidnightConfig {
                             Objects.requireNonNull(client).setScreen(this);
                             list.setScrollAmount(scrollAmount);
                         }));
-                        this.list.addButton(List.of(widget, resetButton, cycleButton), name);
+                        this.list.addButton(List.of(widget, resetButton, cycleButton), name, info);
                     } else if (info.widget != null) {
                         TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
                         widget.setMaxLength(info.width);
@@ -295,13 +306,15 @@ public abstract class MidnightConfig {
                             ButtonWidget colorButton = new ButtonWidget(width - 185, 0, 20, 20, Text.literal("⬛"), (button -> {}));
                             try {colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));} catch (Exception ignored) {}
                             info.colorButton = colorButton;
-                            this.list.addButton(List.of(widget, colorButton, resetButton), name);
+                            colorButton.active = false;
+                            this.list.addButton(List.of(widget, resetButton, colorButton), name, info);
                         }
-                        else this.list.addButton(List.of(widget, resetButton), name);
+                        else this.list.addButton(List.of(widget, resetButton), name, info);
                     } else {
-                        this.list.addButton(List.of(),name);
+                        this.list.addButton(List.of(),name, info);
                     }
                 }
+                updateResetButtons();
             }
 
         }
@@ -344,8 +357,8 @@ public abstract class MidnightConfig {
         @Override
         public int getScrollbarPositionX() { return this.width -7; }
 
-        public void addButton(List<ClickableWidget> buttons, Text text) {
+        public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) {
-            this.addEntry(ButtonEntry.create(buttons, text));
+            this.addEntry(ButtonEntry.create(buttons, text, info));
         }
         @Override
         public int getRowWidth() { return 10000; }
@@ -362,22 +375,26 @@ public abstract class MidnightConfig {
         private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
         public final List<ClickableWidget> buttons;
         private final Text text;
+        public final EntryInfo info;
         private final List<ClickableWidget> children = new ArrayList<>();
         public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
 
-        private ButtonEntry(List<ClickableWidget> buttons, Text text) {
+        private ButtonEntry(List<ClickableWidget> buttons, Text text, EntryInfo info) {
             if (!buttons.isEmpty()) buttonsWithText.put(buttons.get(0),text);
             this.buttons = buttons;
             this.text = text;
+            this.info = info;
             children.addAll(buttons);
         }
-        public static ButtonEntry create(List<ClickableWidget> buttons, Text text) {
+        public static ButtonEntry create(List<ClickableWidget> buttons, Text text, EntryInfo info) {
-            return new ButtonEntry(buttons, text);
+            return new ButtonEntry(buttons, text, info);
         }
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             buttons.forEach(b -> { b.y = y; b.render(matrices, mouseX, mouseY, tickDelta); });
-            if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty()))
+            if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
-                DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF);
+                if (info.centered) textRenderer.drawWithShadow(matrices, text, MinecraftClient.getInstance().getWindow().getScaledWidth() / 2f - (textRenderer.getWidth(text) / 2f), y + 5, 0xFFFFFF);
+                else DrawableHelper.drawTextWithShadow(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
+            }
         }
         public List<? extends Element> children() {return children;}
         public List<? extends Selectable> selectableChildren() {return children;}
@@ -391,7 +408,10 @@ public abstract class MidnightConfig {
     }
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {}
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Server {}
-    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {}
+    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Hidden {}
+    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {
+        boolean centered() default false;
+    }
 
     public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
         public boolean shouldSkipClass(Class<?> clazz) { return false; }

src/main/resources/assets/midnightlib/lang/uk_ua.json

@@ -0,0 +1,17 @@
+{
+	"midnightlib.overview.title":"Огляд MidnightConfig",
+	"midnightlib.midnightconfig.title":"Конфігурація MidnightLib",
+	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
+	"midnightlib.midnightconfig.config_screen_list":"Увімкнути список екрана конфігурації",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aTrue",
+	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalse",
+	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
+	"midnightlib.midnightconfig.background_texture":"Текстура фону екрана конфігурації",
+	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
+	"midnightlib.midnightconfig.special_hats":"Увімкнути капелюхи спонсорів",
+	"midnightlib.modrinth":"Modrinth",
+	"midnightlib.curseforge":"CurseForge",
+	"midnightlib.wiki":"Вікі",
+	"modmenu.descriptionTranslation.midnightlib": "Загальна бібліотека для модів команди MidnightDust.\nНадає конфігураційний API, автоматичну інтеграцію з іншими модами, загальні утиліти та косметику.",
+	"modmenu.summaryTranslation.midnightlib": "Загальна бібліотека для модів команди MidnightDust."
+}

src/main/resources/fabric.mod.json

@@ -32,13 +32,9 @@
   },
 
   "mixins": [
-    "midnightcore.mixins.json"
+    "midnightlib.mixins.json"
   ],
 
-  "depends": {
-    "fabric-renderer-registries-v1": "*"
-  },
-
   "custom": {
     "modmenu": {
       "links": {