Better versioning scheme

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

build.gradle

@@ -1,18 +1,15 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
-minecraft {
-}
-
 repositories {
 	maven { url "https://maven.terraformersmc.com/releases" }
 	maven { url "https://jitpack.io" }
@@ -26,7 +23,7 @@ dependencies {
 
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
-	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
+	modCompileOnlyApi ("com.terraformersmc:modmenu:${project.mod_menu_version}")
 }
 
 processResources {
@@ -45,7 +42,7 @@ tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
 
 	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 16
+	it.options.release = 17
 }
 
 java {

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17.1
-	yarn_mappings=1.17.1+build.63
-	loader_version=0.11.7
+	minecraft_version=22w43a
+	yarn_mappings=22w43a+build.4
+	loader_version=0.14.10
 
 # Mod Properties
-	mod_version = 0.3.0
+	mod_version = 0.6.1+22w43a
 	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.41.0+1.17
-	mod_menu_version = 2.0.2
+	fabric_version=0.65.1+1.19.3
+	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))
+                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/mixin/MixinOptionsScreen.java

@@ -7,7 +7,6 @@ import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -25,7 +24,7 @@ public class MixinOptionsScreen extends Screen {
 
     @Inject(at = @At("HEAD"),method = "init")
     private void midnightlib$init(CallbackInfo ci) {
-        if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && FabricLoader.getInstance().isModLoaded("modmenu"))
-        this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(this)), new TranslatableText("midnightlib.overview.title")));
+        if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !FabricLoader.getInstance().isModLoaded("modmenu")))
+            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(this)), Text.translatable("midnightlib.overview.title")));
     }
 }

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.*;
 
@@ -18,7 +20,7 @@ import java.util.*;
 public class MidnightConfigOverviewScreen extends Screen {
 
     public MidnightConfigOverviewScreen(Screen parent) {
-        super(new TranslatableText( "midnightlib.overview.title"));
+        super(Text.translatable( "midnightlib.overview.title"));
         this.parent = parent;
     }
     private final Screen parent;
@@ -26,14 +28,19 @@ public class MidnightConfigOverviewScreen extends Screen {
 
     @Override
     protected void init() {
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
+        this.addDrawableChild(ButtonWidget.method_46430(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).method_46434(this.width / 2 - 100, this.height - 28, 200, 20).method_46431());
 
         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.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, new TranslatableText(modid +".midnightconfig.title"), (button) ->
-                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid)))));
+        List<String> sortedMods = new ArrayList<>(MidnightConfig.configClass.keySet());
+        Collections.sort(sortedMods);
+        sortedMods.forEach((modid) -> {
+            if (!MidnightLibClient.hiddenMods.contains(modid)) {
+                list.addButton(ButtonWidget.method_46430(Text.translatable(modid +".midnightconfig.title"), (button) ->
+                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))).method_46434(this.width / 2 - 100, this.height - 28, 200, 20).method_46431());
+            }
+        });
         super.init();
     }
     @Override
@@ -71,7 +78,7 @@ public class MidnightConfigOverviewScreen extends Screen {
         }
         public static OverviewButtonEntry create(ClickableWidget button) {return new OverviewButtonEntry(button);}
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            button.y = y;
+            button.method_46419(y);
             button.render(matrices, mouseX, mouseY, tickDelta);
         }
         public List<? extends Element> children() {return buttonList;}

src/main/java/eu/midnightdust/hats/web/HatLoader.java

@@ -4,9 +4,6 @@ import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import net.minecraft.client.MinecraftClient;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -19,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
 
 @SuppressWarnings("UnstableApiUsage")
 public class HatLoader {
-    public static final Logger logger = LogManager.getLogger("MidnightLib");
+    public static final System.Logger logger = System.getLogger("MidnightLib");
     private final static String HATS_URL = "https://raw.githubusercontent.com/TeamMidnightDust/MidnightHats/master/hats.json";
     public static final Type HAT_TYPE = new TypeToken<Map<UUID, PlayerHatData>>(){}.getType();
     public static Map<UUID, PlayerHatData> PLAYER_HATS;
@@ -31,19 +28,19 @@ public class HatLoader {
             try (Reader reader = new InputStreamReader(new URL(HATS_URL).openStream())) {
                 return GSON.<Map<UUID, PlayerHatData>>fromJson(reader, HAT_TYPE);
             } catch (MalformedURLException error) {
-                logger.log(Level.ERROR, "Unable to load player hats because of connection problems: " + error.getMessage());
+                logger.log(System.Logger.Level.ERROR, "Unable to load player hats because of connection problems: " + error.getMessage());
             } catch (IOException error) {
-                logger.log(Level.ERROR, "Unable to load player hats because of an I/O Exception: " + error.getMessage());
+                logger.log(System.Logger.Level.ERROR, "Unable to load player hats because of an I/O Exception: " + error.getMessage());
             }
 
             return null;
         }).thenAcceptAsync(playerData -> {
             if (playerData != null) {
                 PLAYER_HATS = playerData;
-                logger.log(Level.INFO, "Player hats successfully loaded!");
+                System.out.println("(MidnightLib) Player hats successfully loaded!");
             } else {
                 PLAYER_HATS = Collections.emptyMap();
-                logger.log(Level.WARN, "A problem with the database occurred, the hats could not be initialized.");
+                logger.log(System.Logger.Level.WARNING, "A problem with the database occurred, the hats could not be initialized.");
             }
         }, MinecraftClient.getInstance());
     }

src/main/java/eu/midnightdust/hats/witch/WitchHatFeatureRenderer.java

@@ -68,15 +68,14 @@ public class WitchHatFeatureRenderer<T extends LivingEntity, M extends EntityMod
         if (uuid.equals(MOTSCHEN)) {
             return MOTSCHEN_COLOR;
         } else if (HatLoader.PLAYER_HATS != null && HatLoader.PLAYER_HATS.containsKey(uuid)) {
-            switch (HatLoader.PLAYER_HATS.get(uuid).getHatType()) {
-                case "adopter": return ADOPTER_COLOR;
-                case "contributer": // old name
-                case "modder": return MODDER_COLOR;
-                case "friend": return FRIEND_COLOR;
-                case "donator": // old name
-                case "donor": return DONOR_COLOR;
-                case "social": return SOCIAL_COLOR;
-            }
+            return switch (HatLoader.PLAYER_HATS.get(uuid).getHatType()) {
+                case "adopter" -> ADOPTER_COLOR;
+                case "contributer", "modder" -> MODDER_COLOR;
+                case "friend" -> FRIEND_COLOR;
+                case "donator", "donor" -> DONOR_COLOR;
+                case "social" -> SOCIAL_COLOR;
+                default -> MidnightColorUtil.hex2Rgb(HatLoader.PLAYER_HATS.get(uuid).getHatType());
+            };
         }
         return null;
     }

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

@@ -4,10 +4,10 @@ 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.LiteralText;
+import net.minecraft.text.Text;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -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() {
@@ -73,16 +73,16 @@ public class AutoCommand {
             MidnightConfig.write(modid);
         }
         catch (Exception e) {
-            source.sendError(new LiteralText("Could not set "+entry.getName()+" to value "+value+": " + e));
+            source.sendError(Text.literal("Could not set "+entry.getName()+" to value "+value+": " + e));
             return 0;
         }
 
-        source.sendFeedback(new LiteralText("Successfully set " + entry.getName()+" to "+value), true);
+        source.sendFeedback(Text.literal("Successfully set " + entry.getName()+" to "+value), true);
         return 1;
     }
     private int getValue(ServerCommandSource source) {
         try {
-            source.sendFeedback(new LiteralText("The value of "+entry.getName()+" is "+entry.get(null)), false);
+            source.sendFeedback(Text.literal("The value of "+entry.getName()+" is "+entry.get(null)), false);
             return 1;
         }
         catch (IllegalAccessException ignored) {}

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,19 +13,18 @@ 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.text.LiteralText;
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
-import org.apache.logging.log4j.LogManager;
 
+import java.awt.Color;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -35,12 +34,13 @@ import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
+import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-/** MidnightConfig v2.0.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
@@ -50,6 +50,7 @@ import java.util.regex.Pattern;
 public abstract class MidnightConfig {
     private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
     private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
+    private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)");
 
     private static final List<EntryInfo> entries = new ArrayList<>();
 
@@ -58,14 +59,16 @@ public abstract class MidnightConfig {
         Object widget;
         int width;
         int max;
+        boolean centered;
         Map.Entry<TextFieldWidget,Text> error;
         Object defaultValue;
         Object value;
         String tempValue;
         boolean inLimits = true;
         String id;
-        TranslatableText name;
+        Text name;
         int index;
+        ClickableWidget colorButton;
     }
 
     public static final Map<String,Class<?>> configClass = new HashMap<>();
@@ -79,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))
+            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);
@@ -94,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)
@@ -107,21 +110,22 @@ public abstract class MidnightConfig {
         info.id = modid;
 
         if (e != null) {
-            if (!e.name().equals("")) info.name = new TranslatableText(e.name());
-            if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
+            if (!e.name().equals("")) info.name = Text.translatable(e.name());
+            if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, (int) e.min(), (int) e.max(), true);
+            else if (type == float.class) textField(info, Float::parseFloat, DECIMAL_ONLY, (float) e.min(), (float) e.max(), false);
             else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
             else if (type == String.class || type == List.class) {
                 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 -> new LiteralText((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));
                 }, func);
             } else if (type.isEnum()) {
                 List<?> values = Arrays.asList(field.getType().getEnumConstants());
-                Function<Object, Text> func = value -> new TranslatableText(modid + ".midnightconfig." + "enum." + type.getSimpleName() + "." + info.value.toString());
+                Function<Object, Text> func = value -> Text.translatable(modid + ".midnightconfig." + "enum." + type.getSimpleName() + "." + info.value.toString());
                 info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
                     int index = values.indexOf(info.value) + 1;
                     info.value = values.get(index >= values.size() ? 0 : index);
@@ -140,13 +144,11 @@ public abstract class MidnightConfig {
 
             Number value = 0;
             boolean inLimits = false;
-            System.out.println(((isNumber ^ s.isEmpty())));
-            System.out.println(!s.equals("-") && !s.equals("."));
             info.error = null;
             if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
                 value = f.apply(s);
                 inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
-                info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ?
+                info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, Text.literal(value.doubleValue() < min ?
                         "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
                         "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
             }
@@ -163,6 +165,13 @@ public abstract class MidnightConfig {
                 ((List<String>) info.value).set(info.index, Arrays.stream(info.tempValue.replace("[", "").replace("]", "").split(", ")).toList().get(0));
             }
 
+            if (info.field.getAnnotation(Entry.class).isColor()) {
+                if (!s.contains("#")) s = '#' + s;
+                if (!HEXADECIMAL_ONLY.matcher(s).matches()) return false;
+                try {
+                    info.colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));
+                } catch (Exception ignored) {}
+            }
             return true;
         };
     }
@@ -181,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(new TranslatableText(modid + ".midnightconfig." + "title"));
+            super(Text.translatable(modid + ".midnightconfig." + "title"));
             this.parent = parent;
             this.modid = modid;
             this.translationPrefix = modid + ".midnightconfig.";
         }
-        private final String translationPrefix;
-        private final Screen parent;
-        private final String modid;
-        private MidnightConfigListWidget list;
-        private boolean reload = false;
+        public final String translationPrefix;
+        public final Screen parent;
+        public final String modid;
+        public MidnightConfigListWidget list;
+        public boolean reload = false;
 
         // Real Time config update //
         @Override
@@ -201,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); }
 
@@ -215,16 +234,16 @@ public abstract class MidnightConfig {
             }
         }
         @Override
-        protected void init() {
+        public void init() {
             super.init();
             if (!reload) loadValues();
 
-            this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
+            this.addDrawableChild(ButtonWidget.method_46430(ScreenTexts.CANCEL, button -> {
                 loadValues();
                 Objects.requireNonNull(client).setScreen(parent);
-            }));
+            }).method_46434(this.width / 2 - 154, this.height - 28, 150, 20).method_46431());
 
-            ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
+            ButtonWidget done = this.addDrawableChild(ButtonWidget.method_46430(ScreenTexts.DONE, (button) -> {
                 for (EntryInfo info : entries)
                     if (info.id.equals(modid)) {
                         try {
@@ -233,15 +252,15 @@ public abstract class MidnightConfig {
                     }
                 write(modid);
                 Objects.requireNonNull(client).setScreen(parent);
-            }));
+            }).method_46434(this.width / 2 + 4, this.height - 28, 150, 20).method_46431());
 
             this.list = new MidnightConfigListWidget(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);
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
-                    TranslatableText name = Objects.requireNonNullElseGet(info.name, () -> new TranslatableText(translationPrefix + info.field.getName()));
-                    ButtonWidget resetButton = new ButtonWidget(width - 205, 0, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
+                    Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.field.getName()));
+                    ButtonWidget resetButton = ButtonWidget.method_46430(Text.translatable("Reset").formatted(Formatting.RED), (button -> {
                         info.value = info.defaultValue;
                         info.tempValue = info.defaultValue.toString();
                         info.index = 0;
@@ -249,12 +268,12 @@ public abstract class MidnightConfig {
                         this.reload = true;
                         Objects.requireNonNull(client).setScreen(this);
                         list.setScrollAmount(scrollAmount);
-                    }));
+                    })).method_46434(width - 205, 0, 40, 20).method_46431();
 
                     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 -> new TranslatableText(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-                        this.list.addButton(new ButtonWidget(width - 160, 0,150, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton, null,name);
+                        if (info.field.getType().isEnum()) widget.setValue(value -> Text.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
+                        this.list.addButton(List.of(ButtonWidget.method_46430(widget.getValue().apply(info.value), widget.getKey()).method_46434(width - 160, 0,150, 20).method_46431(),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);
@@ -264,9 +283,8 @@ public abstract class MidnightConfig {
                         Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
                         widget.setTextPredicate(processor);
                         resetButton.setWidth(20);
-                        resetButton.setMessage(new LiteralText("R").formatted(Formatting.RED));
-                        ButtonWidget cycleButton = new ButtonWidget(width - 185, 0, 20, 20, new LiteralText(String.valueOf(info.index)).formatted(Formatting.GOLD), (button -> {
-                            LogManager.getLogger("1").info(info.value);
+                        resetButton.setMessage(Text.literal("R").formatted(Formatting.RED));
+                        ButtonWidget cycleButton = ButtonWidget.method_46430(Text.literal(String.valueOf(info.index)).formatted(Formatting.GOLD), (button -> {
                             ((List<String>)info.value).remove("");
                             double scrollAmount = list.getScrollAmount();
                             this.reload = true;
@@ -274,19 +292,29 @@ public abstract class MidnightConfig {
                             if (info.index > ((List<String>)info.value).size()) info.index = 0;
                             Objects.requireNonNull(client).setScreen(this);
                             list.setScrollAmount(scrollAmount);
-                        }));
-                        this.list.addButton(widget, resetButton, cycleButton, name);
+                        })).method_46434(width - 185, 0, 20, 20).method_46431();
+                        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);
                         widget.setText(info.tempValue);
                         Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
                         widget.setTextPredicate(processor);
-                        this.list.addButton(widget, resetButton, null, name);
+                        if (info.field.getAnnotation(Entry.class).isColor()) {
+                            resetButton.setWidth(20);
+                            resetButton.setMessage(Text.literal("R").formatted(Formatting.RED));
+                            ButtonWidget colorButton = ButtonWidget.method_46430(Text.literal("⬛"), (button -> {})).method_46434(width - 185, 0, 20, 20).method_46431();
+                            try {colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));} catch (Exception ignored) {}
+                            info.colorButton = colorButton;
+                            colorButton.active = false;
+                            this.list.addButton(List.of(widget, resetButton, colorButton), name, info);
+                        }
+                        else this.list.addButton(List.of(widget, resetButton), name, info);
                     } else {
-                        this.list.addButton(null,null,null,name);
+                        this.list.addButton(List.of(),name, info);
                     }
                 }
+                updateResetButtons();
             }
 
         }
@@ -301,14 +329,14 @@ public abstract class MidnightConfig {
                     if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
                         ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
                         Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
-                        TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName());
+                        Text name = Text.translatable(this.translationPrefix + info.field.getName());
                         String key = translationPrefix + info.field.getName() + ".tooltip";
 
                         if (info.error != null && text.equals(name)) renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
                         else if (I18n.hasTranslation(key) && text.equals(name)) {
                             List<Text> list = new ArrayList<>();
                             for (String str : I18n.translate(key).split("\n"))
-                                list.add(new LiteralText(str));
+                                list.add(Text.literal(str));
                             renderTooltip(matrices, list, mouseX, mouseY);
                         }
                     }
@@ -329,15 +357,15 @@ public abstract class MidnightConfig {
         @Override
         public int getScrollbarPositionX() { return this.width -7; }
 
-        public void addButton(ClickableWidget button, ClickableWidget resetButton, ClickableWidget indexButton, Text text) {
-            this.addEntry(ButtonEntry.create(button, text, resetButton, indexButton));
+        public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) {
+            this.addEntry(ButtonEntry.create(buttons, text, info));
         }
         @Override
         public int getRowWidth() { return 10000; }
         public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
             for (ButtonEntry buttonEntry : this.children()) {
-                if (buttonEntry.button != null && buttonEntry.button.isMouseOver(mouseX, mouseY)) {
-                    return Optional.of(buttonEntry.button);
+                if (!buttonEntry.buttons.isEmpty() && buttonEntry.buttons.get(0).isMouseOver(mouseX, mouseY)) {
+                    return Optional.of(buttonEntry.buttons.get(0));
                 }
             }
             return Optional.empty();
@@ -345,54 +373,45 @@ public abstract class MidnightConfig {
     }
     public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
         private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        public final ClickableWidget button;
-        private final ClickableWidget resetButton;
-        private final ClickableWidget indexButton;
+        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(ClickableWidget button, Text text, ClickableWidget resetButton, ClickableWidget indexButton) {
-            buttonsWithText.put(button,text);
-            this.button = button;
-            this.resetButton = resetButton;
+        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.indexButton = indexButton;
-            if (button != null) children.add(button);
-            if (resetButton != null) children.add(resetButton);
-            if (indexButton != null) children.add(indexButton);
+            this.info = info;
+            children.addAll(buttons);
         }
-        public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget resetButton, ClickableWidget indexButton) {
-            return new ButtonEntry(button, text, resetButton, indexButton);
+        public static ButtonEntry create(List<ClickableWidget> buttons, Text text, EntryInfo info) {
+            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) {
-            if (button != null) {
-                button.y = y;
-                button.render(matrices, mouseX, mouseY, tickDelta);
+            buttons.forEach(b -> { b.method_46419(y); b.render(matrices, mouseX, mouseY, tickDelta); });
+            if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
+                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);
             }
-            if (resetButton != null) {
-                resetButton.y = y;
-                resetButton.render(matrices, mouseX, mouseY, tickDelta);
-            }
-            if (indexButton != null) {
-                indexButton.y = y;
-                indexButton.render(matrices, mouseX, mouseY, tickDelta);
-            }
-            if (text != null && (!text.getString().contains("spacer") || button != null))
-            DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF);
         }
         public List<? extends Element> children() {return children;}
         public List<? extends Selectable> selectableChildren() {return children;}
     }
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface Entry {
+    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Entry {
         int width() default 100;
         double min() default Double.MIN_NORMAL;
         double max() default Double.MAX_VALUE;
         String name() default "";
+        boolean isColor() default false;
+    }
+    @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 Hidden {}
+    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {
+        boolean centered() default false;
     }
-    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {}
 
     public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
         public boolean shouldSkipClass(Class<?> clazz) { return false; }
@@ -400,4 +419,4 @@ public abstract class MidnightConfig {
             return fieldAttributes.getAnnotation(Entry.class) == null;
         }
     }
-}
+}

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

@@ -1,5 +1,7 @@
 package eu.midnightdust.lib.config;
 
+import java.util.List;
+
 /** MidnightConfig documentation & examples:
  * Thanks for choosing MidnightConfig - the fancy, tiny and lightweight config library.
  * If you want to use the lib in your mod, here are some examples and hints:
@@ -12,13 +14,15 @@ public class MidnightConfigExample extends MidnightConfig {
     @Entry public static int fabric = 16777215;                 // Example for a int option
     @Entry public static double world = 1.4D;                   // Example for a double option
     @Entry public static boolean showInfo = true;               // Example for a boolean option
-    @Entry public static String name = "Hi";                    // Example for a string option
+    @Entry public static String name = "Hello World!";                    // Example for a string option
     @Entry public static TestEnum testEnum = TestEnum.FABRIC;   // Example for a enum option
-    public static enum TestEnum {                               // Enums allow the user to cycle through predefined options
+    public enum TestEnum {                               // Enums allow the user to cycle through predefined options
         QUILT, FABRIC
     }
-    @Entry(min=10,max=30) public static int hello = 15675965;   // - The entered number has to be larger than 10 and smaller than 30
-
+    @Entry(min=69,max=420) public static int hello = 420;   // - The entered number has to be larger than 69 and smaller than 420
+    @Entry(width = 7, min = 7, isColor = true, name = "I am a color!") public static String titleColor = "#ffffff"; // The isColor property adds a preview box for a hexadecimal color
+    @Entry(name = "I am an array list!") public static List<String> arrayList = List.of("String1", "String2"); // Array String Lists are also supported
+    // The name field can be used to specify a custom translation string or plain text
 
     public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored
 
@@ -27,9 +31,9 @@ public class MidnightConfigExample extends MidnightConfig {
     {
 	    "modid.midnightconfig.title":"I am a title",        // "*.midnightconfig.title" defines the title of the screen
 	    "modid.midnightconfig.text1":"I am a comment *u*",  // Translation for the comment "text1" defined in the example config
-	    "modid.midnightconfig.name":"Pet Name",             // Translation for the field "name" defined in the example config
+	    "modid.midnightconfig.name":"I am a string!",             // Translation for the field "name" defined in the example config
 
-	    "modid.midnightconfig.name.tooltip":"Name your Pet! \n I am a new line uwu",
+	    "modid.midnightconfig.name.tooltip":"uwu \n I am a new line",
 	    // When hovering over the option "showInfo",
 	    // this text will appear as a tooltip.
 	    // "\n" inserts a line break.

src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java

@@ -10,15 +10,14 @@ public class MidnightColorUtil {
     }
 
     /**
-     * @credit https://stackoverflow.com/questions/4129666/how-to-convert-hex-to-rgb-using-java
-     * @param colorStr e.g. "FFFFFF"
+     * @param colorStr e.g. "FFFFFF" or "#FFFFFF"
      * @return Color as RGB
      */
     public static Color hex2Rgb(String colorStr) {
-        return new Color(
-                Integer.valueOf( colorStr.substring( 0, 2 ), 16 ),
-                Integer.valueOf( colorStr.substring( 2, 4 ), 16 ),
-                Integer.valueOf( colorStr.substring( 4, 6 ), 16 ));
+        try {
+            return Color.decode("#" + colorStr.replace("#", ""));
+        } catch (Exception ignored) {}
+        return Color.BLACK;
     }
 
     public static Color radialRainbow(float saturation, float brightness) {

src/main/java/eu/midnightdust/lib/util/render/entity/EmissiveOverlayRenderer.java

@@ -1,20 +0,0 @@
-package eu.midnightdust.lib.util.render.entity;
-
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.model.EntityModel;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.Identifier;
-
-public class EmissiveOverlayRenderer<T extends LivingEntity> extends EyesFeatureRenderer<T, EntityModel<T>> {
-    private final RenderLayer SKIN;
-
-    public EmissiveOverlayRenderer(FeatureRendererContext<T, EntityModel<T>> featureRendererContext, Identifier texture) {
-        super(featureRendererContext);
-        SKIN = RenderLayer.getEyes(texture);
-    }
-    public RenderLayer getEyesTexture() {
-        return SKIN;
-    }
-}

src/main/java/eu/midnightdust/lib/util/screen/TexturedOverlayButtonWidget.java

@@ -32,8 +32,8 @@ public class TexturedOverlayButtonWidget extends TexturedButtonWidget {
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.enableDepthTest();
-        this.drawTexture(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
-        this.drawTexture(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+        this.drawTexture(matrices, this.method_46426(), this.method_46427(), 0, 46 + i * 20, this.width / 2, this.height);
+        this.drawTexture(matrices, this.method_46426() + this.width / 2, this.method_46427(), 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
 
         super.renderButton(matrices, mouseX, mouseY, delta);
     }

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": {