Better versioning scheme

Port to 22w43a
MidnightLib 0.6.1 - Fix reset button for color fields
2025-12-15 17:05:09 +01:00 · 2022-10-27 20:40:20 +02:00 · 2022-10-27 19:57:41 +02:00 · 2022-09-21 20:52:56 +02:00 · 2022-08-22 18:42:48 +02:00 · 2022-08-16 12:43:56 +02:00
46 changed files with 710 additions and 800 deletions
--- a/build.gradle
+++ b/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 {
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G

 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17-pre1
-    yarn_mappings=1.17-pre1+build.4
-    loader_version=0.11.3
+	minecraft_version=22w43a
+	yarn_mappings=22w43a+build.4
+	loader_version=0.14.10

 # Mod Properties
-	mod_version = 0.2.2
+	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.34.8+1.17
-	mod_menu_version = 2.0.0-mnd
+	fabric_version=0.65.1+1.19.3
+	mod_menu_version = 4.0.0-beta.4
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/269
+++ b/269
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
--- a/src/main/java/eu/midnightdust/core/MidnightLibClient.java
+++ b/src/main/java/eu/midnightdust/core/MidnightLibClient.java
@@ -1,31 +1,31 @@
 package eu.midnightdust.core;

-import eu.midnightdust.hats.bunny.BunnyEarsFeatureRenderer;
-import eu.midnightdust.hats.christmas.ChristmasHatFeatureRenderer;
 import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.hats.tater.TinyPotatoFeatureRenderer;
 import eu.midnightdust.hats.web.HatLoader;
 import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
 import eu.midnightdust.lib.config.MidnightConfig;
+import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityModelLayerRegistry;
+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;

-@SuppressWarnings({"deprecation", "UnstableApiUsage"})
 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);
-        MidnightConfig.useTooltipForTitle = MidnightLibConfig.titleStyle.equals(MidnightLibConfig.TitleStyle.TOOLTIP);
+        hiddenMods.add("puzzle");

-        EntityModelLayerRegistry.registerModelLayer(BunnyEarsFeatureRenderer.RABBIT_EARS_MODEL_LAYER, BunnyEarsFeatureRenderer::getTexturedModelData);
-        EntityModelLayerRegistry.registerModelLayer(ChristmasHatFeatureRenderer.CHRISTMAS_HAT_MODEL_LAYER, ChristmasHatFeatureRenderer::getTexturedModelData);
-        EntityModelLayerRegistry.registerModelLayer(TinyPotatoFeatureRenderer.TINY_POTATO_MODEL_LAYER, TinyPotatoFeatureRenderer::getTexturedModelData);
        EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
-        if (MidnightLibConfig.special_hats) {
-            HatLoader.init();
-        }
+        if (MidnightLibConfig.special_hats) HatLoader.init();
+        ClientTickEvents.END_CLIENT_TICK.register(
+                client -> MidnightColorUtil.tick()
+        );
    }
 }
--- a/src/main/java/eu/midnightdust/core/MidnightLibServer.java
+++ b/src/main/java/eu/midnightdust/core/MidnightLibServer.java
@@ -0,0 +1,20 @@
+package eu.midnightdust.core;
+
+import eu.midnightdust.lib.config.AutoCommand;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.fabricmc.api.DedicatedServerModInitializer;
+
+import java.lang.reflect.Field;
+
+public class MidnightLibServer implements DedicatedServerModInitializer {
+
+    @Override
+    public void onInitializeServer() {
+        MidnightConfig.configClass.forEach((modid, config) -> {
+            for (Field field : config.getFields()) {
+                if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class) && !field.isAnnotationPresent(MidnightConfig.Hidden.class))
+                    new AutoCommand(field, modid).register();
+            }
+        });
+    }
+}
--- a/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java
+++ b/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java
@@ -4,18 +4,14 @@ 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 boolean config_screen_list = !FabricLoader.getInstance().isModLoaded("modmenu");
-    @Entry // Change the style of the title in MidnightConfig
-    public static TitleStyle titleStyle = MidnightConfig.useTooltipForTitle ? TitleStyle.TOOLTIP : TitleStyle.TEXT;
-    @Comment public static Comment midnighthats_description;
-    @Entry // Enable or disable event hats
-    public static boolean event_hats = true;
+    public static ConfigButton config_screen_list = FabricLoader.getInstance().isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
+    @Comment(centered = true) public static Comment midnighthats_description;
    @Entry // Enable or disable hats for contributors, friends and donors.
    public static boolean special_hats = true;

-    public enum TitleStyle {
-        TEXT,TOOLTIP
+    public enum ConfigButton {
+        TRUE,FALSE,MODMENU
    }
 }
--- a/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java
+++ b/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java
@@ -2,11 +2,11 @@ package eu.midnightdust.core.mixin;

 import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.core.screen.MidnightConfigOverviewScreen;
+import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
-import net.minecraft.client.gui.widget.TexturedButtonWidget;
 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;
@@ -24,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)
-        this.addDrawableChild(new TexturedButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).openScreen(new MidnightConfigOverviewScreen(this)), new TranslatableText("narrator.button.midnightlib")));
+        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")));
    }
 }
--- a/src/main/java/eu/midnightdust/core/mixin/MixinPlayerEntityRenderer.java
+++ b/src/main/java/eu/midnightdust/core/mixin/MixinPlayerEntityRenderer.java
@@ -1,8 +1,5 @@
-package eu.midnightdust.hats.mixin;
+package eu.midnightdust.core.mixin;

-import eu.midnightdust.hats.bunny.BunnyEarsFeatureRenderer;
-import eu.midnightdust.hats.christmas.ChristmasHatFeatureRenderer;
-import eu.midnightdust.hats.tater.TinyPotatoFeatureRenderer;
 import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.entity.EntityRendererFactory;
@@ -15,16 +12,13 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(PlayerEntityRenderer.class)
-public abstract class PlayerEntityRendererMixin extends LivingEntityRenderer<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>> {
-    public PlayerEntityRendererMixin(EntityRendererFactory.Context ctx, PlayerEntityModel<AbstractClientPlayerEntity> model, float shadowSize) {
+public abstract class MixinPlayerEntityRenderer extends LivingEntityRenderer<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>> {
+    public MixinPlayerEntityRenderer(EntityRendererFactory.Context ctx, PlayerEntityModel<AbstractClientPlayerEntity> model, float shadowSize) {
        super(ctx, model, shadowSize);
    }

    @Inject(at = @At("TAIL"), method = "<init>")
    public void addFeatures(EntityRendererFactory.Context ctx, boolean slim, CallbackInfo ci) {
        this.addFeature(new WitchHatFeatureRenderer<>(this, ctx.getModelLoader()));
-        this.addFeature(new ChristmasHatFeatureRenderer<>(this, ctx.getModelLoader()));
-        this.addFeature(new BunnyEarsFeatureRenderer<>(this, ctx.getModelLoader()));
-        this.addFeature(new TinyPotatoFeatureRenderer<>(this, ctx.getModelLoader()));
    }
 }
--- a/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java
+++ b/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,18 @@ 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).openScreen(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).openScreen(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();
    }
@@ -41,10 +47,7 @@ public class MidnightConfigOverviewScreen extends Screen {
    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;
-        if (MidnightConfig.useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
-        else 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)
@@ -57,7 +60,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));
@@ -66,26 +69,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> method_37025() {
-            return buttons;
+            button.method_46419(y);
+            button.render(matrices, mouseX, mouseY, tickDelta);
        }
+        public List<? extends Element> children() {return buttonList;}
+        public List<? extends Selectable> selectableChildren() {return buttonList;}
    }
 }
--- a/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java
+++ b/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java
@@ -1,73 +0,0 @@
-package eu.midnightdust.hats.bunny;
-
-import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.hats.web.HatLoader;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.model.TexturedModelData;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.feature.FeatureRenderer;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.model.*;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.Identifier;
-
-import java.util.Calendar;
-import java.util.UUID;
-
-@Environment(EnvType.CLIENT)
-public class BunnyEarsFeatureRenderer<T extends LivingEntity, M extends EntityModel<T>> extends FeatureRenderer<T, M> {
-    private static final String MOD_ID = MidnightLibClient.MOD_ID;
-    public static final EntityModelLayer RABBIT_EARS_MODEL_LAYER = new EntityModelLayer(new Identifier("midnight-hats","bunny_ears"), "main");
-    private static final UUID MOTSCHEN = UUID.fromString("a44c2660-630f-478f-946a-e518669fcf0c");
-
-    private static final Identifier DEACTIVATED = new Identifier(MOD_ID,"textures/hats/empty.png");
-    private static final Identifier RABBIT = new Identifier("textures/entity/rabbit/brown.png");
-    private final BunnyEarsModel<T> bunnyEars;
-
-    public BunnyEarsFeatureRenderer(FeatureRendererContext<T, M> featureRendererContext, EntityModelLoader entityModelLoader) {
-        super(featureRendererContext);
-        this.bunnyEars = new BunnyEarsModel<>(entityModelLoader.getModelPart(RABBIT_EARS_MODEL_LAYER));
-    }
-
-    public static TexturedModelData getTexturedModelData() {
-        return TexturedModelData.of(BunnyEarsModel.getModelData(), 64, 32);
-    }
-
-    public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
-        {
-            AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity;
-            Identifier hat_type;
-            if (livingEntity != null) {
-
-                if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.APRIL && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) <= 4) {
-                    if (MidnightLibConfig.event_hats) {
-                        hat_type = RABBIT;
-                    }
-                    else hat_type = DEACTIVATED;
-                }else {
-                    hat_type = DEACTIVATED;
-                }
-            } else {
-                hat_type = DEACTIVATED;
-            }
-
-            if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && !abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) {
-                matrixStack.push();
-
-                ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
-                VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
-                this.bunnyEars.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
-
-                matrixStack.pop();
-            }
-        }
-    }
-}
--- a/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsModel.java
+++ b/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsModel.java
@@ -1,36 +0,0 @@
-package eu.midnightdust.hats.bunny;
-
-import net.minecraft.client.model.*;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.entity.model.SinglePartEntityModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-
-public class BunnyEarsModel<T extends LivingEntity> extends SinglePartEntityModel<T> {
-	private final ModelPart right_ear;
-
-	public BunnyEarsModel(ModelPart root) {
-		this.right_ear = root;
-		right_ear.setPivot(0.0F, -3.0F, -1.0F);
-	}
-	public static ModelData getModelData(){
-		ModelData modelData = new ModelData();
-		ModelPartData modelPartData = modelData.getRoot();
-		modelPartData.addChild("right_ear", ModelPartBuilder.create().uv(52, 0).cuboid(-2.5F, -9.0F, -1.0F, 2.0F, 5.0F, 1.0F), ModelTransform.NONE);
-		modelPartData.addChild("left_ear", ModelPartBuilder.create().uv(58, 0).mirrored().cuboid(0.5F, -9.0F, -1.0F, 2.0F, 5.0F, 1.0F), ModelTransform.NONE);
-		return modelData;
-	}
-
-	public ModelPart getPart() {
-		return this.right_ear;
-	}
-
-	@Override
-	public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) {
-	}
-
-	@Override
-	public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
-		right_ear.render(matrixStack, buffer, packedLight, packedOverlay);
-	}
-}
--- a/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatFeatureRenderer.java
+++ b/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatFeatureRenderer.java
@@ -1,75 +0,0 @@
-package eu.midnightdust.hats.christmas;
-
-import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.hats.web.HatLoader;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.model.TexturedModelData;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.feature.FeatureRenderer;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.model.EntityModel;
-import net.minecraft.client.render.entity.model.EntityModelLayer;
-import net.minecraft.client.render.entity.model.EntityModelLoader;
-import net.minecraft.client.render.entity.model.ModelWithHead;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.Identifier;
-
-import java.util.Calendar;
-import java.util.UUID;
-
-@Environment(EnvType.CLIENT)
-public class ChristmasHatFeatureRenderer<T extends LivingEntity, M extends EntityModel<T>> extends FeatureRenderer<T, M> {
-    private static final String MOD_ID = MidnightLibClient.MOD_ID;
-    public static final EntityModelLayer CHRISTMAS_HAT_MODEL_LAYER = new EntityModelLayer(new Identifier("midnight-hats","christmas_hat"), "main");
-    private static final UUID MOTSCHEN = UUID.fromString("a44c2660-630f-478f-946a-e518669fcf0c");
-
-    private static final Identifier DEACTIVATED = new Identifier(MOD_ID,"textures/hats/empty.png");
-    private static final Identifier CHRISTMAS = new Identifier(MOD_ID,"textures/hats/christmas.png");
-    private final ChristmasHatModel<T> christmasHat;
-
-    public ChristmasHatFeatureRenderer(FeatureRendererContext<T, M> featureRendererContext, EntityModelLoader entityModelLoader) {
-        super(featureRendererContext);
-        this.christmasHat = new ChristmasHatModel<>(entityModelLoader.getModelPart(CHRISTMAS_HAT_MODEL_LAYER));
-    }
-
-    public static TexturedModelData getTexturedModelData() {
-        return TexturedModelData.of(ChristmasHatModel.getModelData(), 64, 64);
-    }
-
-    public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
-        {
-            AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity;
-            Identifier hat_type;
-            if (livingEntity != null) {
-                if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.DECEMBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) >= 23 && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) <= 26) {
-                    if (MidnightLibConfig.event_hats) {
-                        hat_type = CHRISTMAS;
-                    }
-                    else hat_type = DEACTIVATED;
-                }else {
-                    hat_type = DEACTIVATED;
-                }
-            } else {
-                hat_type = DEACTIVATED;
-            }
-
-            if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && !abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) {
-                matrixStack.push();
-
-                ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
-                VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
-                this.christmasHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
-
-                matrixStack.pop();
-            }
-        }
-    }
-}
--- a/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatModel.java
+++ b/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatModel.java
@@ -1,56 +0,0 @@
-package eu.midnightdust.hats.christmas;
-
-import net.minecraft.client.model.*;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.entity.model.SinglePartEntityModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-
-public class ChristmasHatModel<T extends LivingEntity> extends SinglePartEntityModel<T> {
-	private final ModelPart headwear;
-
-	public ChristmasHatModel(ModelPart root) {
-		headwear = root;
-		root.setPivot(5.0F, -9.0F, -5.0F);
-
-		ModelPart bone = headwear.getChild("bone");
-		bone.setPivot(-8.5F, -0.1F, 1.5F);
-		setRotationAngle(bone, -0.0524F, 0.0F, 0.0349F);
-
-		ModelPart bone2 = bone.getChild("bone2");
-		bone2.setPivot(1.5F, -4.0F, 1.5F);
-		setRotationAngle(bone2, -0.1222F, 0.0F, 0.0698F);
-
-		ModelPart bone3 = bone2.getChild("bone3");
-		bone3.setPivot(1.5F, -4.0F, 1.5F);
-		setRotationAngle(bone3, -0.2618F, 0.0F, 0.1047F);
-	}
-    public static ModelData getModelData(){
-        ModelData modelData = new ModelData();
-        ModelPartData modelPartData = modelData.getRoot();
-        modelPartData.addChild("headwear", ModelPartBuilder.create().uv(0, 0).cuboid(-10.0F, -0.1F, 0.0F, 10.0F, 2.0F, 10.0F), ModelTransform.NONE);
-		ModelPartData modelPartData2 = modelPartData.addChild("bone", ModelPartBuilder.create().uv(0, 12).cuboid(0.0F, -4.0F, 0.0F, 7.0F, 4.0F, 7.0F), ModelTransform.rotation(-0.0524F, 0.0F, 0.0349F));
-		ModelPartData modelPartData3 = modelPartData2.addChild("bone2", ModelPartBuilder.create().uv(0, 23).cuboid(0.0F, -4.0F, 0.0F, 4.0F, 4.0F, 4.0F), ModelTransform.rotation(-0.1222F, 0.0F, 0.0698F));
-		modelPartData3.addChild("bone3", ModelPartBuilder.create().uv(21, 12).cuboid(0.0F, -3.0F, 0.0F, 3.0F, 3.0F, 3.0F), ModelTransform.rotation(-0.2618F, 0.0F, 0.1047F));
-
-        return modelData;
-    }
-    public ModelPart getPart() {
-        return this.headwear;
-    }
-
-	@Override
-	public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) {
-	}
-
-	@Override
-	public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
-		headwear.render(matrixStack, buffer, packedLight, packedOverlay);
-	}
-
-	public void setRotationAngle(ModelPart bone, float x, float y, float z) {
-		bone.pitch = x;
-		bone.yaw = y;
-		bone.roll = z;
-	}
-}
--- a/src/main/java/eu/midnightdust/hats/config/ModMenuIntegration.java
+++ b/src/main/java/eu/midnightdust/hats/config/ModMenuIntegration.java
@@ -1,16 +0,0 @@
-package eu.midnightdust.hats.config;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import eu.midnightdust.lib.config.MidnightConfig;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-@Environment(EnvType.CLIENT)
-public class ModMenuIntegration implements ModMenuApi {
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> MidnightConfig.getScreen(parent, "midnightlib");
-    }
-}
--- a/src/main/java/eu/midnightdust/hats/tater/TinyPotatoFeatureRenderer.java
+++ b/src/main/java/eu/midnightdust/hats/tater/TinyPotatoFeatureRenderer.java
@@ -1,75 +0,0 @@
-package eu.midnightdust.hats.tater;
-
-import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.hats.web.HatLoader;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.model.TexturedModelData;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.feature.FeatureRenderer;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.model.EntityModel;
-import net.minecraft.client.render.entity.model.EntityModelLayer;
-import net.minecraft.client.render.entity.model.EntityModelLoader;
-import net.minecraft.client.render.entity.model.ModelWithHead;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.Identifier;
-
-import java.util.Calendar;
-import java.util.UUID;
-
-@Environment(EnvType.CLIENT)
-public class TinyPotatoFeatureRenderer<T extends LivingEntity, M extends EntityModel<T>> extends FeatureRenderer<T, M> {
-    private static final String MOD_ID = MidnightLibClient.MOD_ID;
-    public static final EntityModelLayer TINY_POTATO_MODEL_LAYER = new EntityModelLayer(new Identifier("midnight-hats","tiny_potato"), "main");
-    private static final UUID MOTSCHEN = UUID.fromString("a44c2660-630f-478f-946a-e518669fcf0c");
-
-    private static final Identifier DEACTIVATED = new Identifier(MOD_ID,"textures/hats/empty.png");
-    private static final Identifier TATER = new Identifier(MOD_ID,"textures/hats/tater.png");
-    private final TinyPotatoModel<T> tinyPotato;
-
-    public TinyPotatoFeatureRenderer(FeatureRendererContext<T, M> featureRendererContext, EntityModelLoader entityModelLoader) {
-        super(featureRendererContext);
-        this.tinyPotato = new TinyPotatoModel<>(entityModelLoader.getModelPart(TINY_POTATO_MODEL_LAYER));
-    }
-
-    public static TexturedModelData getTexturedModelData() {
-        return TexturedModelData.of(TinyPotatoModel.getModelData(), 16, 16);
-    }
-
-    public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
-        {
-            AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity;
-            Identifier hat_type;
-            if (livingEntity != null) {
-                if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.DECEMBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) == 10) {
-                    if (MidnightLibConfig.event_hats) {
-                        hat_type = TATER;
-                    }
-                    else hat_type = DEACTIVATED;
-                }else {
-                    hat_type = DEACTIVATED;
-                }
-            } else {
-                hat_type = DEACTIVATED;
-            }
-
-            if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && !abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) {
-                matrixStack.push();
-
-                ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
-                VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
-                this.tinyPotato.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
-
-                matrixStack.pop();
-            }
-        }
-    }
-}
--- a/src/main/java/eu/midnightdust/hats/tater/TinyPotatoModel.java
+++ b/src/main/java/eu/midnightdust/hats/tater/TinyPotatoModel.java
@@ -1,36 +0,0 @@
-package eu.midnightdust.hats.tater;
-
-import net.minecraft.client.model.*;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.entity.model.SinglePartEntityModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-
-public class TinyPotatoModel <T extends LivingEntity> extends SinglePartEntityModel<T> {
-	private final ModelPart tater;
-	public TinyPotatoModel(ModelPart root) {
-		tater = root;
-		tater.setPivot(0.0F, -8.0F, 0.0F);
-	}
-
-	public static ModelData getModelData() {
-		ModelData modelData = new ModelData();
-		ModelPartData modelPartData = modelData.getRoot();
-		modelPartData.addChild("tater", ModelPartBuilder.create().uv(0, 0).cuboid(-2.0F, -6.0F, -2.0F, 4.0F, 6.0F, 4.0F), ModelTransform.NONE);
-
-		return modelData;
-	}
-	public ModelPart getPart() {
-		return this.tater;
-	}
-
-	@Override
-	public void setAngles(T entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch){
-		//previously the render function, render code was moved to a method below
-	}
-	@Override
-	public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
-
-		tater.render(matrixStack, buffer, packedLight, packedOverlay);
-	}
-}
--- a/src/main/java/eu/midnightdust/hats/web/HatLoader.java
+++ b/src/main/java/eu/midnightdust/hats/web/HatLoader.java
@@ -1,10 +1,9 @@
 package eu.midnightdust.hats.web;

 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;
@@ -15,32 +14,33 @@ import java.net.URL;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;

-import static net.minecraft.datafixer.fix.BlockEntitySignTextStrictJsonFix.GSON;
-
+@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;
+    private static final Gson GSON = new GsonBuilder().create();
+

    public static void init() {
        CompletableFuture.supplyAsync(() -> {
            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 occured, 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());
    }
--- a/src/main/java/eu/midnightdust/hats/witch/WitchHatFeatureRenderer.java
+++ b/src/main/java/eu/midnightdust/hats/witch/WitchHatFeatureRenderer.java
@@ -1,45 +1,42 @@
 package eu.midnightdust.hats.witch;

-import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.hats.web.HatLoader;
+import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.model.TexturedModelData;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.*;
 import net.minecraft.client.render.entity.feature.FeatureRenderer;
 import net.minecraft.client.render.entity.feature.FeatureRendererContext;
 import net.minecraft.client.render.entity.model.EntityModel;
 import net.minecraft.client.render.entity.model.EntityModelLayer;
 import net.minecraft.client.render.entity.model.EntityModelLoader;
 import net.minecraft.client.render.entity.model.ModelWithHead;
-import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.Identifier;

-import java.util.Calendar;
+import java.awt.*;
 import java.util.UUID;

+import static eu.midnightdust.core.MidnightLibClient.MOD_ID;
+
@Environment(EnvType.CLIENT)
 public class WitchHatFeatureRenderer<T extends LivingEntity, M extends EntityModel<T>> extends FeatureRenderer<T, M> {
-    private static final String MOD_ID = MidnightLibClient.MOD_ID;
    public static final EntityModelLayer WITCH_HAT_MODEL_LAYER = new EntityModelLayer(new Identifier("midnight-hats","witch_hat"), "main");
    private static final UUID MOTSCHEN = UUID.fromString("a44c2660-630f-478f-946a-e518669fcf0c");

-    private static final Identifier DEACTIVATED = new Identifier(MOD_ID,"textures/hats/empty.png");
    private static final Identifier WITCH = new Identifier("textures/entity/witch.png");
-    private static final Identifier MOTSCHEN_SKIN = new Identifier(MOD_ID,"textures/hats/motschen.png");
-    private static final Identifier CONTRIBUTER_SKIN = new Identifier(MOD_ID,"textures/hats/contributer.png");
-    private static final Identifier FRIEND_SKIN = new Identifier(MOD_ID,"textures/hats/friend.png");
-    private static final Identifier DONATOR_SKIN = new Identifier(MOD_ID,"textures/hats/donator.png");
-    private static final Identifier SOCIAL_SKIN = new Identifier(MOD_ID,"textures/hats/social.png");
-    private static final Identifier PRIDE_SKIN = new Identifier(MOD_ID,"textures/hats/pride.png");
+    private static final Identifier OVERLAY = new Identifier(MOD_ID,"textures/hats/overlay.png");
+    private static final Color MOTSCHEN_COLOR = MidnightColorUtil.radialRainbow(1,1);
+    private static final Color ADOPTER_COLOR = MidnightColorUtil.hex2Rgb("ffffff");
+    private static final Color MODDER_COLOR = MidnightColorUtil.hex2Rgb("7825b4");
+    private static final Color FRIEND_COLOR = MidnightColorUtil.hex2Rgb("ff0234");
+    private static final Color DONOR_COLOR = MidnightColorUtil.hex2Rgb("ff6c00");
+    private static final Color SOCIAL_COLOR = MidnightColorUtil.hex2Rgb("238a9d");
    private final WitchHatModel<T> witchHat;
+    private final MinecraftClient client = MinecraftClient.getInstance();

    public WitchHatFeatureRenderer(FeatureRendererContext<T, M> featureRendererContext, EntityModelLoader entityModelLoader) {
        super(featureRendererContext);
@@ -51,38 +48,35 @@ public class WitchHatFeatureRenderer<T extends LivingEntity, M extends EntityMod
    }

    public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
-        {
-            Identifier hat_type = DEACTIVATED;
-            if (livingEntity instanceof AbstractClientPlayerEntity abstractClientPlayerEntity) {
+        Color hat_type = getHat(livingEntity.getUuid());

-                if (abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) {
-                    hat_type = MOTSCHEN_SKIN;
-                } else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("contributer")) {
-                    hat_type = CONTRIBUTER_SKIN;
-                } else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("friend")) {
-                    hat_type = FRIEND_SKIN;
-                } else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("donator")) {
-                    hat_type = DONATOR_SKIN;
-                } else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("social")) {
-                    hat_type = SOCIAL_SKIN;
-                } else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("pride")) {
-                    hat_type = PRIDE_SKIN;
-                } else if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.OCTOBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) >= 30) {
-                    if (MidnightLibConfig.event_hats) {
-                        hat_type = WITCH;
-                    }
-                }
+        if (hat_type != null && !livingEntity.isInvisibleTo(client.player)) {
+            if (hat_type == MOTSCHEN_COLOR) hat_type = MidnightColorUtil.radialRainbow(1,1);
+            matrixStack.push();

-                if (!(hat_type == DEACTIVATED)) {
-                    matrixStack.push();
+            ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
+            VertexConsumer vertexConsumer = vertexConsumerProvider.getBuffer(RenderLayer.getEntityCutoutNoCull(WITCH));
+            this.witchHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV,1f,1f,1f,1);
+            VertexConsumer glow = vertexConsumerProvider.getBuffer(RenderLayer.getBeaconBeam(OVERLAY,true));
+            matrixStack.translate(0,0,-0.001f);
+            this.witchHat.render(matrixStack, glow, 230, OverlayTexture.DEFAULT_UV, hat_type.getRed() / 255f, hat_type.getGreen() / 255f, hat_type.getBlue() / 255f, 1.0F);

-                    ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
-                    VertexConsumer vertexConsumer = ItemRenderer.getArmorGlintConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false);
-                    this.witchHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
-
-                    matrixStack.pop();
-                }
-            }
+            matrixStack.pop();
        }
    }
+    private Color getHat(UUID uuid) {
+        if (uuid.equals(MOTSCHEN)) {
+            return MOTSCHEN_COLOR;
+        } else if (HatLoader.PLAYER_HATS != null && HatLoader.PLAYER_HATS.containsKey(uuid)) {
+            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;
+    }
 }
--- a/src/main/java/eu/midnightdust/hats/witch/WitchHatModel.java
+++ b/src/main/java/eu/midnightdust/hats/witch/WitchHatModel.java
@@ -8,23 +8,20 @@ import net.minecraft.entity.LivingEntity;

 public class WitchHatModel<T extends LivingEntity> extends SinglePartEntityModel<T> {
 	private final ModelPart headwear;
-	private final ModelPart bone;
-	private final ModelPart bone2;
-	private final ModelPart bone3;

    public WitchHatModel(ModelPart root) {
        headwear = root;
        root.setPivot(5.0F, -9.0F, -5.0F);

-        bone = headwear.getChild("bone");
+        ModelPart bone = headwear.getChild("bone");
        bone.setPivot(-8.5F, -0.1F, 1.5F);
        setRotationAngle(bone, -0.0524F, 0.0F, 0.0349F);

-        bone2 = bone.getChild("bone2");
+        ModelPart bone2 = bone.getChild("bone2");
        bone2.setPivot(1.5F, -4.0F, 1.5F);
        setRotationAngle(bone2, -0.1222F, 0.0F, 0.0698F);

-        bone3 = bone2.getChild("bone3");
+        ModelPart bone3 = bone2.getChild("bone3");
        bone3.setPivot(1.5F, -4.0F, 1.5F);
        setRotationAngle(bone3, -0.2618F, 0.0F, 0.1047F);
    }
@@ -42,14 +39,12 @@ public class WitchHatModel<T extends LivingEntity> extends SinglePartEntityModel

 	@Override
 	public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) {
-
 	}

 	@Override
 	public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
-
-		headwear.render(matrixStack, buffer, packedLight, packedOverlay);
-}
+		headwear.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
+    }

    @Override
    public ModelPart getPart() {
@@ -60,6 +55,5 @@ public class WitchHatModel<T extends LivingEntity> extends SinglePartEntityModel
 		bone.pitch = x;
 		bone.yaw = y;
 		bone.roll = z;
-}
-
-	}
+    }
+}
--- a/src/main/java/eu/midnightdust/lib/config/AutoCommand.java
+++ b/src/main/java/eu/midnightdust/lib/config/AutoCommand.java
@@ -0,0 +1,91 @@
+package eu.midnightdust.lib.config;
+
+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.v2.CommandRegistrationCallback;
+import net.minecraft.server.command.CommandManager;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.text.Text;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
+public class AutoCommand {
+    private LiteralArgumentBuilder<ServerCommandSource> command;
+    final Field entry;
+    final String modid;
+
+    public AutoCommand(Field entry, String modid) {
+        this.entry = entry;
+        this.modid = modid;
+    }
+
+    public void register() {
+        command = CommandManager.literal(modid);
+        command();
+        LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
+
+        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, registrationEnvironment) -> dispatcher.register(finalized));
+    }
+
+    private void command() {
+        if (entry.getType() == int.class)
+            command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
+                    CommandManager.argument("value", IntegerArgumentType.integer((int) entry.getAnnotation(MidnightConfig.Entry.class).min(),(int) entry.getAnnotation(MidnightConfig.Entry.class).max()))
+                            .executes(ctx -> this.setValue(ctx.getSource(), IntegerArgumentType.getInteger(ctx, "value")))
+            ));
+        else if (entry.getType() == double.class)
+            command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
+                    CommandManager.argument("value", DoubleArgumentType.doubleArg(entry.getAnnotation(MidnightConfig.Entry.class).min(),entry.getAnnotation(MidnightConfig.Entry.class).max()))
+                            .executes(ctx -> this.setValue(ctx.getSource(), DoubleArgumentType.getDouble(ctx, "value")))
+            ));
+        else if (entry.getType() == boolean.class) {
+            command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
+                    CommandManager.literal("true")
+                            .executes(ctx -> this.setValue(ctx.getSource(), true))
+            ));
+            command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
+                    CommandManager.literal("false")
+                            .executes(ctx -> this.setValue(ctx.getSource(), false))
+            ));
+        }
+        else if (entry.getType().isEnum()) {
+            for (int i = 0; i < entry.getType().getEnumConstants().length; ++i) {
+                Object enumValue = Arrays.stream(entry.getType().getEnumConstants()).toList().get(i);
+                command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
+                        CommandManager.literal(enumValue.toString())
+                                .executes(ctx -> this.setValue(ctx.getSource(), enumValue))
+                ));
+            }
+        }
+        else
+        command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
+                CommandManager.argument("value", StringArgumentType.string())
+                        .executes(ctx -> this.setValue(ctx.getSource(), StringArgumentType.getString(ctx, "value")))
+        ));
+    }
+
+    private int setValue(ServerCommandSource source, Object value) {
+        try {
+            entry.set(null,value);
+            MidnightConfig.write(modid);
+        }
+        catch (Exception e) {
+            source.sendError(Text.literal("Could not set "+entry.getName()+" to value "+value+": " + e));
+            return 0;
+        }
+
+        source.sendFeedback(Text.literal("Successfully set " + entry.getName()+" to "+value), true);
+        return 1;
+    }
+    private int getValue(ServerCommandSource source) {
+        try {
+            source.sendFeedback(Text.literal("The value of "+entry.getName()+" is "+entry.get(null)), false);
+            return 1;
+        }
+        catch (IllegalAccessException ignored) {}
+        return 0;
+    }
+}
--- a/src/main/java/eu/midnightdust/lib/config/AutoModMenu.java
+++ b/src/main/java/eu/midnightdust/lib/config/AutoModMenu.java
@@ -0,0 +1,28 @@
+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");
+    }
+
+    @Override
+    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
+        HashMap<String, ConfigScreenFactory<?>> map = new HashMap<>();
+        MidnightConfig.configClass.forEach((modid, cClass) -> {
+                    if (!MidnightLibClient.hiddenMods.contains(modid))
+                        map.put(modid, parent -> MidnightConfig.getScreen(parent, modid));
+                }
+        );
+        return map;
+    }
+}
--- a/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
+++ b/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
@@ -13,47 +13,44 @@ 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.*;
+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.*;
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;

-import java.lang.annotation.*;
+import java.awt.Color;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 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.2
-// Single class config library - feel free to copy!
-// Changelog:
-// - 1.0.2:
-// - Update to 21w20a
-// - 1.0.1:
-// - Fixed buttons not working in fullscreen
-// - 1.0.0:
-// - The config screen no longer shows the entries of all instances of MidnightConfig
-// - Compatible with servers!
-// - Scrollable!
-// - Comment support!
-// - Fresh New Design
-
-/** Based on https://github.com/Minenash/TinyConfig
+/** MidnightConfig v2.2.0 by TeamMidnightDust & Motschen
+ *  Single class config library - feel free to copy!
+ *
+ *  Based on https://github.com/Minenash/TinyConfig
 *  Credits to Minenash */

@SuppressWarnings("unchecked")
-public class MidnightConfig {
-    public static boolean useTooltipForTitle = true; // Render title as tooltip or as simple text
-
+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<>();

@@ -61,12 +58,17 @@ public class MidnightConfig {
        Field field;
        Object widget;
        int width;
+        int max;
+        boolean centered;
        Map.Entry<TextFieldWidget,Text> error;
        Object defaultValue;
        Object value;
        String tempValue;
        boolean inLimits = true;
        String id;
+        Text name;
+        int index;
+        ClickableWidget colorButton;
    }

    public static final Map<String,Class<?>> configClass = new HashMap<>();
@@ -80,10 +82,9 @@ public class MidnightConfig {

        for (Field field : config.getFields()) {
            EntryInfo info = new EntryInfo();
-            if (field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class))
-                try {
-                    initClient(modid, field, info);
-                } catch (Exception e) {continue;}
+            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);
@@ -97,37 +98,41 @@ public class MidnightConfig {
                try {
                    info.value = info.field.get(null);
                    info.tempValue = info.value.toString();
-                } catch (IllegalAccessException ignored) {
-                }
+                } catch (IllegalAccessException ignored) {}
        }
    }
    @Environment(EnvType.CLIENT)
-    public static void initClient(String modid, Field field, EntryInfo info) {
+    private static void initClient(String modid, Field field, EntryInfo info) {
        Class<?> type = field.getType();
        Entry e = field.getAnnotation(Entry.class);
        info.width = e != null ? e.width() : 0;
        info.field = field;
        info.id = modid;

-        if (e != null)
-            if (type == int.class)         textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
-            else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false);
-            else if (type == String.class) 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);
+        if (e != null) {
+            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 -> 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());
-                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object,Text>>( button -> {
+                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);
+                    info.value = values.get(index >= values.size() ? 0 : index);
                    button.setMessage(func.apply(info.value));
                }, func);
            }
+        }
        entries.add(info);
    }

@@ -139,13 +144,11 @@ public 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)));
            }
@@ -155,9 +158,20 @@ public 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(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));
+                } catch (Exception ignored) {}
+            }
            return true;
        };
    }
@@ -171,55 +185,65 @@ public class MidnightConfig {
            e.printStackTrace();
        }
    }
-
    @Environment(EnvType.CLIENT)
    public static Screen getScreen(Screen parent, String modid) {
-        return new TinyConfigScreen(parent, modid);
+        return new MidnightConfigScreen(parent, modid);
    }
-
    @Environment(EnvType.CLIENT)
-    private static class TinyConfigScreen extends Screen {
-
-        protected TinyConfigScreen(Screen parent, String modid) {
-            super(new TranslatableText(modid + ".midnightconfig." + "title"));
+    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;
-        private final Screen parent;
-        private final String modid;
-        private MidnightConfigListWidget list;
+        public final String translationPrefix;
+        public final Screen parent;
+        public final String modid;
+        public MidnightConfigListWidget list;
+        public boolean reload = false;

        // Real Time config update //
        @Override
        public void tick() {
-            for (EntryInfo info : entries)
-                try { info.field.set(null, info.value); }
-                catch (IllegalAccessException ignored) {}
+            super.tick();
+            for (EntryInfo info : entries) {
+                try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
+            }
+            updateResetButtons();
        }
-
-        @Override
-        protected void init() {
-            super.init();
-
-            this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
-                try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
-                catch (Exception e) { write(modid); }
-
-                for (EntryInfo info : entries) {
-                    if (info.field.isAnnotationPresent(Entry.class)) {
-                        try {
-                            info.value = info.field.get(null);
-                            info.tempValue = info.value.toString();
-                        } catch (IllegalAccessException ignored) {
-                        }
+        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());
                    }
                }
-                Objects.requireNonNull(client).openScreen(parent);
-            }));
+            }
+        }
+        public void loadValues() {
+            try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
+            catch (Exception e) { write(modid); }

-            ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
+            for (EntryInfo info : entries) {
+                if (info.field.isAnnotationPresent(Entry.class))
+                    try {
+                        info.value = info.field.get(null);
+                        info.tempValue = info.value.toString();
+                    } catch (IllegalAccessException ignored) {}
+            }
+        }
+        @Override
+        public void init() {
+            super.init();
+            if (!reload) loadValues();
+
+            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(ButtonWidget.method_46430(ScreenTexts.DONE, (button) -> {
                for (EntryInfo info : entries)
                    if (info.id.equals(modid)) {
                        try {
@@ -227,38 +251,70 @@ public class MidnightConfig {
                        } catch (IllegalAccessException ignored) {}
                    }
                write(modid);
-                Objects.requireNonNull(client).openScreen(parent);
-            }));
+                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 = new TranslatableText(translationPrefix + info.field.getName());
-                    ButtonWidget resetButton = new ButtonWidget(width - 155, 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.value.toString();
+                        info.tempValue = info.defaultValue.toString();
+                        info.index = 0;
                        double scrollAmount = list.getScrollAmount();
-                        Objects.requireNonNull(client).openScreen(this);
+                        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 - 110, 0, info.width, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton,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);
+                        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(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;
+                            info.index = info.index + 1;
+                            if (info.index > ((List<String>)info.value).size()) info.index = 0;
+                            Objects.requireNonNull(client).setScreen(this);
+                            list.setScrollAmount(scrollAmount);
+                        })).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 - 110, 0, info.width, 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(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 {
-                        ButtonWidget dummy = new ButtonWidget(-10, 0, 0, 0, Text.of(""), null);
-                        this.list.addButton(dummy,dummy,name);
+                        this.list.addButton(List.of(),name, info);
                    }
                }
+                updateResetButtons();
            }

        }
@@ -266,24 +322,21 @@ public 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);
-            if (useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
-            else 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)) {
                    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);
                        }
                    }
@@ -293,7 +346,7 @@ public class MidnightConfig {
        }
    }
    @Environment(EnvType.CLIENT)
-    public static class MidnightConfigListWidget extends ElementListWidget<MidnightConfig.ButtonEntry> {
+    public static class MidnightConfigListWidget extends ElementListWidget<ButtonEntry> {
        TextRenderer textRenderer;

        public MidnightConfigListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
@@ -304,17 +357,15 @@ public 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, 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()) {
-                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();
@@ -322,50 +373,45 @@ public 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;
+        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) {
-            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, 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(ClickableWidget button, Text text, ClickableWidget resetButton) {
-            return new ButtonEntry(button, text, resetButton);
+        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) {
-            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);
-            });
-        }
-        public List<? extends Element> children() {
-            return buttonsWithResetButtons;
-        }
-
-        public List<? extends Selectable> method_37025() {
-            return buttonsWithResetButtons;
+            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);
+            }
        }
+        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; }
@@ -373,4 +419,4 @@ public class MidnightConfig {
            return fieldAttributes.getAnnotation(Entry.class) == null;
        }
    }
-}
+}
--- a/src/main/java/eu/midnightdust/lib/config/MidnightConfigExample.java
+++ b/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.
--- a/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java
+++ b/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java
@@ -1,17 +1,26 @@
 package eu.midnightdust.lib.util;

-import java.awt.*;
+import java.awt.Color;

 public class MidnightColorUtil {
+    public static float hue;
+    public static void tick() {
+        if (hue > 1) hue = 0f;
+        hue = hue + 0.01f;
+    }
+
    /**
-     * @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) {
+        return Color.getHSBColor(hue, saturation, brightness);
    }
 }
--- a/src/main/java/eu/midnightdust/lib/util/screen/TexturedOverlayButtonWidget.java
+++ b/src/main/java/eu/midnightdust/lib/util/screen/TexturedOverlayButtonWidget.java
@@ -0,0 +1,40 @@
+package eu.midnightdust.lib.util.screen;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.widget.TexturedButtonWidget;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+public class TexturedOverlayButtonWidget extends TexturedButtonWidget {
+    public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, PressAction pressAction) {
+        super(x, y, width, height, u, v, texture, pressAction);
+    }
+    public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, PressAction pressAction) {
+        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
+    }
+
+    public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, PressAction pressAction, Text text) {
+        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text);
+    }
+
+    public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, PressAction pressAction, TooltipSupplier tooltipSupplier, Text text) {
+        super(x,y,width,height, u,v,hoveredVOffset,texture,textureWidth,textureHeight,pressAction,tooltipSupplier,text);
+    }
+
+    @Override
+    public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        RenderSystem.setShader(GameRenderer::getPositionTexShader);
+        RenderSystem.setShaderTexture(0, WIDGETS_TEXTURE);
+        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
+        int i = this.getYImage(this.isHovered());
+        RenderSystem.enableBlend();
+        RenderSystem.defaultBlendFunc();
+        RenderSystem.enableDepthTest();
+        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);
+    }
+}
--- a/src/main/resources/assets/midnightlib/icon.png
+++ b/src/main/resources/assets/midnightlib/icon.png
--- a/src/main/resources/assets/midnightlib/lang/de_de.json
+++ b/src/main/resources/assets/midnightlib/lang/de_de.json
@@ -0,0 +1,11 @@
+{
+	"midnightlib.overview.title":"MidnightConfig Übersicht",
+	"midnightlib.midnightconfig.title":"MidnightLib Konfiguration",
+	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
+	"midnightlib.midnightconfig.config_screen_list":"Konfigurationsübersicht",
+	"midnightlib.midnightconfig.background_texture":"Textur der Konfigurationsbildschirme",
+	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
+	"midnightlib.midnightconfig.special_hats":"Unterstützer-Hüte",
+	"modmenu.descriptionTranslation.midnightlib": "Code-Bibliothek für Mods von MidnightDust.\nStellt eine Konfigurationsschnittstelle, automatische Kompatibilität, oft genutzten Code und Hüte für Unterstützer bereit.",
+	"modmenu.summaryTranslation.midnightlib": "Code-Bibliothek für Mods von MidnightDust."
+}
--- a/src/main/resources/assets/midnightlib/lang/en_us.json
+++ b/src/main/resources/assets/midnightlib/lang/en_us.json
@@ -3,15 +3,15 @@
 	"midnightlib.midnightconfig.title":"MidnightLib Config",
 	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
 	"midnightlib.midnightconfig.config_screen_list":"Enable Config Screen List",
-	"midnightlib.midnightconfig.titleStyle":"Style of config screen titles",
-	"midnightlib.midnightconfig.titleStyle.tooltip":"§cRequires restart!",
-	"midnightlib.midnightconfig.enum.TitleStyle.TEXT":"Text",
-	"midnightlib.midnightconfig.enum.TitleStyle.TOOLTIP":"Tooltip",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aTrue",
+	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalse",
+	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
+	"midnightlib.midnightconfig.background_texture":"Texture of config screen backgrounds",
 	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
-	"midnightlib.midnightconfig.event_hats":"Enable Event Hats",
-	"midnightlib.midnightconfig.special_hats":"Enable Special Hats",
+	"midnightlib.midnightconfig.special_hats":"Enable Supporter Hats",
 	"midnightlib.modrinth":"Modrinth",
 	"midnightlib.curseforge":"CurseForge",
-	"modmenu.descriptionTranslation.midnightlib": "Common Library for Team MidnightDust's mods.\nProvides a config api, common utils, and cosmetics.",
+	"midnightlib.wiki":"Wiki",
+	"modmenu.descriptionTranslation.midnightlib": "Common Library for Team MidnightDust's mods.\nProvides a config api, automatic integration with other mods, common utils, and cosmetics.",
 	"modmenu.summaryTranslation.midnightlib": "Common Library for Team MidnightDust's mods."
 }
--- a/src/main/resources/assets/midnightlib/lang/uk_ua.json
+++ b/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."
+}
--- a/src/main/resources/assets/midnightlib/textures/gui/midnightlib_button.png
+++ b/src/main/resources/assets/midnightlib/textures/gui/midnightlib_button.png
--- a/src/main/resources/assets/midnightlib/textures/hats/christmas.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/christmas.png
--- a/src/main/resources/assets/midnightlib/textures/hats/contributer.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/contributer.png
--- a/src/main/resources/assets/midnightlib/textures/hats/donator.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/donator.png
--- a/src/main/resources/assets/midnightlib/textures/hats/empty.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/empty.png
--- a/src/main/resources/assets/midnightlib/textures/hats/friend.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/friend.png
--- a/src/main/resources/assets/midnightlib/textures/hats/motschen.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/motschen.png
--- a/src/main/resources/assets/midnightlib/textures/hats/overlay.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/overlay.png
--- a/src/main/resources/assets/midnightlib/textures/hats/pride.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/pride.png
--- a/src/main/resources/assets/midnightlib/textures/hats/social.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/social.png
--- a/src/main/resources/assets/midnightlib/textures/hats/tater.png
+++ b/src/main/resources/assets/midnightlib/textures/hats/tater.png
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,25 +23,26 @@
    "client": [
      "eu.midnightdust.core.MidnightLibClient"
    ],
+    "server": [
+      "eu.midnightdust.core.MidnightLibServer"
+    ],
    "modmenu": [
-      "eu.midnightdust.hats.config.ModMenuIntegration"
+      "eu.midnightdust.lib.config.AutoModMenu"
    ]
  },

  "mixins": [
-    "midnighthats.mixins.json",
-    "midnightcore.mixins.json"
+    "midnightlib.mixins.json"
  ],

-  "depends": {
-    "fabric-renderer-registries-v1": "*"
-  },
-
  "custom": {
    "modmenu": {
      "links": {
-        "modmenu.discord": "https://discord.gg/jAGnWYHm3r",
-        "modmenu.website": "https://www.midnightdust.eu/"
+        "modmenu.discord": "https://discord.midnightdust.eu/",
+        "modmenu.website": "https://www.midnightdust.eu/",
+        "midnightlib.curseforge": "https://www.curseforge.com/minecraft/mc-mods/midnightlib",
+        "midnightlib.modrinth": "https://modrinth.com/mod/midnightlib",
+        "midnightlib.wiki": "https://github.com/TeamMidnightDust/MidnightLib/wiki"
      },
      "badges": [ "library" ]
    }
--- a/src/main/resources/midnighthats.mixins.json
+++ b/src/main/resources/midnighthats.mixins.json
@@ -1,11 +0,0 @@
-{
-  "required": true,
-  "package": "eu.midnightdust.hats.mixin",
-  "compatibilityLevel": "JAVA_16",
-  "client": [
-    "PlayerEntityRendererMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
--- a/src/main/resources/midnightcore.mixins.json
+++ b/src/main/resources/midnightcore.mixins.json
@@ -3,7 +3,8 @@
  "package": "eu.midnightdust.core.mixin",
  "compatibilityLevel": "JAVA_16",
  "client": [
-    "MixinOptionsScreen"
+    "MixinOptionsScreen",
+    "MixinPlayerEntityRenderer"
  ],
  "injectors": {
    "defaultRequire": 1
Author	SHA1	Message	Date
Motschen	3d5fcd7e71	Better versioning scheme	2022-10-27 20:40:20 +02:00
Motschen	c501c63d30	Port to 22w43a	2022-10-27 19:57:41 +02:00
Motschen	ac1516293c	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	2022-09-21 20:52:56 +02:00
Motschen	383de29f93	MidnightLib 0.6.0 - Centered Comments, Inactive Reset Buttons, Hidden Entries - Comments can now be centered via a property in the Annotation - Entries can now be completely hidden using the respective annotation (allows for things like config versions being saved) - Reset buttons now get deactivated when the value matches the default - The MidnightConfigOverview list is now sorted alphabetically - Make more fields publicly accessible - Ukrainian translation by @Altegar	2022-08-22 18:42:48 +02:00
Martin Prokoph	71c16ffbb3	Merge pull request #13 from Altegar/patch-1 Create uk_ua.json	2022-08-16 12:43:56 +02:00
Sushomeister	76166aed49	Create uk_ua.json	2022-07-26 16:11:35 +03:00
Motschen	d6e1a5e558	Some more fixes...	2022-06-07 21:13:26 +02:00
Motschen	191120393c	MidnightLib 0.5.2 - Fix AutoModMenu opt-out... again Closes #10	2022-06-07 21:03:45 +02:00
Motschen	1be14dc3ac	MidnightLib 1.5.1 - Fix AutoModMenu opt-out	2022-06-06 18:48:32 +02:00
Motschen	7e1de67a5e	MidnightLib 0.5.0 - Same as 0.4.2 but 1.19	2022-06-06 18:13:39 +02:00
Motschen	da4e59ef3a	MidnightLib 0.4.1 - Update to 1.19	2022-05-18 20:21:31 +02:00
Motschen	da2c76ed5f	Update MidnightConfigExample.java	2022-04-12 17:56:08 +02:00
Motschen	8c1c00f6e2	Update Documentation	2022-02-22 12:49:09 +01:00
Motschen	5183b54285	Ditch Log4j for future-proofing	2022-02-22 12:44:28 +01:00
Motschen	a9190f2a0d	MidnightLib 0.4.0 - Color support, Client and Server-only config options, cleanup	2022-02-22 12:30:55 +01:00
Motschen	794586362d	MidnightLib 0.3.1 - Remove debug info	2021-11-20 11:21:40 +01:00
Motschen	1bdbde0af6	Merge pull request #5 from wafflecoffee/patch-1 Remove debug printlns in MidnightConfig	2021-11-20 10:17:57 +00:00
Emma	c1815c25d8	Remove debug printlns	2021-11-14 17:43:12 -05:00
Motschen	5dc707a6d8	MidnightLib 0.3.0 - String-List ingame support - String Lists can now be edited in MidnightLib config screens - Remove some pointless clutter	2021-10-31 15:46:34 +01:00
Motschen	78dcb1e988	MidnightLib 0.2.9 - Make /midnightconfig command only able to be executed by operators	2021-10-29 11:16:21 +02:00
Motschen	afa8cf9a5d	MidnightLib 0.2.8 - Command-based server configuration, Remove garbage, Better MidnightHats, Update MC - Added a command-based way to configure server mods without having to edit the config file (only on dedicated servers) - Update codebase to 1.17.1 - MidnightHats: ~ Remove Event Hats (irritating and unneeded) ~ Better Hats for Supporters (Cleanup, Glow, Lightweightness) ~ Hats of invisible players are now hidden - MidnightConfig: ~ Better support for external value changing ~ Only tooltip-based titles now - MidnightColorUtil: ~ add radialRainbow util for fancy rgb effects - Better German translations	2021-10-28 23:20:40 +02:00
Motschen	7c55e3bfae	MidnightLib 0.2.7 - Fixes and Textured overlay buttons - Fix #1 - The MidnightConfig overview screen button background is now based on the default button texture (Powered by new util class 'TexturedOverlayButtonWidget')	2021-10-19 21:39:32 +02:00
Motschen	454b8ec01d	MidnightLib 0.2.6 - Code cleanup & compression - MidnightHats is now more performant and has new types of special hats - Compress assets - Reduce filesize heavily	2021-10-01 19:56:53 +02:00
Motschen	cedf1df78a	Fix missing lang keys	2021-09-19 13:30:05 +02:00
Motschen	60497771fc	MidnightLib 0.2.5 - Better Translations & Backgrounds - Custom lang key support - Transparent list background when in game - Configurable background texture in MidnightConfig screens (defaults to Deepslate)	2021-09-19 13:18:16 +02:00
Motschen	472ce59ae0	MidnightLib 0.2.4 - 1.17 MidnightConfig v1.0.4: - Number field length is now configurable - Fixed number fields being empty	2021-06-21 19:41:14 +02:00
Motschen	2a6b0bae12	MidnightLib 0.2.3 - Automatic mod menu integration Added automatic mod menu integration for mods using MidnightLib MidnightConfig 1.0.3: - Text field length is now configurable - Better separation of client and server	2021-06-09 12:23:01 +02:00