Fix LambDynamicLights translation strings

- Fix modmenu compat
- Better Puzzle settings button based on MidnightLib
- Partially fix puzzle-splashscreen

build.gradle

@@ -101,7 +101,24 @@ repositories {
         name = "TerraformersMC"
         url = "https://maven.terraformersmc.com/releases"
     }
-
+    maven {
+        name = 'AperLambda'
+        url = 'https://aperlambda.github.io/maven'
+    }
+    mavenCentral()
+    maven {
+        name 'Gegy'
+        url 'https://maven.gegy.dev'
+    }
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+    maven {
+        url "https://www.cursemaven.com"
+        content {
+            includeGroup "curse.maven"
+        }
+    }
 }
 
 dependencies {
@@ -109,6 +126,22 @@ dependencies {
     modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
+    modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
+    modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
+    modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+    modImplementation ("maven.modrinth:iris:${project.iris_version}")
+    modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
+    modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
+    modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
+    modImplementation "curse.maven:custom-entity-models-cem-477078:3440846"
+
+    modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
+        exclude group: 'com.google.code.gson'
+        exclude group: 'com.google.guava'
+    }
+    modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+    include "maven.modrinth:midnightlib:${project.midnightlib_version}"
 
     subprojects.each {
         api project(path: ":${it.name}", configuration: "dev")
@@ -123,9 +156,7 @@ publishing {
                 builtBy(remapJar)
             }
             pom.withXml {
-                def depsNode = asNode().appendNode("dependencies")
                 subprojects.each {
-                    def depNode = depsNode.appendNode("dependency")
                     depNode.appendNode("groupId", it.group)
                     depNode.appendNode("artifactId", it.name)
                     depNode.appendNode("version", it.version)

gradle.properties

@@ -3,22 +3,26 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17-rc1
-    yarn_mappings=1.17-rc1+build.1
-    loader_version=0.11.3
+	minecraft_version=1.17.1
+	yarn_mappings=1.17.1+build.61
+	loader_version=0.11.7
 
 # Mod Properties
-	mod_version = 0.3.0
-	maven_group = eu.midnightdust
+	mod_version = 1.1.0
+	maven_group = net.puzzlemc
 	archives_base_name = puzzle
 
 # 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-beta.7
+	fabric_version=0.40.1+1.17
+	mod_menu_version = 2.0.13
 	
-	cull_leaves_version = 2.2.0
-	ldl_version = 2.0.0+21w20a
-	lbg_version = 1.1.2+21w20a
-	iris_version = v0.4.0
-	ctmf_version = v0.4.0
+	cull_leaves_version = 2.3.0
+	ldl_version = 2.1.0+1.17
+	lbg_version = 1.2.1+1.17
+	iris_version = mc1.17.1-1.1.2
+	continuity_version = 1.0.0+1.17
+	animatica_version = 0.1+1.17
+	cit_resewn_version = 0.8.1
+	spruceui_version=3.3.0+1.17
+	midnightlib_version=0.3.1

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.3-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,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" "$@"

puzzle-base/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java

@@ -1,376 +0,0 @@
-package eu.midnightdust.lib.config;
-
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-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.resource.language.I18n;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.*;
-import net.minecraft.util.Formatting;
-
-import java.lang.annotation.*;
-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.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
- *  Credits to Minenash */
-
-@SuppressWarnings("unchecked")
-public class MidnightConfig {
-    public static boolean useTooltipForTitle = true; // Render title as tooltip or as simple text
-
-    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 List<EntryInfo> entries = new ArrayList<>();
-
-    protected static class EntryInfo {
-        Field field;
-        Object widget;
-        int width;
-        Map.Entry<TextFieldWidget,Text> error;
-        Object defaultValue;
-        Object value;
-        String tempValue;
-        boolean inLimits = true;
-        String id;
-    }
-
-    public static final Map<String,Class<?>> configClass = new HashMap<>();
-    private static Path path;
-
-    private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
-
-    public static void init(String modid, Class<?> config) {
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
-        configClass.put(modid, config);
-
-        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))
-                try {
-                    info.defaultValue = field.get(null);
-                } catch (IllegalAccessException ignored) {}
-        }
-        try { gson.fromJson(Files.newBufferedReader(path), config); }
-        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) {
-                }
-        }
-    }
-    @Environment(EnvType.CLIENT)
-    public 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);
-                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 -> {
-                    int index = values.indexOf(info.value) + 1;
-                    info.value = values.get(index >= values.size()? 0 : index);
-                    button.setMessage(func.apply(info.value));
-                }, func);
-            }
-        entries.add(info);
-    }
-
-    private static void textField(EntryInfo info, Function<String,Number> f, Pattern pattern, double min, double max, boolean cast) {
-        boolean isNumber = pattern != null;
-        info.widget = (BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) (t, b) -> s -> {
-            s = s.trim();
-            if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches())) return false;
-
-            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 ?
-                        "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
-                        "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
-            }
-
-            info.tempValue = s;
-            t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777);
-            info.inLimits = inLimits;
-            b.active = entries.stream().allMatch(e -> e.inLimits);
-
-            if (inLimits)
-                info.value = isNumber? value : s;
-
-            return true;
-        };
-    }
-
-    public static void write(String modid) {
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
-        try {
-            if (!Files.exists(path)) Files.createFile(path);
-            Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Environment(EnvType.CLIENT)
-    public static Screen getScreen(Screen parent, String modid) {
-        return new TinyConfigScreen(parent, modid);
-    }
-
-    @Environment(EnvType.CLIENT)
-    private static class TinyConfigScreen extends Screen {
-
-        protected TinyConfigScreen(Screen parent, String modid) {
-            super(new TranslatableText(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;
-
-        // Real Time config update //
-        @Override
-        public void tick() {
-            for (EntryInfo info : entries)
-                try { info.field.set(null, info.value); }
-                catch (IllegalAccessException ignored) {}
-        }
-
-        @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) {
-                        }
-                    }
-                }
-                Objects.requireNonNull(client).openScreen(parent);
-            }));
-
-            ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
-                for (EntryInfo info : entries)
-                    if (info.id.equals(modid)) {
-                        try {
-                            info.field.set(null, info.value);
-                        } catch (IllegalAccessException ignored) {}
-                    }
-                write(modid);
-                Objects.requireNonNull(client).openScreen(parent);
-            }));
-
-            this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
-            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 -> {
-                        info.value = info.defaultValue;
-                        info.tempValue = info.value.toString();
-                        double scrollAmount = list.getScrollAmount();
-                        Objects.requireNonNull(client).openScreen(this);
-                        list.setScrollAmount(scrollAmount);
-                    }));
-
-                    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);
-                    } else if (info.widget != null) {
-                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, info.width, 20, null);
-
-                        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);
-                    } else {
-                        ButtonWidget dummy = new ButtonWidget(-10, 0, 0, 0, Text.of(""), null);
-                        this.list.addButton(dummy,dummy,name);
-                    }
-                }
-            }
-
-        }
-        @Override
-        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);
-
-            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());
-                        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));
-                            renderTooltip(matrices, list, mouseX, mouseY);
-                        }
-                    }
-                }
-            }
-            super.render(matrices,mouseX,mouseY,delta);
-        }
-    }
-    @Environment(EnvType.CLIENT)
-    public static class MidnightConfigListWidget extends ElementListWidget<MidnightConfig.ButtonEntry> {
-        TextRenderer textRenderer;
-
-        public MidnightConfigListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
-            super(minecraftClient, i, j, k, l, m);
-            this.centerListVertically = false;
-            textRenderer = minecraftClient.textRenderer;
-        }
-        @Override
-        public int getScrollbarPositionX() { return this.width -7; }
-
-        public void addButton(ClickableWidget button, ClickableWidget resetButton, Text text) {
-            this.addEntry(ButtonEntry.create(button, text, resetButton));
-        }
-        @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);
-                    }
-                }
-            }
-            return Optional.empty();
-        }
-    }
-    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 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);
-        }
-        public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget resetButton) {
-            return new ButtonEntry(button, text, resetButton);
-        }
-        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;
-        }
-    }
-    @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;
-    }
-    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {}
-
-    public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
-        public boolean shouldSkipClass(Class<?> clazz) { return false; }
-        public boolean shouldSkipField(FieldAttributes fieldAttributes) {
-            return fieldAttributes.getAnnotation(Entry.class) == null;
-        }
-    }
-}

puzzle-base/src/main/java/net/puzzlemc/core/PuzzleCore.java

@@ -6,13 +6,13 @@ import net.fabricmc.api.ClientModInitializer;
 
 public class PuzzleCore implements ClientModInitializer {
 
-    public final static String version = "Puzzle A1";
+    public final static String version = "Puzzle R1";
     public final static String name = "Puzzle";
     public final static String id = "puzzle";
-    public final static String website = "https://github.com/TeamMidnightDust/Puzzle";
+    public final static String website = "https://github.com/PuzzleMC/Puzzle";
     public static String updateURL = website; //+"download";
 
-    public final static String UPDATE_URL = "https://raw.githubusercontent.com/TeamMidnightDust/Puzzle/1.17/puzzle_versions.json";
+    public final static String UPDATE_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle/1.17/puzzle_versions.json";
 
     @Override
     public void onInitializeClient() {

puzzle-base/src/main/java/net/puzzlemc/core/config/MidnightConfigLite.java

@@ -0,0 +1,69 @@
+package net.puzzlemc.core.config;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import net.fabricmc.loader.api.FabricLoader;
+
+import java.lang.annotation.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+
+// MidnightConfigLite v0.2.0
+// Just writing and parsing of config files
+
+/** Based on https://github.com/Minenash/TinyConfig
+ *  Credits to Minenash */
+
+public class MidnightConfigLite {
+
+    protected static class EntryInfo {
+        Object defaultValue;
+    }
+
+    public static final Map<String,Class<?>> configClass = new HashMap<>();
+    private static Path path;
+
+    private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
+
+    public static void init(String modid, Class<?> config) {
+        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
+        configClass.put(modid, config);
+
+        for (Field field : config.getFields()) {
+            EntryInfo info = new EntryInfo();
+            if (field.isAnnotationPresent(Entry.class))
+                try {
+                    info.defaultValue = field.get(null);
+                } catch (IllegalAccessException ignored) {}
+        }
+        try { gson.fromJson(Files.newBufferedReader(path), config); }
+        catch (Exception e) { write(modid); }
+    }
+
+    public static void write(String modid) {
+        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
+        try {
+            if (!Files.exists(path)) Files.createFile(path);
+            Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.FIELD)
+    public @interface Entry {
+    }
+
+    public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
+        public boolean shouldSkipClass(Class<?> clazz) { return false; }
+        public boolean shouldSkipField(FieldAttributes fieldAttributes) {
+            return fieldAttributes.getAnnotation(Entry.class) == null;
+        }
+    }
+}

puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java

@@ -1,8 +1,6 @@
 package net.puzzlemc.core.config;
 
-import eu.midnightdust.lib.config.MidnightConfig;
-
-public class PuzzleConfig extends MidnightConfig {
+public class PuzzleConfig extends MidnightConfigLite {
     @Entry public static boolean debugMessages = false;
 
     @Entry public static boolean checkUpdates = true;

puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java

@@ -58,14 +58,14 @@ public class MixinTitleScreen extends Screen {
         if (open) {
             Util.getOperatingSystem().open(PuzzleCore.updateURL);
         }
-        Objects.requireNonNull(this.client).openScreen(this);
+        Objects.requireNonNull(this.client).setScreen(this);
     }
 
     @Inject(at = @At("HEAD"), method = "mouseClicked",cancellable = true)
     private void puzzle$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
         if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - 20) && mouseY < (double)this.height-10) {
             if (Objects.requireNonNull(this.client).options.chatLinksPrompt) {
-                this.client.openScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
+                this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
             } else {
                 Util.getOperatingSystem().open(PuzzleCore.updateURL);
             }

puzzle-base/src/main/resources/fabric.mod.json

@@ -6,8 +6,8 @@
   "name": "Puzzle",
   "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
   "authors": [
-    "Motschen",
-    "TeamMidnightDust"
+    "PuzzleMC",
+    "Motschen"
   ],
   "contact": {
     "homepage": "https://www.midnightdust.eu/",
@@ -26,7 +26,7 @@
   },
   "custom": {
     "modmenu": {
-      "parent": "puzzle-core"
+      "parent": "puzzle"
     }
   },
 

puzzle-blocks/src/main/resources/fabric.mod.json

@@ -6,8 +6,8 @@
   "name": "Puzzle Blocks",
   "description": "Lets resourcepacks change render layers of blocks",
   "authors": [
-    "Motschen",
-    "TeamMidnightDust"
+    "PuzzleMC",
+    "Motschen"
   ],
   "contact": {
     "homepage": "https://www.midnightdust.eu/",

puzzle-gui/build.gradle

@@ -7,8 +7,18 @@ repositories {
 		url = 'https://aperlambda.github.io/maven'
 	}
 	mavenCentral()
-	flatDir {
-		dirs 'local_maven'
+	maven {
+		name 'Gegy'
+		url 'https://maven.gegy.dev'
+	}
+	maven {
+		url = "https://api.modrinth.com/maven"
+	}
+	maven {
+		url "https://www.cursemaven.com"
+		content {
+			includeGroup "curse.maven"
+		}
 	}
 }
 
@@ -16,18 +26,22 @@ dependencies {
 	api project(":puzzle-base")
 	api project(":puzzle-splashscreen")
 
-	api ("com.terraformersmc:modmenu:${project.mod_menu_version}")
-	modImplementation ("eu.midnightdust:cullleaves:${project.cull_leaves_version}")
-	modImplementation ("dev.lambdaurora:lambdynamiclights:${project.ldl_version}")
-	modImplementation ("dev.lambdaurora:lambdabettergrass:${project.lbg_version}")
- 	modImplementation ("com.github.IrisShaders:Iris:${project.iris_version}")
+	modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
+	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+
+	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
+	modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
+	modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
+	modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+ 	modImplementation ("maven.modrinth:iris:${project.iris_version}")
+	modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
+	modImplementation "curse.maven:custom-entity-models-cem-477078:3440846"
 
-	//modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}" // Needed for Lambda's mods
 	modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
 		exclude group: 'com.google.code.gson'
 		exclude group: 'com.google.guava'
 	}
-// 	modImplementation ("com.github.PepperCode1:ConnectedTexturesMod-Fabric:${project.ctmf_version}") {
-//         exclude module: "modmenu"
-// 	}
+ 	modImplementation ("maven.modrinth:continuity:${project.continuity_version}") {
+         exclude module: "modmenu"
+ 	}
 } 

puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java

@@ -5,6 +5,7 @@ import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
 import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
 import dev.lambdaurora.lambdynlights.LambDynLights;
 import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import me.pepperbell.continuity.client.config.ContinuityConfig;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 import net.fabricmc.api.ClientModInitializer;
@@ -14,8 +15,8 @@ import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-//import team.chisel.ctm.client.CTMClient;
-//import team.chisel.ctm.client.config.ConfigManager;
+import shcm.shsupercm.fabric.citresewn.CITResewn;
+import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
 
 public class PuzzleClient implements ClientModInitializer {
 
@@ -79,25 +80,26 @@ public class PuzzleClient implements ClientModInitializer {
             DynamicLightsConfig ldlConfig = LambDynLights.get().config;
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.entities")), (button) -> button.setMessage(ldlConfig.hasEntitiesLightSource() ? YES : NO), (button) -> ldlConfig.setEntitiesLightSource(!ldlConfig.hasEntitiesLightSource())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.block_entities")), (button) -> button.setMessage(ldlConfig.hasBlockEntitiesLightSource() ? YES : NO), (button) -> ldlConfig.setBlockEntitiesLightSource(!ldlConfig.hasBlockEntitiesLightSource())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.water_sensitive")), (button) -> button.setMessage(ldlConfig.hasWaterSensitiveCheck() ? YES : NO), (button) -> ldlConfig.setWaterSensitiveCheck(!ldlConfig.hasWaterSensitiveCheck())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
+        }
+        if (FabricLoader.getInstance().isModLoaded("continuity")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
+            ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.disable_ctm"), (button) -> button.setMessage(contConfig.disableCTM.get() ? YES : NO), (button) -> {
+                contConfig.disableCTM.set(!contConfig.disableCTM.get());
+                contConfig.onChange();
+                contConfig.save();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.use_manual_culling"), (button) -> button.setMessage(contConfig.useManualCulling.get() ? YES : NO), (button) -> {
+                contConfig.useManualCulling.set(!contConfig.useManualCulling.get());
+                contConfig.onChange();
+                contConfig.save();
+            }));
         }
-//        if (FabricLoader.getInstance().isModLoaded("ctm")) {
-//            PuzzleApi.addToTextureOptions(new PuzzleWidget(Text.of("ConnectedTexturesMod for Fabric")));
-//            ConfigManager ctmfConfigManager = CTMClient.getConfigManager();
-//            ConfigManager.Config ctmfConfig = CTMClient.getConfigManager().getConfig();
-//            PuzzleApi.addToTextureOptions(new PuzzleWidget(new TranslatableText("puzzle.option.ctm"), (button) -> button.setMessage(ctmfConfig.disableCTM ? NO : YES), (button) -> {
-//                ctmfConfig.disableCTM = !ctmfConfig.disableCTM;
-//                ctmfConfigManager.onConfigChange();
-//            }));
-//            PuzzleApi.addToTextureOptions(new PuzzleWidget(new TranslatableText("puzzle.option.inside_ctm"), (button) -> button.setMessage(ctmfConfig.connectInsideCTM ? YES : NO), (button) -> {
-//                ctmfConfig.connectInsideCTM = !ctmfConfig.connectInsideCTM;
-//                ctmfConfigManager.onConfigChange();
-//            }));
-//        }
 
         if (FabricLoader.getInstance().isModLoaded("lambdabettergrass")) {
             LBGConfig lbgConfig = LambdaBetterGrass.get().config;
@@ -106,4 +108,63 @@ public class PuzzleClient implements ClientModInitializer {
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
         }
     }
+    public static boolean citInitialized = false;
+    public static void initCITResewn() { // CITResewn is initialized after Puzzle, so we can't access it in our ClientModInitializer
+        if (!citInitialized && FabricLoader.getInstance().isModLoaded("citresewn") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
+            CITResewnConfig citConfig = CITResewnConfig.INSTANCE();
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
+                citConfig.enabled = !citConfig.enabled;
+                citConfig.write();
+                MinecraftClient.getInstance().reloadResources();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? YES : NO), (button) -> {
+                citConfig.mute_errors = !citConfig.mute_errors;
+                citConfig.write();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? YES : NO), (button) -> {
+                citConfig.mute_warns = !citConfig.mute_warns;
+                citConfig.write();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? YES : NO), (button) -> {
+                citConfig.broken_paths = !citConfig.broken_paths;
+                citConfig.write();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,new TranslatableText("config.citresewn.cache_ms.title"), (slider) -> slider.setInt(citConfig.cache_ms),
+                    (button) -> button.setMessage(message(citConfig)),
+                    (slider) -> {
+                try {
+                    citConfig.cache_ms = slider.getInt();
+                }
+                catch (NumberFormatException ignored) {}
+                citConfig.write();
+            }));
+            citInitialized = true;
+        }
+    }
+    public static Text message(CITResewnConfig config) {
+        int ticks = config.cache_ms;
+            if (ticks <= 1) {
+                return (new TranslatableText("config.citresewn.cache_ms.ticks." + ticks)).formatted(Formatting.AQUA);
+            } else {
+                Formatting color = Formatting.DARK_RED;
+                if (ticks <= 40) {
+                    color = Formatting.RED;
+                }
+
+                if (ticks <= 20) {
+                    color = Formatting.GOLD;
+                }
+
+                if (ticks <= 10) {
+                    color = Formatting.DARK_GREEN;
+                }
+
+                if (ticks <= 5) {
+                    color = Formatting.GREEN;
+                }
+
+                return (new TranslatableText("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
+            }
+    }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/config/ModMenuIntegration.java

@@ -1,28 +1,28 @@
 package net.puzzlemc.gui.config;
 
-import com.google.common.collect.ImmutableMap;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Environment(EnvType.CLIENT)
 public class ModMenuIntegration implements ModMenuApi {
 
-    // Used to set the config screen for all modules //
-//    @Override
-//    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
-//        Map<String, ConfigScreenFactory<?>> map = ImmutableMap.of();
-//        map.put("puzzle",PuzzleOptionsScreen::new);
-//        map.put("puzzle-gui",PuzzleOptionsScreen::new);
-//        map.put("puzzle-blocks",PuzzleOptionsScreen::new);
-//        map.put("puzzle-base",PuzzleOptionsScreen::new);
-//        map.put("puzzle-models",PuzzleOptionsScreen::new);
-//        map.put("puzzle-randomentities",PuzzleOptionsScreen::new);
-//        map.put("puzzle-splashscreen",PuzzleOptionsScreen::new);
-//        return map;
-//    }
+     //Used to set the config screen for all modules //
+    @Override
+    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
+        Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
+        map.put("puzzle",PuzzleOptionsScreen::new);
+        map.put("puzzle-gui",PuzzleOptionsScreen::new);
+        map.put("puzzle-blocks",PuzzleOptionsScreen::new);
+        map.put("puzzle-base",PuzzleOptionsScreen::new);
+        map.put("puzzle-models",PuzzleOptionsScreen::new);
+        map.put("puzzle-randomentities",PuzzleOptionsScreen::new);
+        map.put("puzzle-splashscreen",PuzzleOptionsScreen::new);
+        return map;
+    }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java

@@ -1,9 +1,11 @@
 package net.puzzlemc.gui.mixin;
 
+import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
+import net.minecraft.util.Identifier;
+import net.puzzlemc.gui.PuzzleClient;
 import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,15 +17,14 @@ import java.util.Objects;
 
 @Mixin(OptionsScreen.class)
 public class MixinOptionsScreen extends Screen {
+    private static final Identifier PUZZLE_ICON_TEXTURE = new Identifier(PuzzleClient.id, "textures/gui/puzzle_button.png");
 
     protected MixinOptionsScreen(Text title) {
         super(title);
     }
 
-    @Inject(at = @At("TAIL"),method = "init")
-    public void init(CallbackInfo ci) {
-        PuzzleOptionsScreen puzzleScreen = new PuzzleOptionsScreen(this);
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20, new TranslatableText("puzzle.screen.title").append("..."), (button) -> Objects.requireNonNull(this.client).openScreen(puzzleScreen)));
+    @Inject(at = @At("HEAD"), method = "init")
+    private void midnightlib$init(CallbackInfo ci) {
+            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), new TranslatableText("midnightlib.overview.title")));
     }
-
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/IrisButton.java

@@ -11,8 +11,7 @@ import java.util.Objects;
 public class IrisButton extends DrawableHelper {
     public static ButtonWidget getButton(int x, int y, int width, int height, Screen parent, MinecraftClient client) {
         ShaderPackScreen shaderPackPage = new ShaderPackScreen(parent);
-        return new ButtonWidget(x, y, width, height, shaderPackPage.getTitle().copy().append("..."), (button) -> {
-            Objects.requireNonNull(client).openScreen(shaderPackPage);
-        });
+        return new ButtonWidget(x, y, width, height, shaderPackPage.getTitle().copy().append("..."), (button) ->
+                Objects.requireNonNull(client).setScreen(shaderPackPage));
     }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java

@@ -1,6 +1,8 @@
 package net.puzzlemc.gui.screen;
 
 import net.fabricmc.loader.api.FabricLoader;
+import net.puzzlemc.gui.PuzzleApi;
+import net.puzzlemc.gui.PuzzleClient;
 import net.puzzlemc.gui.screen.page.GraphicsPage;
 import net.puzzlemc.gui.screen.page.MiscPage;
 import net.puzzlemc.gui.screen.page.PerformancePage;
@@ -24,19 +26,20 @@ public class PuzzleOptionsScreen extends Screen {
     @Override
     protected void init() {
         super.init();
+        PuzzleClient.initCITResewn();
         GraphicsPage graphicsPage = new GraphicsPage(this);
         MiscPage miscPage = new MiscPage(this);
         PerformancePage performancePage = new PerformancePage(this);
         ResourcesPage resourcesPage = new ResourcesPage(this);
 
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, graphicsPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(graphicsPage)));
-        this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, resourcesPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(resourcesPage)));
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, performancePage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(performancePage)));
-        this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, miscPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(miscPage)));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, graphicsPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(graphicsPage)));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, resourcesPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(resourcesPage)));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, performancePage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(performancePage)));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, miscPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(miscPage)));
         if (FabricLoader.getInstance().isModLoaded("iris")) {
             this.addDrawableChild(IrisButton.getButton(this.width / 2 - 155, this.height / 6 + 96 - 6, 150, 20, this, client));
         }
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).openScreen(parent)));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
     }
 
     @Override

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java

@@ -30,12 +30,13 @@ public abstract class AbstractPuzzleOptionsPage extends Screen {
 
         super.init();
 
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).openScreen(parent)));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
     }
 
     @Override
     public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         this.renderBackground(matrices);
+        if (client != null && client.world != null) this.list.setRenderBackground(false);
         this.list.render(matrices, mouseX, mouseY, delta);
 
         drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/DummyButtonWidget.java

@@ -1,10 +0,0 @@
-package net.puzzlemc.gui.screen.widget;
-
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
-
-public class DummyButtonWidget extends ButtonWidget {
-    public DummyButtonWidget() {
-        super(-1,-1,0,0,Text.of(""),null);
-    }
-}

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java

@@ -1,6 +1,5 @@
 package net.puzzlemc.gui.screen.widget;
 
-import com.google.common.collect.ImmutableMap;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
@@ -10,8 +9,8 @@ import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.ElementListWidget;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
@@ -33,13 +32,13 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
     public void addAll(List<PuzzleWidget> buttons) {
         for (PuzzleWidget button : buttons) {
             if (button.buttonType == ButtonType.TEXT) {
-                this.addButton(new DummyButtonWidget(), button.descriptionText);
+                this.addButton(null, button.descriptionText);
             } else if (button.buttonType == ButtonType.BUTTON) {
                 this.addButton(new PuzzleButtonWidget(this.width / 2 - 155 + 160, 0, 150, 20, button.buttonTextAction, button.onPress), button.descriptionText);
             } else if (button.buttonType == ButtonType.SLIDER) {
-                this.addButton(new PuzzleSliderWidget(button.min, button.max, this.width / 2 - 155 + 160, 0, 150, 20, ((TranslatableText) button.buttonText), 1), button.descriptionText);
+                this.addButton(new PuzzleSliderWidget(button.min, button.max, this.width / 2 - 155 + 160, 0, 150, 20, button.setSliderValue, button.buttonTextAction, button.changeSliderValue), button.descriptionText);
             } else if (button.buttonType == ButtonType.TEXT_FIELD) {
-                this.addButton(new PuzzleTextFieldWidget(textRenderer, this.width / 2 - 155 + 160, 0, 150, 20, null, button.buttonText), button.descriptionText);
+                this.addButton(new PuzzleTextFieldWidget(textRenderer, this.width / 2 - 155 + 160, 0, 150, 20, button.setTextValue, button.changeTextValue), button.descriptionText);
             } else
                 LogManager.getLogger("Puzzle").warn("Button " + button + " is missing the buttonType variable. This shouldn't happen!");
         }
@@ -50,41 +49,33 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
     }
 
     protected int getScrollbarPositionX() {
-        return super.getScrollbarPositionX() + 32;
-    }
-
-    public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
-        for (ButtonEntry buttonEntry : this.children()) {
-            for (ClickableWidget widget : buttonEntry.buttons) {
-                if (widget.isMouseOver(mouseX, mouseY)) {
-                    return Optional.of(widget);
-                }
-            }
-        }
-        return Optional.empty();
+        return super.getScrollbarPositionX() + 60;
     }
 
     public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
         private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        private final List<ClickableWidget> buttons;
-        private final Map<ClickableWidget, Text> buttonsWithText;
+        private List<ClickableWidget> buttons = new ArrayList<>();
+        private final ClickableWidget button;
+        private final Text text;
 
-        private ButtonEntry(ImmutableMap<ClickableWidget, Text> buttons) {
-            this.buttons = buttons.keySet().asList();
-            this.buttonsWithText = buttons;
+        private ButtonEntry(ClickableWidget button, Text text) {
+            if (button != null)
+            this.buttons.add(button);
+            this.button = button;
+            this.text = text;
         }
 
         public static ButtonEntry create(ClickableWidget button, Text text) {
-            return new ButtonEntry(ImmutableMap.of(button, text));
+            return new ButtonEntry(button, text);
         }
 
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            this.buttonsWithText.forEach((button, text) -> {
+            if (button != null) {
                 button.y = y;
                 button.render(matrices, mouseX, mouseY, tickDelta);
-                if (button instanceof DummyButtonWidget) drawCenteredText(matrices,textRenderer, text,x + 200,y+5,0xFFFFFF);
-                else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
-            });
+            }
+            if (button == null) drawCenteredText(matrices,textRenderer, new LiteralText("－－－－－－ ").append(text).append(" －－－－－－"),x + 200,y+5,0xFFFFFF);
+            else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
         }
 
         public List<? extends Element> children() {
@@ -92,8 +83,8 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
         }
 
         @Override
-        public List<? extends Selectable> method_37025() {
-            return null;
+        public List<? extends Selectable> selectableChildren() {
+            return buttons;
         }
     }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleSliderWidget.java

@@ -1,29 +1,41 @@
 package net.puzzlemc.gui.screen.widget;
 
 import net.minecraft.client.gui.widget.SliderWidget;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 
 public class PuzzleSliderWidget extends SliderWidget {
     private final int min;
-    private final double difference;
+    private final int max;
+    private final PuzzleWidget.TextAction setTextAction;
+    private final PuzzleWidget.ChangeSliderValueAction changeAction;
+
+    public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, PuzzleWidget.SetSliderValueAction setValueAction, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
+        super(x,y,width,height,Text.of(""),0);
 
-    public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, TranslatableText label, double value) {
-        super(x,y,width,height,label,value);
-        this.updateMessage();
         this.min = min;
-        this.difference = max - min;
+        this.max = max;
+
+        setValueAction.setSliderValue(this);
+        this.setTextAction = setTextAction;
+        this.changeAction = changeAction;
+        this.updateMessage();
+    }
+    public int getInt() {
+        int difference = max - min;
+        int r = (int) (value * difference);
+        return r + min;
+    }
+    public void setInt(int v) {
+        value = value / v - value * min;
     }
 
     @Override
     protected void updateMessage() {
-        Text text = new LiteralText((int) (min + this.value * difference) + "");
-        this.setMessage(new TranslatableText("label").append(": ").append(text));
+        this.setTextAction.setTitle(this);
     }
 
     @Override
     protected void applyValue() {
-
+        this.changeAction.onChange(this);
     }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleTextFieldWidget.java

@@ -3,13 +3,21 @@ package net.puzzlemc.gui.screen.widget;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import org.jetbrains.annotations.Nullable;
 
 public class PuzzleTextFieldWidget extends TextFieldWidget {
-    private TranslatableText label;
+    private final PuzzleWidget.SetTextValueAction setValueAction;
+    private final PuzzleWidget.ChangeTextValueAction change;
 
-    public PuzzleTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, @Nullable TextFieldWidget copyFrom, Text text) {
-        super(textRenderer, x, y, width, height, text);
+    public PuzzleTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, PuzzleWidget.SetTextValueAction setValue, PuzzleWidget.ChangeTextValueAction change) {
+        super(textRenderer, x, y, width, height, Text.of(""));
+        this.setValueAction = setValue;
+        this.change = change;
+        setValueAction.setTextValue(this);
+    }
+    @Override
+    public void write(String text) {
+        super.write(text);
+        this.change.onChange(this);
+        setValueAction.setTextValue(this);
     }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleWidget.java

@@ -4,6 +4,8 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 
@@ -15,7 +17,10 @@ public class PuzzleWidget {
     public Text buttonText;
     public TextAction buttonTextAction;
     public ButtonWidget.PressAction onPress;
-    public PuzzleWidget.SaveAction onSave;
+    public PuzzleWidget.SetTextValueAction setTextValue;
+    public PuzzleWidget.SetSliderValueAction setSliderValue;
+    public PuzzleWidget.ChangeTextValueAction changeTextValue;
+    public PuzzleWidget.ChangeSliderValueAction changeSliderValue;
 
     /**
      * Puzzle Text Widget Container
@@ -41,24 +46,39 @@ public class PuzzleWidget {
     /**
      * Puzzle Slider Widget Container (WIP - Doesn't work)
      */
-    public PuzzleWidget(int min, int max, Text descriptionText, TranslatableText buttonText) {
+    public PuzzleWidget(int min, int max, Text descriptionText, PuzzleWidget.SetSliderValueAction setValueAction, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
         this.buttonType = ButtonType.SLIDER;
         this.min = min;
         this.max = max;
         this.descriptionText = descriptionText;
-        this.buttonText = buttonText;
+        this.setSliderValue = setValueAction;
+        this.buttonTextAction = setTextAction;
+        this.changeSliderValue = changeAction;
     }
     /**
      * Puzzle Text Field Widget Container (WIP - Doesn't work)
      */
-    public PuzzleWidget(Text descriptionText, Text buttonText) {
+    public PuzzleWidget(Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction, int a) {
         this.buttonType = ButtonType.TEXT_FIELD;
         this.descriptionText = descriptionText;
-        this.buttonText = buttonText;
+        this.setTextValue = setValue;
+        this.changeTextValue = changeAction;
     }
     @Environment(EnvType.CLIENT)
-    public interface SaveAction {
-        void onSave(ClickableWidget button);
+    public interface ChangeTextValueAction {
+        void onChange(TextFieldWidget textField);
+    }
+    @Environment(EnvType.CLIENT)
+    public interface ChangeSliderValueAction {
+        void onChange(PuzzleSliderWidget slider);
+    }
+    @Environment(EnvType.CLIENT)
+    public interface SetTextValueAction {
+        void setTextValue(TextFieldWidget textField);
+    }
+    @Environment(EnvType.CLIENT)
+    public interface SetSliderValueAction {
+        void setSliderValue(PuzzleSliderWidget slider);
     }
     @Environment(EnvType.CLIENT)
     public interface TextAction {

puzzle-gui/src/main/resources/fabric.mod.json

@@ -6,8 +6,8 @@
   "name": "Puzzle GUI",
   "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
   "authors": [
-    "Motschen",
-    "TeamMidnightDust"
+    "PuzzleMC",
+    "Motschen"
   ],
   "contact": {
     "homepage": "https://www.midnightdust.eu/",

puzzle-models/src/main/resources/fabric.mod.json

@@ -6,8 +6,8 @@
   "name": "Puzzle Models",
   "description": "Provides more freedom for item and block models!",
   "authors": [
-    "Motschen",
-    "TeamMidnightDust"
+    "PuzzleMC",
+    "Motschen"
   ],
   "contact": {
     "homepage": "https://www.midnightdust.eu/",

puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java

@@ -1,9 +1,9 @@
 package net.puzzlemc.splashscreen;
 
 import net.fabricmc.api.ClientModInitializer;
+import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.core.util.ColorUtil;
-import net.puzzlemc.splashscreen.util.ConfigTexture;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
@@ -22,6 +22,7 @@ import org.apache.logging.log4j.LogManager;
 
 import java.awt.*;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -90,9 +91,13 @@ public class PuzzleSplashScreen implements ClientModInitializer {
                     }
                     for (Identifier id : manager.findResources("textures", path -> path.contains("mojangstudios.png"))) {
                         try (InputStream stream = manager.getResource(id).getInputStream()) {
-                            //LogManager.getLogger().info("Logo copied to cache!");
                             Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
-                            client.getTextureManager().registerTexture(LOGO, new ConfigTexture(LOGO));
+                            DefaultResourcePack defaultResourcePack = client.getResourcePackProvider().getPack();
+                            InputStream defaultLogo = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
+                            InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
+                            if (input != defaultLogo)
+                            client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
+                            else Files.delete(LOGO_TEXTURE);
                         } catch (Exception e) {
                             LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
                         }

puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java

@@ -1,13 +1,17 @@
 package net.puzzlemc.splashscreen.mixin;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.SplashScreen;
+import net.minecraft.client.gui.screen.Overlay;
+import net.minecraft.client.gui.screen.SplashOverlay;
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-import net.puzzlemc.splashscreen.util.ConfigTexture;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -16,37 +20,66 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(value = SplashScreen.class, priority = 2000)
-public class MixinSplashScreen {
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+@Mixin(value = SplashOverlay.class, priority = 2000)
+public abstract class MixinSplashScreen extends Overlay {
     @Shadow @Final static Identifier LOGO;
-    @Shadow @Final private boolean reloading;
-    @Shadow private long reloadStartTime;
     @Shadow private long reloadCompleteTime;
 
-    @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL"), cancellable=true)
-    private static void init(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
-        if (PuzzleConfig.resourcepackSplashScreen && PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) client.getTextureManager().registerTexture(LOGO, new ConfigTexture(LOGO));
-    }
-    @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashScreen;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5)
-    private int modifyBackgroundColor(int color) { // Set the Background Color to our configured value //
-        long l = Util.getMeasuringTimeMs();
-        if (this.reloading && this.reloadStartTime == -1L) {
-            this.reloadStartTime = l;
-        }
+    @Shadow @Final private MinecraftClient client;
 
+    @Shadow private long reloadStartTime;
+
+    @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL"))
+    private static void init(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
+        if (PuzzleConfig.resourcepackSplashScreen && PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
+            try {
+                InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
+                client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
+            } catch (IOException ignored) {}
+        }
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", shift = At.Shift.AFTER, ordinal = 0))
+    private void modifyBackgroundColor(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
+        long l = Util.getMeasuringTimeMs();
         float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
         int m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F);
-
-        return PuzzleConfig.backgroundColor | m << 24;
+        if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965)
+        fill(matrices, 0, 0, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight(), withAlpha(PuzzleConfig.backgroundColor, m));
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", shift = At.Shift.AFTER, ordinal = 1))
+    private void modifyBackgroundColor2(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
+        long l = Util.getMeasuringTimeMs();
+        float g = this.reloadStartTime > -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F;
+        int m = MathHelper.ceil(MathHelper.clamp((double)g, 0.15D, 1.0D) * 255.0D);
+        if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965)
+            fill(matrices, 0, 0, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight(), withAlpha(PuzzleConfig.backgroundColor, m));
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_clear(IZ)V", shift = At.Shift.AFTER))
+    private void modifyBackgroundColor3(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
+        if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965) {
+            int m = PuzzleConfig.backgroundColor;
+            float p = (float) (m >> 16 & 255) / 255.0F;
+            float q = (float) (m >> 8 & 255) / 255.0F;
+            float r = (float) (m & 255) / 255.0F;
+            GlStateManager._clearColor(p, q, r, 1.0F);
+            GlStateManager._clear(16384, MinecraftClient.IS_SYSTEM_MAC);
+        }
     }
 
-    @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashScreen;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5)
+    @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5)
     private int modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value //
         return PuzzleConfig.progressFrameColor | 255 << 24;
     }
-    @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashScreen;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 4), index = 5)
+    @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 4), index = 5)
     private int modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value //
         return PuzzleConfig.progressBarColor | 255 << 24;
     }
+    private static int withAlpha(int color, int alpha) {
+        return color & 16777215 | alpha << 24;
+    }
 
 }

puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/util/ConfigTexture.java

@@ -1,38 +0,0 @@
-package net.puzzlemc.splashscreen.util;
-
-import net.minecraft.client.resource.metadata.TextureResourceMetadata;
-import net.minecraft.client.texture.NativeImage;
-import net.minecraft.client.texture.ResourceTexture;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.util.Identifier;
-import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ConfigTexture extends ResourceTexture {
-
-    // Load textures from the config directory //
-    public ConfigTexture(Identifier location) {
-        super(location);
-    }
-
-    protected TextureData loadTextureData(ResourceManager resourceManager) {
-        try {
-            InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
-            TextureData texture;
-
-            try {
-                texture = new TextureData(new TextureResourceMetadata(false, true), NativeImage.read(input));
-            } finally {
-                input.close();
-            }
-
-            return texture;
-        } catch (IOException var18) {
-            return new TextureData(var18);
-        }
-    }
-
-}

puzzle-splashscreen/src/main/resources/fabric.mod.json

@@ -6,8 +6,8 @@
   "name": "Puzzle Splash Screen",
   "description": "Allows resourcepacks to define a custom splash screen",
   "authors": [
-    "Motschen",
-    "TeamMidnightDust"
+    "PuzzleMC",
+    "Motschen"
   ],
   "contact": {
     "homepage": "https://www.midnightdust.eu/",

puzzle_versions.json

@@ -1,5 +1,5 @@
 {
-  "1.17-rc1": "Puzzle A1",
-  "1.17-rc2": "Puzzle A1",
-  "1.17": "Puzzle A1"
+  "1.17": "Puzzle R1",
+  "1.18-pre1": "Puzzle R1",
+  "1.18": "Puzzle R1"
 }