MidnightLib 0.4.4 - Some more fixes

Also opt-out Puzzle by default

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.11.7
 
 # Mod Properties
-	mod_version = 0.2.8
+	mod_version = 0.4.4
 	maven_group = eu.midnightdust
 	archives_base_name = midnightlib
 

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);
+        if (hiddenMods.contains("puzzle")) 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))
                     new AutoCommand(field, modid).register();
             }
         });

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

@@ -7,8 +7,6 @@ public class MidnightLibConfig extends MidnightConfig {
     @Comment 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;
-    @Entry // Change the texture of the background in MidnightConfig
-    public static String background_texture = "minecraft:textures/block/deepslate.png";
     @Comment 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/MixinEntryListWidget.java

@@ -1,23 +0,0 @@
-package eu.midnightdust.core.mixin;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import eu.midnightdust.core.config.MidnightLibConfig;
-import net.minecraft.client.gui.widget.EntryListWidget;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Locale;
-
-@Mixin(EntryListWidget.class)
-public abstract class MixinEntryListWidget {
-
-    @Inject(at = @At(value = "INVOKE",target = "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderTexture(ILnet/minecraft/util/Identifier;)V",shift = At.Shift.AFTER), method = "render", cancellable = true)
-    private void custom_background(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (!MidnightLibConfig.background_texture.equals("") && this.getClass().toString().toLowerCase(Locale.ROOT).contains("midnight"))
-        RenderSystem.setShaderTexture(0, Identifier.tryParse(MidnightLibConfig.background_texture));
-    }
-}

src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java

@@ -25,7 +25,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"))
+        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")));
     }
 }

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

@@ -1,5 +1,6 @@
 package eu.midnightdust.core.screen;
 
+import eu.midnightdust.core.MidnightLibClient;
 import eu.midnightdust.lib.config.MidnightConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -31,19 +32,19 @@ 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) ->
+        MidnightConfig.configClass.forEach((modid, configClass) -> {
+            if (!MidnightLibClient.hiddenMods.contains(modid)) {
                 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)))));
+                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))));
+            }
+        });
         super.init();
     }
     @Override
     public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         this.renderBackground(matrices);
         this.list.render(matrices, mouseX, mouseY, delta);
-
-        int stringWidth = title.getString().length() + 47;
-        renderTooltip(matrices, title, width/2 - stringWidth, 27);
-        //drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
+        drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
         super.render(matrices, mouseX, mouseY, delta);
     }
     @Environment(EnvType.CLIENT)
@@ -56,7 +57,7 @@ public class MidnightConfigOverviewScreen extends Screen {
             textRenderer = minecraftClient.textRenderer;
         }
         @Override
-        public int getScrollbarPositionX() { return this.width -7; }
+        public int getScrollbarPositionX() {return this.width -7;}
 
         public void addButton(ClickableWidget button) {
             this.addEntry(OverviewButtonEntry.create(button));
@@ -65,26 +66,19 @@ public class MidnightConfigOverviewScreen extends Screen {
         public int getRowWidth() { return 400; }
     }
     public static class OverviewButtonEntry extends ElementListWidget.Entry<OverviewButtonEntry> {
-        private final List<ClickableWidget> buttons = new ArrayList<>();
+        private final ClickableWidget button;
+        private final List<ClickableWidget> buttonList = new ArrayList<>();
 
         private OverviewButtonEntry(ClickableWidget button) {
-            this.buttons.add(button);
-        }
-        public static OverviewButtonEntry create(ClickableWidget button) {
-            return new OverviewButtonEntry(button);
+            this.button = button;
+            this.buttonList.add(button);
         }
+        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) {
-            this.buttons.forEach((button) -> {
             button.y = y;
             button.render(matrices, mouseX, mouseY, tickDelta);
-            });
-        }
-        public List<? extends Element> children() {
-            return buttons;
-        }
-
-        public List<? extends Selectable> selectableChildren() {
-            return buttons;
         }
+        public List<? extends Element> children() {return buttonList;}
+        public List<? extends Selectable> selectableChildren() {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;
@@ -17,8 +14,9 @@ import java.net.URL;
 import java.util.*;
 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;
@@ -30,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

@@ -25,7 +25,7 @@ public class AutoCommand {
     public void register() {
         command = CommandManager.literal(modid);
         command();
-        LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").then(command);
+        LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
 
         CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(finalized));
     }

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

@@ -21,10 +21,12 @@ 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.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 
+import java.awt.Color;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -34,12 +36,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 v1.0.8 by TeamMidnightDust & Motschen
+/** MidnightConfig v2.1.0 by TeamMidnightDust & Motschen
  *  Single class config library - feel free to copy!
  *
  *  Based on https://github.com/Minenash/TinyConfig
@@ -49,6 +52,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<>();
 
@@ -64,6 +68,8 @@ public abstract class MidnightConfig {
         boolean inLimits = true;
         String id;
         TranslatableText name;
+        int index;
+        ClickableWidget colorButton;
     }
 
     public static final Map<String,Class<?>> configClass = new HashMap<>();
@@ -77,7 +83,7 @@ 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))
                 if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient(modid, field, info);
             if (field.isAnnotationPresent(Entry.class))
                 try {
@@ -106,9 +112,10 @@ public abstract class MidnightConfig {
 
         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 (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) {
+            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) {
@@ -138,8 +145,6 @@ 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);
@@ -154,9 +159,20 @@ public abstract class MidnightConfig {
             info.inLimits = inLimits;
             b.active = entries.stream().allMatch(e -> e.inLimits);
 
-            if (inLimits)
+            if (inLimits && info.field.getType() != List.class)
                 info.value = isNumber? value : s;
+            else if (inLimits) {
+                if (((List<String>) info.value).size() == info.index) ((List<String>) info.value).add("");
+                ((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(new LiteralText("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));
+                } catch (Exception ignored) {}
+            }
             return true;
         };
     }
@@ -176,7 +192,6 @@ public abstract class MidnightConfig {
     }
     @Environment(EnvType.CLIENT)
     private static class MidnightConfigScreen extends Screen {
-
         protected MidnightConfigScreen(Screen parent, String modid) {
             super(new TranslatableText(modid + ".midnightconfig." + "title"));
             this.parent = parent;
@@ -193,9 +208,9 @@ public abstract class MidnightConfig {
         @Override
         public void tick() {
             super.tick();
-            for (EntryInfo info : entries)
-                try { info.field.set(null, info.value); }
-                catch (IllegalAccessException ignored) {}
+            for (EntryInfo info : entries) {
+                try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
+            }
         }
         private void loadValues() {
             try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
@@ -206,8 +221,7 @@ public abstract class MidnightConfig {
                     try {
                         info.value = info.field.get(null);
                         info.tempValue = info.value.toString();
-                    } catch (IllegalAccessException ignored) {
-                    }
+                    } catch (IllegalAccessException ignored) {}
             }
         }
         @Override
@@ -237,9 +251,10 @@ public abstract class MidnightConfig {
             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 - 155, 0, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
+                    ButtonWidget resetButton = new ButtonWidget(width - 205, 0, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
                         info.value = info.defaultValue;
-                        info.tempValue = info.value.toString();
+                        info.tempValue = info.defaultValue.toString();
+                        info.index = 0;
                         double scrollAmount = list.getScrollAmount();
                         this.reload = true;
                         Objects.requireNonNull(client).setScreen(this);
@@ -249,17 +264,44 @@ 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 -> new TranslatableText(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-                        this.list.addButton(new ButtonWidget(width - 110, 0,100, 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);
+                    } else if (info.field.getType() == List.class) {
+                        if (!reload) info.index = 0;
+                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
+                        widget.setMaxLength(info.width);
+                        if (info.index < ((List<String>)info.value).size()) widget.setText((String.valueOf(((List<String>)info.value).get(info.index))));
+                        else widget.setText("");
+                        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 -> {
+                            ((List<String>)info.value).remove("");
+                            double scrollAmount = list.getScrollAmount();
+                            this.reload = true;
+                            info.index = info.index + 1;
+                            if (info.index > ((List<String>)info.value).size()) info.index = 0;
+                            Objects.requireNonNull(client).setScreen(this);
+                            list.setScrollAmount(scrollAmount);
+                        }));
+                        this.list.addButton(List.of(widget, resetButton, cycleButton), name);
                     } else if (info.widget != null) {
-                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, 100, 20, 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, name);
+                        if (info.field.getAnnotation(Entry.class).isColor()) {
+                            resetButton.setWidth(20);
+                            resetButton.setMessage(new LiteralText("R").formatted(Formatting.RED));
+                            ButtonWidget colorButton = new ButtonWidget(width - 185, 0, 20, 20, new LiteralText("⬛"), (button -> {}));
+                            try {colorButton.setMessage(new LiteralText("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));} catch (Exception ignored) {}
+                            info.colorButton = colorButton;
+                            this.list.addButton(List.of(widget, colorButton, resetButton), name);
+                        }
+                        else this.list.addButton(List.of(widget, resetButton), name);
                     } else {
-                        ButtonWidget dummy = new ButtonWidget(-10, 0, 0, 0, Text.of(""), null);
-                        this.list.addButton(dummy,dummy,name);
+                        this.list.addButton(List.of(),name);
                     }
                 }
             }
@@ -269,10 +311,7 @@ public abstract class MidnightConfig {
         public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
             this.renderBackground(matrices);
             this.list.render(matrices, mouseX, mouseY, delta);
-
-            int stringWidth = (int) (title.getString().length() * 2.75f);
-            renderTooltip(matrices, title, width/2 - stringWidth, 27);
-            //drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
+            drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
 
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
@@ -307,17 +346,15 @@ public abstract class MidnightConfig {
         @Override
         public int getScrollbarPositionX() { return this.width -7; }
 
-        public void addButton(ClickableWidget button, ClickableWidget resetButton, Text text) {
-            this.addEntry(ButtonEntry.create(button, text, resetButton));
+        public void addButton(List<ClickableWidget> buttons, Text text) {
+            this.addEntry(ButtonEntry.create(buttons, text));
         }
         @Override
         public int getRowWidth() { return 10000; }
         public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
             for (ButtonEntry buttonEntry : this.children()) {
-                for (ClickableWidget ClickableWidget : buttonEntry.buttons) {
-                    if (ClickableWidget.isMouseOver(mouseX, mouseY)) {
-                        return Optional.of(ClickableWidget);
-                    }
+                if (!buttonEntry.buttons.isEmpty() && buttonEntry.buttons.get(0).isMouseOver(mouseX, mouseY)) {
+                    return Optional.of(buttonEntry.buttons.get(0));
                 }
             }
             return Optional.empty();
@@ -325,50 +362,37 @@ public abstract class MidnightConfig {
     }
     public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
         private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        private final List<ClickableWidget> buttons = new ArrayList<>();
-        private final List<ClickableWidget> resetButtons = new ArrayList<>();
-        private final List<Text> texts = new ArrayList<>();
-        private final List<ClickableWidget> buttonsWithResetButtons = new ArrayList<>();
+        public final List<ClickableWidget> buttons;
+        private final Text text;
+        private final List<ClickableWidget> children = new ArrayList<>();
         public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
 
-        private ButtonEntry(ClickableWidget button, Text text, ClickableWidget resetButton) {
-            buttonsWithText.put(button,text);
-            this.buttons.add(button);
-            this.resetButtons.add(resetButton);
-            this.texts.add(text);
-            this.buttonsWithResetButtons.add(button);
-            this.buttonsWithResetButtons.add(resetButton);
+        private ButtonEntry(List<ClickableWidget> buttons, Text text) {
+            if (!buttons.isEmpty()) buttonsWithText.put(buttons.get(0),text);
+            this.buttons = buttons;
+            this.text = text;
+            children.addAll(buttons);
         }
-        public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget resetButton) {
-            return new ButtonEntry(button, text, resetButton);
+        public static ButtonEntry create(List<ClickableWidget> buttons, Text text) {
+            return new ButtonEntry(buttons, text);
         }
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            this.buttons.forEach(button -> {
-                button.y = y;
-                button.render(matrices, mouseX, mouseY, tickDelta);
-            });
-            this.texts.forEach(text -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF));
-            this.resetButtons.forEach((button) -> {
-                button.y = y;
-                button.render(matrices, mouseX, mouseY, tickDelta);
-            });
+            buttons.forEach(b -> { b.y = y; b.render(matrices, mouseX, mouseY, tickDelta); });
+            if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty()))
+                DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF);
         }
-        public List<? extends Element> children() {
-            return buttonsWithResetButtons;
+        public List<? extends Element> children() {return children;}
+        public List<? extends Selectable> selectableChildren() {return children;}
     }
-
-        public List<? extends Selectable> selectableChildren() {
-            return buttonsWithResetButtons;
-        }
-    }
-    @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 Comment {}
 
     public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {

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/resources/fabric.mod.json

@@ -32,7 +32,7 @@
   },
 
   "mixins": [
-    "midnightcore.mixins.json"
+    "midnightlib.mixins.json"
   ],
 
   "depends": {

src/main/resources/midnightlib.mixins.json

@@ -4,7 +4,6 @@
   "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinOptionsScreen",
-    "MixinEntryListWidget",
     "MixinPlayerEntityRenderer"
   ],
   "injectors": {