BlinkingSkinPort 2.2.0 - Port to 1.20

- Update to 1.20
- Make use of new MidnightLib features for better config screen

build.gradle

@@ -1,65 +1,62 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.12-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+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://jitpack.io" }
+	maven {
+		url = "https://api.modrinth.com/maven"
+	}
 }
 
 dependencies {
 	//to change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	
-	modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}")
-	modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}")
-	modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}")
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+	include "maven.modrinth:midnightlib:${project.midnightlib_version}"
 }
 
 processResources {
 	inputs.property "version", project.version
 
-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
+	filesMatching("fabric.mod.json") {
 		expand "version": project.version
 	}
-
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
+tasks.withType(JavaCompile).configureEach {
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
+	it.options.release = 17
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
-	from sourceSets.main.allSource
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
 }
 
 jar {
-	from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
 }
 
 // configure the maven publication
@@ -76,9 +73,11 @@ publishing {
 		}
 	}
 
-	// select the repositories you want to publish to
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
 	repositories {
-		// uncomment to publish to the local maven
-		// mavenLocal()
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
 	}
 }

gradle.properties

@@ -2,20 +2,15 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.4
-	yarn_mappings=1.16.4+build.7
-	loader_version=0.10.8
+minecraft_version=1.20
+yarn_mappings=1.20+build.1
+loader_version=0.14.21
 
 # Mod Properties
-	mod_version = 2.0.0
-	maven_group = eu.midnightdust
-	archives_base_name = blinkingskinport
+mod_version = 2.2.0
+maven_group = eu.midnightdust
+archives_base_name = blinkingskinport
 
 # 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.26.1+1.16
-	
-	auto_config_version = 3.2.0-unstable
-	cloth_config_version = 4.7.0-unstable
-	mod_menu_version = 1.14.6+build.31
+fabric_version=0.83.0+1.20
+midnightlib_version=1.4.1-fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -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,78 +17,113 @@
 #
 
 ##############################################################################
-##
-##  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
 
+
 # Determine the Java command to use to start the JVM.
 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
@@ -97,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
@@ -105,84 +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, switch paths to Windows format before running java
-if $cygwin ; 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=$((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" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    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" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/eu/midnightdust/blinkingskinport/BlinkingSkinClient.java

@@ -1,8 +1,7 @@
 package eu.midnightdust.blinkingskinport;
 
 import eu.midnightdust.blinkingskinport.config.BlinkingSkinConfig;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer;
+import eu.midnightdust.blinkingskinport.mixin.GameOptionsAccessor;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.render.entity.PlayerModelPart;
@@ -12,29 +11,28 @@ import java.util.Map;
 
 public class BlinkingSkinClient implements ClientModInitializer {
 
-    public static BlinkingSkinConfig BS_CONFIG;
     private final Map<PlayerModelPart, Integer> intervals = new HashMap<>();
 
     @Override
     public void onInitializeClient() {
-        AutoConfig.register(BlinkingSkinConfig.class, JanksonConfigSerializer::new);
-        BS_CONFIG = AutoConfig.getConfigHolder(BlinkingSkinConfig.class).getConfig();
+        BlinkingSkinConfig.init("blinkingskinport", BlinkingSkinConfig.class);
 
         for (PlayerModelPart part : PlayerModelPart.values()) {
             this.intervals.put(part, 0);
         }
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            if (BS_CONFIG.enabled) {
+            if (BlinkingSkinConfig.enabled && (BlinkingSkinConfig.playerAllowList.isEmpty() || BlinkingSkinConfig.playerAllowList.contains(client.getSession().getUsername()))) {
+                if (client.getCurrentServerEntry() != null && BlinkingSkinConfig.isBlocklisted(client.getCurrentServerEntry().address)) return;
                 for (Map.Entry<PlayerModelPart,Integer> interval : this.intervals.entrySet()) {
-                    if (!BS_CONFIG.isEnabled(interval.getKey())) {
+                    if (!BlinkingSkinConfig.isEnabled(interval.getKey())) {
                         continue;
                     }
 
                     int counter = this.intervals.get(interval.getKey());
-                    if (counter++ >= BS_CONFIG.getToggleInterval(interval.getKey())) {
+                    if (counter++ >= BlinkingSkinConfig.getToggleInterval(interval.getKey())) {
                         this.intervals.put(interval.getKey(), 0);
-                        client.options.togglePlayerModelPart(interval.getKey());
+                        client.options.togglePlayerModelPart(interval.getKey(), !((GameOptionsAccessor)client.options).getEnabledPlayerModelParts().contains(interval.getKey()));
                     }
                     else {
                         this.intervals.put(interval.getKey(), counter);

src/main/java/eu/midnightdust/blinkingskinport/config/BlinkingSkinConfig.java

@@ -1,91 +1,66 @@
 package eu.midnightdust.blinkingskinport.config;
 
-import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry;
-import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
+import com.google.common.collect.Lists;
+import eu.midnightdust.lib.config.MidnightConfig;
 import net.minecraft.client.render.entity.PlayerModelPart;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-@Config(name = "blinkingskinport")
-public class BlinkingSkinConfig implements ConfigData {
+public class BlinkingSkinConfig extends MidnightConfig {
+    public static final String general = "general";
+    public static final String parts = "parts";
+    public static final String intervals = "intervals";
 
-    @ConfigEntry.Gui.PrefixText // Blink Intervals lower than 5 are disabled, because they can be used to trigger epileptic episodes, which isn't fun for affected people!
-    public boolean enabled = false;
+    @Entry(category = general) public static boolean enabled = false;
 
-    @ConfigEntry.Gui.PrefixText
-    public boolean capeEnabled = true;
-    @ConfigEntry.BoundedDiscrete(min = 5, max = 200)
-    @Comment("(20 ticks = 1 second)")
-    public int capeBlinkInterval = 20;
-    public boolean hatEnabled = true;
-    @ConfigEntry.BoundedDiscrete(min = 5, max = 200)
-    @Comment("(20 ticks = 1 second)")
-    public int hatBlinkInterval = 20;
-    public boolean jacketEnabled = true;
-    @ConfigEntry.BoundedDiscrete(min = 5, max = 200)
-    @Comment("(20 ticks = 1 second)")
-    public int jacketBlinkInterval = 20;
-    public boolean leftSleeveEnabled = true;
-    @ConfigEntry.BoundedDiscrete(min = 5, max = 200)
-    @Comment("(20 ticks = 1 second)")
-    public int leftSleeveBlinkInterval = 20;
-    public boolean rightSleeveEnabled = true;
-    @ConfigEntry.BoundedDiscrete(min = 5, max = 200)
-    @Comment("(20 ticks = 1 second)")
-    public int rightSleeveBlinkInterval = 20;
-    public boolean leftPantsLegEnabled = true;
-    @ConfigEntry.BoundedDiscrete(min = 5, max = 200)
-    @Comment("(20 ticks = 1 second)")
-    public int leftPantsLegBlinkInterval = 20;
-    public boolean rightPantsLegEnabled = true;
-    @ConfigEntry.BoundedDiscrete(min = 5, max = 200)
-    @Comment("(20 ticks = 1 second)")
-    public int rightPantsLegBlinkInterval = 20;
+    @Entry(category = general) @Hidden public static String player = "";
+    @Entry(category = general) public static List<String> playerAllowList = Lists.newArrayList(player); // Optional: Only enable the mod when one of the names matches the currently active account. Useful for users with multiple minecraft accounts
+    @Entry(category = general) public static List<String> serverBlocklist = new ArrayList<>();
+    @Entry(category = general) public static boolean useBlocklistAsAllowlist = false;
+    @Entry(category = parts) public static boolean capeEnabled = true;
+    @Entry(category = parts) public static boolean hatEnabled = true;
+    @Entry(category = parts) public static boolean jacketEnabled = true;
+    @Entry(category = parts) public static boolean leftSleeveEnabled = true;
+    @Entry(category = parts) public static boolean rightSleeveEnabled = true;
+    @Entry(category = parts) public static boolean leftPantsLegEnabled = true;
+    @Entry(category = parts) public static boolean rightPantsLegEnabled = true;
+    @Comment(category = intervals) public static Comment disclaimer; // Blink Intervals lower than 5 are disabled, because they could trigger epileptic episodes, which isn't fun for affected people!
+    @Entry(category = intervals, min = 5, max = 250, isSlider = true) public static int capeBlinkInterval = 20;
+    @Entry(category = intervals, min = 5, max = 250, isSlider = true) public static int hatBlinkInterval = 20;
+    @Entry(category = intervals, min = 5, max = 250, isSlider = true) public static int jacketBlinkInterval = 20;
+    @Entry(category = intervals, min = 5, max = 250, isSlider = true) public static int leftSleeveBlinkInterval = 20;
+    @Entry(category = intervals, min = 5, max = 250, isSlider = true) public static int rightSleeveBlinkInterval = 20;
+    @Entry(category = intervals, min = 5, max = 250, isSlider = true) public static int leftPantsLegBlinkInterval = 20;
+    @Entry(category = intervals, min = 5, max = 250, isSlider = true) public static int rightPantsLegBlinkInterval = 20;
 
-
-    public boolean isEnabled(PlayerModelPart part) {
-        switch (part) {
-            case HAT:
-                return hatEnabled;
-            case CAPE:
-                return capeEnabled;
-            case JACKET:
-                return jacketEnabled;
-            case LEFT_SLEEVE:
-                return leftSleeveEnabled;
-            case RIGHT_SLEEVE:
-                return rightSleeveEnabled;
-            case LEFT_PANTS_LEG:
-                return leftPantsLegEnabled;
-            case RIGHT_PANTS_LEG:
-                return rightPantsLegEnabled;
-            default:
-                throw new AssertionError("Could not get value for " + part);
-        }
+    public static boolean isEnabled(PlayerModelPart part) {
+        return switch (part) {
+            case HAT -> hatEnabled;
+            case CAPE -> capeEnabled;
+            case JACKET -> jacketEnabled;
+            case LEFT_SLEEVE -> leftSleeveEnabled;
+            case RIGHT_SLEEVE -> rightSleeveEnabled;
+            case LEFT_PANTS_LEG -> leftPantsLegEnabled;
+            case RIGHT_PANTS_LEG -> rightPantsLegEnabled;
+        };
     }
 
-    public int getToggleInterval(PlayerModelPart part) {
-        switch (part) {
-            case HAT:
-                return hatBlinkInterval;
-            case CAPE:
-                return capeBlinkInterval;
-            case JACKET:
-                return jacketBlinkInterval;
-            case LEFT_SLEEVE:
-                return leftSleeveBlinkInterval;
-            case RIGHT_SLEEVE:
-                return rightSleeveBlinkInterval;
-            case LEFT_PANTS_LEG:
-                return leftPantsLegBlinkInterval;
-            case RIGHT_PANTS_LEG:
-                return rightPantsLegBlinkInterval;
-            default:
-                throw new AssertionError("Could not get interval for " + part);
-        }
+    public static int getToggleInterval(PlayerModelPart part) {
+        return switch (part) {
+            case HAT -> hatBlinkInterval;
+            case CAPE -> capeBlinkInterval;
+            case JACKET -> jacketBlinkInterval;
+            case LEFT_SLEEVE -> leftSleeveBlinkInterval;
+            case RIGHT_SLEEVE -> rightSleeveBlinkInterval;
+            case LEFT_PANTS_LEG -> leftPantsLegBlinkInterval;
+            case RIGHT_PANTS_LEG -> rightPantsLegBlinkInterval;
+        };
+    }
+    public static boolean isBlocklisted(String address) {
+        if (serverBlocklist.isEmpty()) return useBlocklistAsAllowlist;
+        return serverBlocklist.contains(address) != useBlocklistAsAllowlist;
     }
 
 }

src/main/java/eu/midnightdust/blinkingskinport/config/ModMenuIntegration.java

@@ -1,16 +0,0 @@
-package eu.midnightdust.blinkingskinport.config;
-
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-@Environment(EnvType.CLIENT)
-public class ModMenuIntegration implements ModMenuApi {
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> AutoConfig.getConfigScreen(BlinkingSkinConfig.class, parent).get();
-    }
-}

src/main/java/eu/midnightdust/blinkingskinport/mixin/GameOptionsAccessor.java

@@ -0,0 +1,14 @@
+package eu.midnightdust.blinkingskinport.mixin;
+
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.client.render.entity.PlayerModelPart;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Set;
+
+@Mixin(GameOptions.class)
+public interface GameOptionsAccessor {
+    @Accessor
+    Set<PlayerModelPart> getEnabledPlayerModelParts();
+}

src/main/resources/assets/blinkingskinport/lang/en_us.json

@@ -1,23 +1,37 @@
 {
-	"text.autoconfig.blinkingskinport.title":"BlinkingSkinPort Config",
+	"blinkingskinport.midnightconfig.title":"BlinkingSkinPort Config",
 
-	"text.autoconfig.blinkingskinport.option.enabled":"Enable Mod",
+	"blinkingskinport.midnightconfig.category.general":"General",
+	"blinkingskinport.midnightconfig.category.parts":"Parts",
+	"blinkingskinport.midnightconfig.category.intervals":"Intervals",
 	
-	"text.autoconfig.blinkingskinport.option.capeEnabled.@PrefixText":" ",
-	"text.autoconfig.blinkingskinport.option.capeEnabled":"Blink Cape",
-	"text.autoconfig.blinkingskinport.option.hatEnabled":"Blink Hat",
-	"text.autoconfig.blinkingskinport.option.jacketEnabled":"Blink Jacket",
-	"text.autoconfig.blinkingskinport.option.leftSleeveEnabled":"Blink Left Sleeve",
-	"text.autoconfig.blinkingskinport.option.rightSleeveEnabled":"Blink Right Sleeve",
-	"text.autoconfig.blinkingskinport.option.leftPantsLegEnabled":"Blink Left Pants",
-	"text.autoconfig.blinkingskinport.option.rightPantsLegEnabled":"Blink Right Pants",
+	"blinkingskinport.midnightconfig.enabled":"Enable Mod",
+	"blinkingskinport.midnightconfig.playerAllowList":"Enabled Account Names",
+	"blinkingskinport.midnightconfig.playerAllowList.tooltip":"Optional. For multi-account users.",
+	"blinkingskinport.midnightconfig.serverBlocklist":"Server Blocklist",
+	"blinkingskinport.midnightconfig.useBlocklistAsAllowlist":"Use Blocklist as Allowlist",
 
-	"text.autoconfig.blinkingskinport.option.enabled.@PrefixText":"§cBlink Intervals lower than 5 are disabled, because they can be used to trigger epileptic episodes, which isn't fun for affected people!",
-	"text.autoconfig.blinkingskinport.option.capeBlinkInterval":"Cape Blink Interval",
-	"text.autoconfig.blinkingskinport.option.hatBlinkInterval":"Hat Blink Interval",
-	"text.autoconfig.blinkingskinport.option.jacketBlinkInterval":"Jacket Blink Interval",
-	"text.autoconfig.blinkingskinport.option.leftSleeveBlinkInterval":"Left Sleeve Blink Interval",
-	"text.autoconfig.blinkingskinport.option.rightSleeveBlinkInterval":"Right Sleeve Blink Interval",
-	"text.autoconfig.blinkingskinport.option.leftPantsLegBlinkInterval":"Left Pants Blink Interval",
-	"text.autoconfig.blinkingskinport.option.rightPantsLegBlinkInterval":"Right Pants Blink Interval"
+	"blinkingskinport.midnightconfig.capeEnabled":"Blink Cape",
+	"blinkingskinport.midnightconfig.hatEnabled":"Blink Hat",
+	"blinkingskinport.midnightconfig.jacketEnabled":"Blink Jacket",
+	"blinkingskinport.midnightconfig.leftSleeveEnabled":"Blink Left Sleeve",
+	"blinkingskinport.midnightconfig.rightSleeveEnabled":"Blink Right Sleeve",
+	"blinkingskinport.midnightconfig.leftPantsLegEnabled":"Blink Left Pants",
+	"blinkingskinport.midnightconfig.rightPantsLegEnabled":"Blink Right Pants",
+
+	"blinkingskinport.midnightconfig.disclaimer":"§cBlink Intervals lower than 5 are disabled, because they could trigger epileptic seizures, which isn't fun for affected people!",
+	"blinkingskinport.midnightconfig.capeBlinkInterval":"Cape Blink Interval",
+	"blinkingskinport.midnightconfig.capeBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
+	"blinkingskinport.midnightconfig.hatBlinkInterval":"Hat Blink Interval",
+	"blinkingskinport.midnightconfig.hatBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
+	"blinkingskinport.midnightconfig.jacketBlinkInterval":"Jacket Blink Interval",
+	"blinkingskinport.midnightconfig.jacketBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
+	"blinkingskinport.midnightconfig.leftSleeveBlinkInterval":"Left Sleeve Blink Interval",
+	"blinkingskinport.midnightconfig.leftSleeveBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
+	"blinkingskinport.midnightconfig.rightSleeveBlinkInterval":"Right Sleeve Blink Interval",
+	"blinkingskinport.midnightconfig.rightSleeveBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
+	"blinkingskinport.midnightconfig.leftPantsLegBlinkInterval":"Left Pants Blink Interval",
+	"blinkingskinport.midnightconfig.leftPantsLegBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
+	"blinkingskinport.midnightconfig.rightPantsLegBlinkInterval":"Right Pants Blink Interval",
+	"blinkingskinport.midnightconfig.rightPantsLegBlinkInterval.tooltip":"§2(20 ticks = 1 second)"
 }

src/main/resources/blinkingskinport.mixins.json

@@ -0,0 +1,11 @@
+{
+  "required": true,
+  "package": "eu.midnightdust.blinkingskinport.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "GameOptionsAccessor"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

src/main/resources/fabric.mod.json

@@ -22,13 +22,13 @@
   "entrypoints": {
     "client": [
       "eu.midnightdust.blinkingskinport.BlinkingSkinClient"
-    ],
-    "modmenu": [
-      "eu.midnightdust.blinkingskinport.config.ModMenuIntegration"
     ]
   },
 
   "depends": {
-    "fabric": "*"
-  }
+    "midnightlib": "*"
+  },
+  "mixins": [
+    "blinkingskinport.mixins.json"
+  ]
 }