Fix LambDynamicLights translation strings

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

.gitignore

@@ -22,4 +22,7 @@ bin/
 
 # fabric
 
-run/
+run/
+
+# unfinished
+puzzle-randomentities/

build.gradle

@@ -1,106 +1,168 @@
+// Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
 plugins {
-	id 'fabric-loom' version '0.7-SNAPSHOT'
+    id "fabric-loom" version "0.8-SNAPSHOT" apply false
-	id 'maven-publish'
+    id "com.matthewprenger.cursegradle" version "1.4.0"
+    id "maven-publish"
+    id "java-library"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+group = "net.puzzlemc"
-targetCompatibility = JavaVersion.VERSION_1_8
+archivesBaseName = "puzzle"
 
-archivesBaseName = project.archives_base_name
+subprojects {
-version = project.mod_version
+    apply plugin: 'fabric-loom'
-group = project.maven_group
+    apply plugin: 'com.matthewprenger.cursegradle'
+    apply plugin: 'maven-publish'
+    apply plugin: 'java-library'
 
-minecraft {
+    archivesBaseName = project.name
+    group = "${rootProject.group}.${rootProject.archivesBaseName}"
+
+    //apply from: "https://raw.githubusercontent.com/OnyxStudios/Gradle-Scripts/master/scripts/fabric/basic_project.gradle"
 }
 
+allprojects {
+    apply plugin: "fabric-loom"
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16
+    version = System.getenv("TRAVIS_TAG") ?: rootProject.mod_version
+
+    configurations {
+        dev
+    }
+
+    repositories {
+        maven { url 'https://jitpack.io' }
+
+    }
+
+    dependencies {
+        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
+        modApi "net.fabricmc:fabric-loader:${rootProject.loader_version}"
+        modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
+    }
+
+    processResources {
+        inputs.property "version", project.version
+
+        filesMatching("fabric.mod.json") {
+            expand "version": project.version
+        }
+    }
+
+    // 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).configureEach {
+        it.options.encoding = "UTF-8"
+        it.options.release = 16
+    }
+
+    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 {
+    }
+
+     afterEvaluate {
+         artifacts {
+             dev file: file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar"), type: "jar", builtBy: sourcesJar
+         }
+     }
+}
+
+subprojects {
+    version = rootProject.version
+}
+
+sourceSets {
+    testmod {
+        compileClasspath += main.compileClasspath
+        runtimeClasspath += main.runtimeClasspath
+    }
+    test {
+        compileClasspath += main.compileClasspath
+        runtimeClasspath += main.runtimeClasspath
+    }
+}
+
+subprojects.each { remapJar.dependsOn("${it.path}:remapJar") }
+
 repositories {
-	maven { url "https://maven.shedaniel.me/" }
+    maven {
-	maven { url "https://jitpack.io" }
+        name = "JitPack"
-	maven { url "https://maven.terraformersmc.com/releases" }
+        url = "https://jitpack.io"
-	maven { url "https://aperlambda.github.io/maven" }
+    }
+    maven {
+        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 {
-	//to change the versions see the gradle.properties file
+    modImplementation "net.fabricmc.fabric-api:fabric-api:0.34.8+1.17"
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") {
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+        exclude group: "net.fabricmc.fabric-api"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_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 ("maven.modrinth:continuity:${project.continuity_version}")
+    modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
+    modImplementation "curse.maven:custom-entity-models-cem-477078:3440846"
 
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
-	
+        exclude group: 'com.google.code.gson'
-	modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
+        exclude group: 'com.google.guava'
-	modImplementation ("com.github.TeamMidnightDust:CullLeaves:${project.cull_leaves_version}"){
+    }
-		exclude module: "modmenu"
+    modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
-	}
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
-	modImplementation ("com.github.LambdAurora:LambDynamicLights:${project.ldl_version}") {
+    include "maven.modrinth:midnightlib:${project.midnightlib_version}"
-        exclude module: "modmenu"
+
-        exclude module: "sodium-fabric"
+    subprojects.each {
-	}
+        api project(path: ":${it.name}", configuration: "dev")
-	modImplementation ("com.github.LambdAurora:LambdaBetterGrass:${project.lbg_version}") {
+        include project(":${it.name}")
-        exclude module: "modmenu"
+    }
-	}
-	modImplementation ("com.github.IrisShaders:Iris:${project.iris_version}") {
-        exclude module: "modmenu"
-	}
-	modImplementation ("com.github.PepperCode1:ConnectedTexturesMod-Fabric:${project.ctmf_version}") {
-        exclude module: "modmenu"
-	}
-	modImplementation ("com.github.LambdAurora:LambdaControls:${project.lc_version}") {
-        exclude module: "modmenu"
-	}
 }
 
-processResources {
-	inputs.property "version", project.version
-
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
-}
-
-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 = 8
-}
-
-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") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
-}
-
-// configure the maven publication
 publishing {
-	publications {
+    publications {
-		mavenJava(MavenPublication) {
+        mavenJava(MavenPublication) {
-			// add all the jars that should be included when publishing to maven
+            artifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) {
-			artifact(remapJar) {
+                builtBy(remapJar)
-				builtBy remapJar
+            }
-			}
+            pom.withXml {
-			artifact(sourcesJar) {
+                subprojects.each {
-				builtBy remapSourcesJar
+                    depNode.appendNode("groupId", it.group)
-			}
+                    depNode.appendNode("artifactId", it.name)
-		}
+                    depNode.appendNode("version", it.version)
-	}
+                    depNode.appendNode("scope", "compile")
-
+                }
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+            }
-	repositories {
+        }
-		// 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

@@ -3,23 +3,26 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.5
+	minecraft_version=1.17.1
-	yarn_mappings=1.16.5+build.6
+	yarn_mappings=1.17.1+build.61
-	loader_version=0.11.3
+	loader_version=0.11.7
 
 # Mod Properties
-	mod_version = 0.2.0
+	mod_version = 1.1.0
-	maven_group = eu.midnightdust
+	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.32.5+1.16
+	fabric_version=0.40.1+1.17
-	mod_menu_version = 1.16.9
+	mod_menu_version = 2.0.13
 	
-	cull_leaves_version = 2.1.0
+	cull_leaves_version = 2.3.0
-	ldl_version = 1.3.4-1.16
+	ldl_version = 2.1.0+1.17
-	lbg_version = 1.0.3-1.16
+	lbg_version = 1.2.1+1.17
-	lc_version = 1.6.0-1.16
+	iris_version = mc1.17.1-1.1.2
-	iris_version = v0.4.0
+	continuity_version = 1.0.0+1.17
-	ctmf_version = v0.4.0
+	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"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 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
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  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
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        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" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --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
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+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" "$@"

gradlew.bat

@@ -1,89 +1,89 @@
-@rem
+@rem
-@rem Copyright 2015 the original author or authors.
+@rem Copyright 2015 the original author or authors.
-@rem
+@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
+@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
+@rem You may obtain a copy of the License at
-@rem
+@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
+@rem
-@rem Unless required by applicable law or agreed to in writing, software
+@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
+@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
+@rem limitations under the License.
-@rem
+@rem
-
+
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
+@rem ##########################################################################
-@rem
+@rem
-@rem  Gradle startup script for Windows
+@rem  Gradle startup script for Windows
-@rem
+@rem
-@rem ##########################################################################
+@rem ##########################################################################
-
+
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+if "%OS%"=="Windows_NT" setlocal
-
+
-set DIRNAME=%~dp0
+set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
+set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set APP_HOME=%DIRNAME%
-
+
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+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.
+@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"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
+
-@rem Find java.exe
+@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
+if defined JAVA_HOME goto findJavaFromJavaHome
-
+
-set JAVA_EXE=java.exe
+set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
+%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto execute
-
+
-echo.
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo location of your Java installation.
-
+
-goto fail
+goto fail
-
+
-:findJavaFromJavaHome
+:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
+
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto execute
-
+
-echo.
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo location of your Java installation.
-
+
-goto fail
+goto fail
-
+
-:execute
+:execute
-@rem Setup the command line
+@rem Setup the command line
-
+
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
+
-
+
-@rem Execute Gradle
+@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
+
-:end
+:end
-@rem End local scope for the variables with windows NT shell
+@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
-
+
-:fail
+:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
+rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+exit /b 1
-
+
-:mainEnd
+:mainEnd
-if "%OS%"=="Windows_NT" endlocal
+if "%OS%"=="Windows_NT" endlocal
-
+
-:omega
+:omega

puzzle-base/build.gradle

@@ -0,0 +1,3 @@
+archivesBaseName = "puzzle-base"
+dependencies {
+}

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

@@ -0,0 +1,22 @@
+package net.puzzlemc.core;
+
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.core.util.UpdateChecker;
+import net.fabricmc.api.ClientModInitializer;
+
+public class PuzzleCore implements ClientModInitializer {
+
+    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/PuzzleMC/Puzzle";
+    public static String updateURL = website; //+"download";
+
+    public final static String UPDATE_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle/1.17/puzzle_versions.json";
+
+    @Override
+    public void onInitializeClient() {
+        PuzzleConfig.init(id, PuzzleConfig.class);
+        if (PuzzleConfig.checkUpdates) UpdateChecker.init();
+    }
+}

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

@@ -0,0 +1,17 @@
+package net.puzzlemc.core.config;
+
+public class PuzzleConfig extends MidnightConfigLite {
+    @Entry public static boolean debugMessages = false;
+
+    @Entry public static boolean checkUpdates = true;
+    @Entry public static boolean showPuzzleInfo = true;
+    @Entry public static boolean resourcepackSplashScreen = true;
+    @Entry public static boolean randomEntityTextures = true;
+    @Entry public static boolean customRenderLayers = true;
+    @Entry public static boolean unlimitedRotations = true;
+    @Entry public static boolean biggerModels = true;
+
+    @Entry public static int backgroundColor = 15675965;
+    @Entry public static int progressBarColor = 16777215;
+    @Entry public static int progressFrameColor = 16777215;
+}

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

@@ -0,0 +1,38 @@
+package net.puzzlemc.core.mixin;
+
+import com.mojang.blaze3d.platform.GlDebugInfo;
+import net.puzzlemc.core.PuzzleCore;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.core.util.UpdateChecker;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.hud.DebugHud;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(DebugHud.class)
+public class MixinDebugHud extends DrawableHelper {
+    @Inject(at = @At("RETURN"), method = "getRightText", cancellable = true)
+    private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
+        if (PuzzleConfig.showPuzzleInfo) {
+            List<String> entries = cir.getReturnValue();
+            String message;
+            if (UpdateChecker.isUpToDate) {
+                message = "Puzzle is up to date (" + PuzzleCore.version + ")";
+            } else {
+                message = "Puzzle is outdated (" + PuzzleCore.version + " -> " + UpdateChecker.latestVersion + ")";
+            }
+            for (int i = 0; i < entries.size(); i++) {
+                String str = entries.get(i);
+
+                if (str.startsWith(GlDebugInfo.getVersion())) {
+                    entries.add(i + 1, message);
+                    break;
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+package net.puzzlemc.core.mixin;
+
+import net.puzzlemc.core.PuzzleCore;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.core.util.UpdateChecker;
+import net.minecraft.client.gui.screen.*;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.MathHelper;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Objects;
+
+@Mixin(TitleScreen.class)
+public class MixinTitleScreen extends Screen {
+
+    @Shadow @Final private boolean doBackgroundFade;
+    @Shadow private long backgroundFadeStart;
+    private Text puzzleText;
+    private int puzzleTextWidth;
+
+    protected MixinTitleScreen(Text title) {
+        super(title);
+    }
+    @Inject(at = @At("TAIL"), method = "init")
+    private void puzzle$init(CallbackInfo ci) {
+        if (UpdateChecker.isUpToDate) {
+            puzzleText = Text.of(PuzzleCore.version);
+        }
+        else {
+            puzzleText = new TranslatableText("").append(Text.of(PuzzleCore.version + " | ")).append(new TranslatableText("puzzle.text.update_available"));
+            this.puzzleTextWidth = this.textRenderer.getWidth(puzzleText);
+        }
+    }
+
+    @Inject(at = @At("TAIL"), method = "render")
+    private void puzzle$render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (PuzzleConfig.showPuzzleInfo) {
+            float f = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
+            float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F;
+            int l = MathHelper.ceil(g * 255.0F) << 24;
+            textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - 20, 16777215 | l);
+            if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - 20 && mouseY < this.height - 10) {
+                fill(matrices, 2, this.height - 11, 2 + this.puzzleTextWidth, this.height-10, 16777215 | l);
+            }
+        }
+    }
+
+    private void confirmLink(boolean open) {
+        if (open) {
+            Util.getOperatingSystem().open(PuzzleCore.updateURL);
+        }
+        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.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
+            } else {
+                Util.getOperatingSystem().open(PuzzleCore.updateURL);
+            }
+            cir.setReturnValue(false);
+        }
+    }
+}

puzzle-base/src/main/java/net/puzzlemc/core/util/ColorUtil.java

@@ -0,0 +1,17 @@
+package net.puzzlemc.core.util;
+
+import java.awt.*;
+
+public class ColorUtil {
+    /**
+     * @credit https://stackoverflow.com/questions/4129666/how-to-convert-hex-to-rgb-using-java
+     * @param colorStr e.g. "FFFFFF"
+     * @return
+     */
+    public static Color hex2Rgb(String colorStr) {
+        return new Color(
+                Integer.valueOf( colorStr.substring( 0, 2 ), 16 ),
+                Integer.valueOf( colorStr.substring( 2, 4 ), 16 ),
+                Integer.valueOf( colorStr.substring( 4, 6 ), 16 ));
+    }
+}

puzzle-base/src/main/java/net/puzzlemc/core/util/UpdateChecker.java

@@ -0,0 +1,55 @@
+package net.puzzlemc.core.util;
+
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import net.puzzlemc.core.PuzzleCore;
+import net.minecraft.client.MinecraftClient;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
+
+public class UpdateChecker {
+    private static final Gson GSON = new Gson();
+    private static final String minecraftVersion = MinecraftClient.getInstance().getGame().getVersion().getId();
+    public static final Logger logger = LogManager.getLogger(PuzzleCore.name);
+
+    public static final Type UPDATE_TYPE_TOKEN = new TypeToken<Map<String, String>>(){}.getType();
+    public static String latestVersion;
+    public static boolean isUpToDate = true;
+
+    public static void init() {
+        CompletableFuture.supplyAsync(() -> {
+            try (Reader reader = new InputStreamReader(new URL(PuzzleCore.UPDATE_URL).openStream())) {
+                return GSON.<Map<String, String>>fromJson(reader, UPDATE_TYPE_TOKEN);
+            } catch (MalformedURLException error) {
+                logger.log(Level.ERROR, "Unable to check for updates because of connection problems: " + error.getMessage());
+            } catch (IOException error) {
+                logger.log(Level.ERROR, "Unable to check for updates because of an I/O Exception: " + error.getMessage());
+            }
+
+            return null;
+        }).thenAcceptAsync(versionMap -> {
+            if (versionMap != null && versionMap.containsKey(minecraftVersion)) {
+                latestVersion = versionMap.get(minecraftVersion);
+                if (!latestVersion.equals(PuzzleCore.version)) {
+                    isUpToDate = false;
+                    PuzzleCore.updateURL = PuzzleCore.website + "download/" + latestVersion.replace(PuzzleCore.name + " ","");
+                    logger.log(Level.INFO, "There is a newer version of "+ PuzzleCore.name +" available: " + latestVersion);
+                    logger.log(Level.INFO, "Please update immediately!");
+                }
+            } else {
+                logger.log(Level.WARN, "A problem with the database occured, could not check for updates.");
+            }
+        }, MinecraftClient.getInstance());
+    }
+}

puzzle-base/src/main/resources/assets/puzzle/lang/en_us.json

@@ -0,0 +1,17 @@
+{
+	"puzzle.text.update_available":"An update is available!",
+	"puzzle.screen.title":"Puzzle Settings",
+	"puzzle.page.graphics":"Graphics Settings",
+	"puzzle.page.resources":"Resource Settings",
+	"puzzle.page.performance":"Performance Settings",
+	"puzzle.page.misc":"Miscellaneous Settings",
+	"puzzle.option.ctm":"Connected Textures",
+	"puzzle.option.inside_ctm":"Connect Inside Textures",
+	"puzzle.midnightconfig.title":"Title",
+	"puzzle.midnightconfig.showPuzzleInfo":"Show Puzzle Info",
+	"puzzle.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info",
+	"test.midnightconfig.title":"I am a title",
+	"test.midnightconfig.text":"I am a comment *u*",
+	"test.midnightconfig.showInfo":"Show Info",
+	"test.midnightconfig.showInfo.tooltip":"Show more information"
+}

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

@@ -0,0 +1,40 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-base",
+  "version": "${version}",
+
+  "name": "Puzzle",
+  "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "net.puzzlemc.core.PuzzleCore"
+    ]
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "mixins": [
+    "puzzle-base.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}

puzzle-base/src/main/resources/puzzle-base.mixins.json

@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "package": "net.puzzlemc.core.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "MixinTitleScreen",
+    "MixinDebugHud"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

puzzle-blocks/build.gradle

@@ -0,0 +1,4 @@
+archivesBaseName = "puzzle-blocks"
+dependencies {
+    api project(":puzzle-base")
+}

puzzle-blocks/src/main/java/net/puzzlemc/blocks/PuzzleBlocks.java

@@ -0,0 +1,87 @@
+package net.puzzlemc.blocks;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
+import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl;
+import net.minecraft.block.Block;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import net.puzzlemc.core.config.PuzzleConfig;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Properties;
+
+public class PuzzleBlocks implements ClientModInitializer {
+    Logger LOGGER = LogManager.getLogger("puzzle-blocks");
+
+    public void onInitializeClient() {
+        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
+            @Override
+            public Identifier getFabricId() {
+                return new Identifier("puzzle", "blocks");
+            }
+
+            @Override
+            public void reload(ResourceManager manager) {
+                if (PuzzleConfig.customRenderLayers) {
+                    for (Identifier id : manager.findResources("optifine", path -> path.contains("block.properties"))) {
+                        try (InputStream stream = manager.getResource(id).getInputStream()) {
+                            Properties properties = new Properties();
+                            properties.load(stream);
+
+                            if (properties.get("layer.solid") != null) {
+                                String[] solid_blocks = properties.get("layer.solid").toString().split(" ");
+                                Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
+                                    if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> solid");
+                                    Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
+                                    if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
+                                        BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getSolid());
+                                    }
+                                });
+                            }
+                            if (properties.get("layer.cutout") != null) {
+                                String[] solid_blocks = properties.get("layer.cutout").toString().split(" ");
+                                Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
+                                    if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> cutout");
+                                    Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
+                                    if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
+                                        BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getCutout());
+                                    }
+                                });
+                            }
+                            if (properties.get("layer.cutout_mipped") != null) {
+                                String[] solid_blocks = properties.get("layer.cutout_mipped").toString().split(" ");
+                                Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
+                                    if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> cutout_mipped");
+                                    Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
+                                    if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
+                                        BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getCutoutMipped());
+                                    }
+                                });
+                            }
+                            if (properties.get("layer.translucent") != null) {
+                                String[] solid_blocks = properties.get("layer.translucent").toString().split(" ");
+                                Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
+                                    if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> translucent");
+                                    Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
+                                    if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
+                                        BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getTranslucent());
+                                    }
+                                });
+                            }
+                        } catch (Exception e) {
+                            LogManager.getLogger("Puzzle").error("Error occurred while loading block.properties " + id.toString(), e);
+                        }
+                    }
+                }
+            }
+        });
+    }
+}

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

@@ -0,0 +1,36 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-blocks",
+  "version": "${version}",
+
+  "name": "Puzzle Blocks",
+  "description": "Lets resourcepacks change render layers of blocks",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "net.puzzlemc.blocks.PuzzleBlocks"
+    ]
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "depends": {
+    "fabric": "*"
+  }
+}

puzzle-gui/build.gradle

@@ -0,0 +1,47 @@
+archivesBaseName = "puzzle-gui"
+
+repositories {
+	maven { 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 {
+	api project(":puzzle-base")
+	api project(":puzzle-splashscreen")
+
+	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("org.aperlambda:lambdajcommon:1.8.1") {
+		exclude group: 'com.google.code.gson'
+		exclude group: 'com.google.guava'
+	}
+ 	modImplementation ("maven.modrinth:continuity:${project.continuity_version}") {
+         exclude module: "modmenu"
+ 	}
+} 

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

@@ -0,0 +1,39 @@
+package net.puzzlemc.gui;
+
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PuzzleApi {
+    private static Logger LOGGER = LogManager.getLogger("puzzle-gui");
+
+    public static List<PuzzleWidget> GRAPHICS_OPTIONS = new ArrayList<>();
+    public static List<PuzzleWidget> MISC_OPTIONS = new ArrayList<>();
+    public static List<PuzzleWidget> PERFORMANCE_OPTIONS = new ArrayList<>();
+    public static List<PuzzleWidget> RESOURCE_OPTIONS = new ArrayList<>();
+
+    public static void addToGraphicsOptions(PuzzleWidget button) {
+        GRAPHICS_OPTIONS.add(button);
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Graphics Options");
+    }
+    public static void addToMiscOptions(PuzzleWidget button) {
+        MISC_OPTIONS.add(button);
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Misc Options");
+    }
+    public static void addToPerformanceOptions(PuzzleWidget button) {
+        PERFORMANCE_OPTIONS.add(button);
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + "- > Performance Options");
+    }
+    public static void addToResourceOptions(PuzzleWidget button) {
+        RESOURCE_OPTIONS.add(button);
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Resource Options");
+    }
+    @Deprecated public static void addToTextureOptions(PuzzleWidget button) {
+        RESOURCE_OPTIONS.add(button);
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> LEGACY Texture Options");
+    }
+}

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

@@ -0,0 +1,170 @@
+package net.puzzlemc.gui;
+
+import dev.lambdaurora.lambdabettergrass.LBGConfig;
+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;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Formatting;
+import net.puzzlemc.splashscreen.PuzzleSplashScreen;
+import shcm.shsupercm.fabric.citresewn.CITResewn;
+import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
+
+public class PuzzleClient implements ClientModInitializer {
+
+    public final static String id = "puzzle";
+    public static final Text YES = new TranslatableText("gui.yes").formatted(Formatting.GREEN);
+    public static final Text NO = new TranslatableText("gui.no").formatted(Formatting.RED);
+
+    @Override
+    public void onInitializeClient() {
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Check for Updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
+            PuzzleConfig.checkUpdates = !PuzzleConfig.checkUpdates;
+            PuzzleConfig.write(id);
+        }));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Show Puzzle version info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
+            PuzzleConfig.showPuzzleInfo = !PuzzleConfig.showPuzzleInfo;
+            PuzzleConfig.write(id);
+        }));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
+        if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Use resourcepack splash screen "), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
+                PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
+                PuzzleConfig.write(id);
+                PuzzleSplashScreen.resetColors();
+                MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture());
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("puzzle-randomentities")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Random Entity Textures"), (button) -> button.setMessage(PuzzleConfig.randomEntityTextures ? YES : NO), (button) -> {
+                PuzzleConfig.randomEntityTextures = !PuzzleConfig.randomEntityTextures;
+                PuzzleConfig.write(id);
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("puzzle-models")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Unlimited Model Rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
+                PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
+                PuzzleConfig.write(id);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Bigger Custom Models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
+                PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
+                PuzzleConfig.write(id);
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("puzzle-blocks")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Render Layer Overwrites"), (button) -> button.setMessage(PuzzleConfig.customRenderLayers ? YES : NO), (button) -> {
+                PuzzleConfig.customRenderLayers = !PuzzleConfig.customRenderLayers;
+                PuzzleConfig.write(id);
+            }));
+        }
+
+        if (FabricLoader.getInstance().isModLoaded("cullleaves")) {
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Cull Leaves"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
+                CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
+                CullLeavesConfig.write("cullleaves");
+                MinecraftClient.getInstance().worldRenderer.reload();
+            }));
+        }
+
+        if (FabricLoader.getInstance().isModLoaded("lambdynlights")) {
+            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.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.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("lambdabettergrass")) {
+            LBGConfig lbgConfig = LambdaBetterGrass.get().config;
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
+            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

@@ -0,0 +1,28 @@
+package net.puzzlemc.gui.config;
+
+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 = 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

@@ -0,0 +1,30 @@
+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.text.Text;
+import net.minecraft.text.TranslatableText;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.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("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

@@ -0,0 +1,17 @@
+package net.puzzlemc.gui.screen;
+
+import net.coderbot.iris.gui.screen.ShaderPackScreen;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+
+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).setScreen(shaderPackPage));
+    }
+}

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

@@ -0,0 +1,14 @@
+package net.puzzlemc.gui.screen;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.util.math.MatrixStack;
+
+public class LoadingScreenBackgrond {
+    public static void render(MinecraftClient client, MatrixStack matrices, int width, int height, float delta) {
+//        if (client.world != null) {
+//            LogManager.getLogManager().getLogger("Puzzle").info(client.world.getDimension().toString());
+//        }
+//        client.getTextureManager().bindTexture(new Identifier("minecraft","optifine/gui/loading/background0.png"));
+//        DrawableHelper.drawTexture(matrices,0,0,width,height,0,0,width,height,width,height);
+    }
+}

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

@@ -0,0 +1,52 @@
+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;
+import net.puzzlemc.gui.screen.page.ResourcesPage;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ScreenTexts;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.TranslatableText;
+
+import java.util.Objects;
+
+public class PuzzleOptionsScreen extends Screen {
+
+    public PuzzleOptionsScreen(Screen parent) {
+        super(new TranslatableText("puzzle.screen.title"));
+        this.parent = parent;
+    }
+    private final Screen parent;
+
+    @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).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).setScreen(parent)));
+    }
+
+    @Override
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        this.renderBackground(matrices);
+
+        super.render(matrices, mouseX, mouseY, delta);
+        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
+    }
+}

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

@@ -1,7 +1,7 @@
-package eu.midnightdust.puzzle.screen.page;
+package net.puzzlemc.gui.screen.page;
 
-import eu.midnightdust.puzzle.screen.widget.PuzzleOptionListWidget;
+import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
-import eu.midnightdust.puzzle.screen.widget.PuzzleWidget;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -26,18 +26,17 @@ public abstract class AbstractPuzzleOptionsPage extends Screen {
     protected void init() {
         this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
         list.addAll(options);
-        this.children.add(this.list);
+        this.addSelectableChild(this.list);
 
         super.init();
 
-        this.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> {
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
-            Objects.requireNonNull(client).openScreen(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/page/GraphicsPage.java

@@ -1,7 +1,6 @@
-package eu.midnightdust.puzzle.screen.page;
+package net.puzzlemc.gui.screen.page;
 
-import eu.midnightdust.puzzle.PuzzleApi;
+import net.puzzlemc.gui.PuzzleApi;
-import eu.midnightdust.puzzle.screen.page.AbstractPuzzleOptionsPage;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.TranslatableText;
 

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

@@ -1,6 +1,6 @@
-package eu.midnightdust.puzzle.screen.page;
+package net.puzzlemc.gui.screen.page;
 
-import eu.midnightdust.puzzle.PuzzleApi;
+import net.puzzlemc.gui.PuzzleApi;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.TranslatableText;
 

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

@@ -1,6 +1,6 @@
-package eu.midnightdust.puzzle.screen.page;
+package net.puzzlemc.gui.screen.page;
 
-import eu.midnightdust.puzzle.PuzzleApi;
+import net.puzzlemc.gui.PuzzleApi;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.TranslatableText;
 

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

@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.TranslatableText;
+
+public class ResourcesPage extends AbstractPuzzleOptionsPage {
+
+    public ResourcesPage(Screen parent) {
+        super(parent, new TranslatableText("puzzle.page.resources"), PuzzleApi.RESOURCE_OPTIONS);
+    }
+}

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

@@ -0,0 +1,5 @@
+package net.puzzlemc.gui.screen.widget;
+
+public enum ButtonType {
+    TEXT, BUTTON, SLIDER, TEXT_FIELD
+}

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

@@ -1,4 +1,4 @@
-package eu.midnightdust.puzzle.screen.widget;
+package net.puzzlemc.gui.screen.widget;
 
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;

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

@@ -0,0 +1,90 @@
+package net.puzzlemc.gui.screen.widget;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.Element;
+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 org.apache.logging.log4j.LogManager;
+
+import java.util.*;
+
+@Environment(EnvType.CLIENT)
+public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWidget.ButtonEntry> {
+    TextRenderer textRenderer;
+
+    public PuzzleOptionListWidget(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;
+    }
+
+    public void addButton(ClickableWidget button, Text text) {
+        this.addEntry(ButtonEntry.create(button, text));
+    }
+
+    public void addAll(List<PuzzleWidget> buttons) {
+        for (PuzzleWidget button : buttons) {
+            if (button.buttonType == ButtonType.TEXT) {
+                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, 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, button.setTextValue, button.changeTextValue), button.descriptionText);
+            } else
+                LogManager.getLogger("Puzzle").warn("Button " + button + " is missing the buttonType variable. This shouldn't happen!");
+        }
+    }
+
+    public int getRowWidth() {
+        return 400;
+    }
+
+    protected int getScrollbarPositionX() {
+        return super.getScrollbarPositionX() + 60;
+    }
+
+    public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
+        private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+        private List<ClickableWidget> buttons = new ArrayList<>();
+        private final ClickableWidget button;
+        private final Text text;
+
+        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(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) {
+            if (button != null) {
+                button.y = y;
+                button.render(matrices, mouseX, mouseY, tickDelta);
+            }
+            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() {
+            return buttons;
+        }
+
+        @Override
+        public List<? extends Selectable> selectableChildren() {
+            return buttons;
+        }
+    }
+}

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

@@ -0,0 +1,41 @@
+package net.puzzlemc.gui.screen.widget;
+
+import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.text.Text;
+
+public class PuzzleSliderWidget extends SliderWidget {
+    private final int min;
+    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);
+
+        this.min = 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() {
+        this.setTextAction.setTitle(this);
+    }
+
+    @Override
+    protected void applyValue() {
+        this.changeAction.onChange(this);
+    }
+}

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

@@ -0,0 +1,23 @@
+package net.puzzlemc.gui.screen.widget;
+
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.text.Text;
+
+public class PuzzleTextFieldWidget extends TextFieldWidget {
+    private final PuzzleWidget.SetTextValueAction setValueAction;
+    private final PuzzleWidget.ChangeTextValueAction change;
+
+    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

@@ -0,0 +1,87 @@
+package net.puzzlemc.gui.screen.widget;
+
+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;
+
+public class PuzzleWidget {
+    public ButtonType buttonType;
+    public int min;
+    public int max;
+    public Text descriptionText;
+    public Text buttonText;
+    public TextAction buttonTextAction;
+    public ButtonWidget.PressAction onPress;
+    public PuzzleWidget.SetTextValueAction setTextValue;
+    public PuzzleWidget.SetSliderValueAction setSliderValue;
+    public PuzzleWidget.ChangeTextValueAction changeTextValue;
+    public PuzzleWidget.ChangeSliderValueAction changeSliderValue;
+
+    /**
+     * Puzzle Text Widget Container
+     * @param descriptionText The text you want to display.
+     */
+    public PuzzleWidget(Text descriptionText) {
+        this.buttonType = ButtonType.TEXT;
+        this.descriptionText = descriptionText;
+    }
+
+    /**
+     * Puzzle Button Widget Container
+     * @param descriptionText Tells the user what the option does.
+     * @param getTitle Function to set the text on the button.
+     * @param onPress Function to call when the user presses the button.
+     */
+    public PuzzleWidget(Text descriptionText, PuzzleWidget.TextAction getTitle, ButtonWidget.PressAction onPress) {
+        this.buttonType = ButtonType.BUTTON;
+        this.descriptionText = descriptionText;
+        this.buttonTextAction = getTitle;
+        this.onPress = onPress;
+    }
+    /**
+     * Puzzle Slider Widget Container (WIP - Doesn't work)
+     */
+    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.setSliderValue = setValueAction;
+        this.buttonTextAction = setTextAction;
+        this.changeSliderValue = changeAction;
+    }
+    /**
+     * Puzzle Text Field Widget Container (WIP - Doesn't work)
+     */
+    public PuzzleWidget(Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction, int a) {
+        this.buttonType = ButtonType.TEXT_FIELD;
+        this.descriptionText = descriptionText;
+        this.setTextValue = setValue;
+        this.changeTextValue = changeAction;
+    }
+    @Environment(EnvType.CLIENT)
+    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 {
+        void setTitle(ClickableWidget button);
+    }
+}

puzzle-gui/src/main/java/net/puzzlemc/gui/util/ColorUtil.java

@@ -0,0 +1,17 @@
+package net.puzzlemc.gui.util;
+
+import java.awt.*;
+
+public class ColorUtil {
+    /**
+     * @credit https://stackoverflow.com/questions/4129666/how-to-convert-hex-to-rgb-using-java
+     * @param colorStr e.g. "FFFFFF"
+     * @return
+     */
+    public static Color hex2Rgb(String colorStr) {
+        return new Color(
+                Integer.valueOf( colorStr.substring( 0, 2 ), 16 ),
+                Integer.valueOf( colorStr.substring( 2, 4 ), 16 ),
+                Integer.valueOf( colorStr.substring( 4, 6 ), 16 ));
+    }
+}

puzzle-gui/src/main/resources/assets/puzzle/lang/en_us.json

@@ -0,0 +1,17 @@
+{
+	"puzzle.text.update_available":"An update is available!",
+	"puzzle.screen.title":"Puzzle Settings",
+	"puzzle.page.graphics":"Graphics Settings",
+	"puzzle.page.resources":"Resource Settings",
+	"puzzle.page.performance":"Performance Settings",
+	"puzzle.page.misc":"Miscellaneous Settings",
+	"puzzle.option.ctm":"Connected Textures",
+	"puzzle.option.inside_ctm":"Connect Inside Textures",
+	"puzzle.midnightconfig.title":"Title",
+	"puzzle.midnightconfig.showPuzzleInfo":"Show Puzzle Info",
+	"puzzle.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info",
+	"test.midnightconfig.title":"I am a title",
+	"test.midnightconfig.text":"I am a comment *u*",
+	"test.midnightconfig.showInfo":"Show Info",
+	"test.midnightconfig.showInfo.tooltip":"Show more information"
+}

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

@@ -0,0 +1,43 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-gui",
+  "version": "${version}",
+
+  "name": "Puzzle GUI",
+  "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "net.puzzlemc.gui.PuzzleClient"
+    ],
+    "modmenu": [
+      "net.puzzlemc.gui.config.ModMenuIntegration"
+    ]
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "mixins": [
+    "puzzle-gui.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}

puzzle-gui/src/main/resources/puzzle-gui.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "eu.midnightdust.puzzle.mixin",
+  "package": "net.puzzlemc.gui.mixin",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "MixinOptionsScreen"

puzzle-models/build.gradle

@@ -0,0 +1,9 @@
+archivesBaseName = "puzzle-models"
+
+minecraft {
+    accessWidener =  file("src/main/resources/puzzle-models.accesswidener")
+}
+
+dependencies {
+    api project(":puzzle-base")
+}

puzzle-models/src/main/java/net/puzzlemc/models/mixin/MixinModelElementDeserializer.java

@@ -0,0 +1,48 @@
+package net.puzzlemc.models.mixin;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import net.minecraft.client.render.model.json.ModelElement;
+import net.minecraft.util.JsonHelper;
+import net.minecraft.util.math.Vec3f;
+import net.puzzlemc.core.config.PuzzleConfig;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ModelElement.Deserializer.class)
+public abstract class MixinModelElementDeserializer {
+    @Shadow protected abstract Vec3f deserializeVec3f(JsonObject object, String name);
+
+    @Inject(at = @At("HEAD"),method = "deserializeRotationAngle", cancellable = true)
+    private void puzzle$deserializeRotationAngle(JsonObject object, CallbackInfoReturnable<Float> cir) {
+        if (PuzzleConfig.unlimitedRotations) {
+            float angle = JsonHelper.getFloat(object, "angle");
+            cir.setReturnValue(angle);
+        }
+    }
+    @Inject(at = @At("HEAD"),method = "deserializeTo", cancellable = true)
+    private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vec3f> cir) {
+        if (PuzzleConfig.biggerModels) {
+            Vec3f vec3f = this.deserializeVec3f(object, "to");
+            if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
+                cir.setReturnValue(vec3f);
+            } else {
+                throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + vec3f);
+            }
+        }
+    }
+    @Inject(at = @At("HEAD"),method = "deserializeFrom", cancellable = true)
+    private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vec3f> cir) {
+        if (PuzzleConfig.biggerModels) {
+            Vec3f vec3f = this.deserializeVec3f(object, "from");
+            if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
+                cir.setReturnValue(vec3f);
+            } else {
+                throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + vec3f);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-models",
+  "version": "${version}",
+
+  "name": "Puzzle Models",
+  "description": "Provides more freedom for item and block models!",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "accessWidener" : "puzzle-models.accesswidener",
+  "mixins": [
+    "puzzle-models.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}

puzzle-models/src/main/resources/puzzle-models.accesswidener

@@ -0,0 +1,2 @@
+accessWidener	v1	named
+accessible   class   net/minecraft/client/render/model/json/ModelElement$Deserializer

puzzle-models/src/main/resources/puzzle-models.mixins.json

@@ -0,0 +1,11 @@
+{
+  "required": true,
+  "package": "net.puzzlemc.models.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "MixinModelElementDeserializer"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

puzzle-splashscreen/build.gradle

@@ -0,0 +1,5 @@
+archivesBaseName = "puzzle-splashscreen"
+
+dependencies {
+    api project(":puzzle-base")
+}

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

@@ -0,0 +1,132 @@
+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.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.hud.BackgroundHelper;
+import net.minecraft.client.resource.metadata.TextureResourceMetadata;
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.ResourceTexture;
+import net.minecraft.resource.DefaultResourcePack;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
+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;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.Properties;
+
+public class PuzzleSplashScreen implements ClientModInitializer {
+    public static final Identifier LOGO = new Identifier("textures/gui/title/mojangstudios.png");
+    public static File CONFIG_PATH = new File(String.valueOf(FabricLoader.getInstance().getConfigDir().resolve(".puzzle_cache")));
+    public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+
+    public static void resetColors() {
+        PuzzleConfig.backgroundColor = 15675965;
+        PuzzleConfig.progressBarColor = 16777215;
+        PuzzleConfig.progressFrameColor = 16777215;
+        PuzzleConfig.write("puzzle");
+    }
+
+    public void onInitializeClient() {
+        if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistant //
+            if (CONFIG_PATH.mkdir()) { // Create our custom config directory //
+                try {
+                    Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
+                } catch (IOException ignored) {
+                }
+            }
+        }
+        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
+            @Override
+            public Identifier getFabricId() {
+                return new Identifier("puzzle", "splash_screen");
+            }
+
+            @Override
+            public void reload(ResourceManager manager) {
+                if (PuzzleConfig.resourcepackSplashScreen) {
+                    PuzzleSplashScreen.resetColors();
+                    client.getTextureManager().registerTexture(LOGO, new LogoTexture());
+
+                    for (Identifier id : manager.findResources("optifine", path -> path.contains("color.properties"))) {
+                        try (InputStream stream = manager.getResource(id).getInputStream()) {
+                            Properties properties = new Properties();
+                            properties.load(stream);
+
+                            if (properties.get("screen.loading") != null) {
+                                Color backgroundColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading").toString());
+                                PuzzleConfig.backgroundColor = BackgroundHelper.ColorMixer.getArgb(backgroundColorRGB.getAlpha(), backgroundColorRGB.getRed(), backgroundColorRGB.getGreen(), backgroundColorRGB.getGreen());
+                            }
+                            if (properties.get("screen.loading.bar") != null) {
+                                Color progressFrameColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString());
+                                PuzzleConfig.progressFrameColor = BackgroundHelper.ColorMixer.getArgb(progressFrameColorRGB.getAlpha(), progressFrameColorRGB.getRed(), progressFrameColorRGB.getGreen(), progressFrameColorRGB.getGreen());
+                            }
+                            if (properties.get("screen.loading.progress") != null) {
+                                Color progressBarColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString());
+                                PuzzleConfig.progressBarColor = BackgroundHelper.ColorMixer.getArgb(progressBarColorRGB.getAlpha(), progressBarColorRGB.getRed(), progressBarColorRGB.getGreen(), progressBarColorRGB.getGreen());
+                            }
+                            if (properties.get("screen.loading") != null) {
+                                PuzzleConfig.write("puzzle");
+                            }
+                        } catch (Exception e) {
+                            LogManager.getLogger("Puzzle").error("Error occurred while loading color.properties " + id.toString(), e);
+                        }
+                    }
+                    for (Identifier id : manager.findResources("textures", path -> path.contains("mojangstudios.png"))) {
+                        try (InputStream stream = manager.getResource(id).getInputStream()) {
+                            Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
+                            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);
+                        }
+                    }
+                }
+            }
+        });
+    }
+    @Environment(EnvType.CLIENT)
+    public static class LogoTexture extends ResourceTexture {
+        public LogoTexture() { super(LOGO); }
+
+        protected TextureData loadTextureData(ResourceManager resourceManager) {
+            MinecraftClient minecraftClient = MinecraftClient.getInstance();
+            DefaultResourcePack defaultResourcePack = minecraftClient.getResourcePackProvider().getPack();
+            try {
+                InputStream inputStream = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
+                TextureData var6;
+                try {
+                    var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
+                } finally {
+                    if (inputStream != null) {
+                        inputStream.close();
+                    }
+                }
+                return var6;
+            } catch (IOException var18) {
+                return new TextureData(var18);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,85 @@
+package net.puzzlemc.splashscreen.mixin;
+
+import com.mojang.blaze3d.platform.GlStateManager;
+import net.minecraft.client.MinecraftClient;
+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 org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+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 private long reloadCompleteTime;
+
+    @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);
+        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/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/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/resources/fabric.mod.json

@@ -0,0 +1,40 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-splashscreen",
+  "version": "${version}",
+
+  "name": "Puzzle Splash Screen",
+  "description": "Allows resourcepacks to define a custom splash screen",
+  "authors": [
+    "PuzzleMC",
+    "Motschen"
+  ],
+  "contact": {
+    "homepage": "https://www.midnightdust.eu/",
+    "sources": "https://github.com/TeamMidnightDust/Puzzle",
+    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
+  },
+
+  "license": "MIT",
+  "icon": "assets/puzzle/icon.png",
+
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "net.puzzlemc.splashscreen.PuzzleSplashScreen"
+    ]
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "mixins": [
+    "puzzle-splashscreen.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}

puzzle-splashscreen/src/main/resources/puzzle-splashscreen.mixins.json

@@ -0,0 +1,11 @@
+{
+  "required": true,
+  "package": "net.puzzlemc.splashscreen.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "MixinSplashScreen"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

puzzle_versions.json

@@ -0,0 +1,5 @@
+{
+  "1.17": "Puzzle R1",
+  "1.18-pre1": "Puzzle R1",
+  "1.18": "Puzzle R1"
+}

settings.gradle

@@ -1,6 +1,5 @@
 pluginManagement {
     repositories {
-        jcenter()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
@@ -8,3 +7,10 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+include 'puzzle-base'
+
+include 'puzzle-splashscreen'
+include 'puzzle-models'
+include 'puzzle-blocks'
+//include 'puzzle-randomentities'
+include 'puzzle-gui'

src/main/java/eu/midnightdust/puzzle/PuzzleApi.java

@@ -1,19 +0,0 @@
-package eu.midnightdust.puzzle;
-
-import eu.midnightdust.puzzle.screen.widget.PuzzleWidget;
-import net.minecraft.text.Text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PuzzleApi {
-    public static List<PuzzleWidget> GRAPHICS_OPTIONS = new ArrayList<>();
-    public static List<PuzzleWidget> MISC_OPTIONS = new ArrayList<>();
-    public static List<PuzzleWidget> PERFORMANCE_OPTIONS = new ArrayList<>();
-    public static List<PuzzleWidget> TEXTURE_OPTIONS = new ArrayList<>();
-
-    public static void addToGraphicsOptions(PuzzleWidget button) {GRAPHICS_OPTIONS.add(button);}
-    public static void addToMiscOptions(PuzzleWidget button) {MISC_OPTIONS.add(button);}
-    public static void addToPerformanceOptions(PuzzleWidget button) {PERFORMANCE_OPTIONS.add(button);}
-    public static void addToTextureOptions(PuzzleWidget button) {TEXTURE_OPTIONS.add(button);}
-}

src/main/java/eu/midnightdust/puzzle/PuzzleClient.java

@@ -1,59 +0,0 @@
-package eu.midnightdust.puzzle;
-
-import eu.midnightdust.cullleaves.config.CullLeavesConfig;
-import eu.midnightdust.puzzle.screen.widget.PuzzleWidget;
-import me.lambdaurora.lambdabettergrass.LBGConfig;
-import me.lambdaurora.lambdabettergrass.LambdaBetterGrass;
-import me.lambdaurora.lambdynlights.DynamicLightsConfig;
-import me.lambdaurora.lambdynlights.LambDynLights;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Formatting;
-import team.chisel.ctm.client.CTMClient;
-import team.chisel.ctm.client.config.ConfigManager;
-
-public class PuzzleClient implements ClientModInitializer {
-
-    public static final Text YES = new TranslatableText("gui.yes").formatted(Formatting.GREEN);
-    public static final Text NO = new TranslatableText("gui.no").formatted(Formatting.RED);
-
-    @Override
-    public void onInitializeClient() {
-        if (FabricLoader.getInstance().isModLoaded("cullleaves")) {
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Cull Leaves"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
-                CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
-                CullLeavesConfig.write();
-                MinecraftClient.getInstance().worldRenderer.reload();
-            }));
-        }
-        if (FabricLoader.getInstance().isModLoaded("lambdynlights")) {
-            DynamicLightsConfig ldlConfig = LambDynLights.get().config;
-            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("lambdynlights.option.mode").append(": ").append(new TranslatableText("lambdynlights.option.entities")), (button) -> button.setMessage(ldlConfig.hasEntitiesLightSource() ? YES : NO), (button) -> ldlConfig.setEntitiesLightSource(!ldlConfig.hasEntitiesLightSource())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode").append(": ").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("lambdynlights.option.mode").append(": ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode").append(": ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode").append(": ").append(new TranslatableText("lambdynlights.option.water_sensitive")), (button) -> button.setMessage(ldlConfig.hasWaterSensitiveCheck() ? YES : NO), (button) -> ldlConfig.setWaterSensitiveCheck(!ldlConfig.hasWaterSensitiveCheck())));
-        }
-        if (FabricLoader.getInstance().isModLoaded("ctm")) {
-            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;
-            PuzzleApi.addToTextureOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
-            PuzzleApi.addToTextureOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
-        }
-    }
-}

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

@@ -1,16 +0,0 @@
-package eu.midnightdust.puzzle.config;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import eu.midnightdust.puzzle.screen.PuzzleOptionsScreen;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-@Environment(EnvType.CLIENT)
-public class ModMenuIntegration implements ModMenuApi {
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return PuzzleOptionsScreen::new;
-    }
-}

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

@@ -1,29 +0,0 @@
-package eu.midnightdust.puzzle.mixin;
-
-import eu.midnightdust.puzzle.screen.PuzzleOptionsScreen;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.options.OptionsScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(OptionsScreen.class)
-public class MixinOptionsScreen extends Screen {
-
-    protected MixinOptionsScreen(Text title) {
-        super(title);
-    }
-
-    @Inject(at = @At("TAIL"),method = "init")
-    public void init(CallbackInfo ci) {
-        PuzzleOptionsScreen puzzleScreen = new PuzzleOptionsScreen(this);
-        this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20, new TranslatableText("puzzle.screen.title").append("..."), (button) -> {
-            this.client.openScreen(puzzleScreen);
-        }));
-    }
-
-}

src/main/java/eu/midnightdust/puzzle/screen/PuzzleOptionsScreen.java

@@ -1,55 +0,0 @@
-package eu.midnightdust.puzzle.screen;
-
-import eu.midnightdust.puzzle.screen.page.GraphicsPage;
-import eu.midnightdust.puzzle.screen.page.MiscPage;
-import eu.midnightdust.puzzle.screen.page.PerformancePage;
-import eu.midnightdust.puzzle.screen.page.TexturesPage;
-import net.coderbot.iris.gui.screen.ShaderPackScreen;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.TranslatableText;
-
-import java.util.Objects;
-
-public class PuzzleOptionsScreen extends Screen {
-
-    public PuzzleOptionsScreen(Screen parent) {
-        super(new TranslatableText("puzzle.screen.title"));
-        this.parent = parent;
-    }
-    private final Screen parent;
-
-    @Override
-    protected void init() {
-        super.init();
-        GraphicsPage graphicsPage = new GraphicsPage(this);
-        MiscPage miscPage = new MiscPage(this);
-        PerformancePage performancePage = new PerformancePage(this);
-        TexturesPage texturesPage = new TexturesPage(this);
-
-        this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, graphicsPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(graphicsPage)));
-        this.addButton(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, texturesPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(texturesPage)));
-        this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, performancePage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(performancePage)));
-        this.addButton(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, miscPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(miscPage)));
-        if (FabricLoader.getInstance().isModLoaded("iris")) {
-            try {
-                ShaderPackScreen shaderPackPage = new ShaderPackScreen(this);
-                this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 96 - 6, 150, 20, shaderPackPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).openScreen(shaderPackPage)));
-            }
-            catch (Exception | Error ignored) {
-            }
-        }
-        this.addButton(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).openScreen(parent)));
-    }
-
-    @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        this.renderBackground(matrices);
-
-        super.render(matrices, mouseX, mouseY, delta);
-        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
-    }
-}

src/main/java/eu/midnightdust/puzzle/screen/page/TexturesPage.java

@@ -1,13 +0,0 @@
-package eu.midnightdust.puzzle.screen.page;
-
-import eu.midnightdust.puzzle.PuzzleApi;
-import eu.midnightdust.puzzle.screen.page.AbstractPuzzleOptionsPage;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.text.TranslatableText;
-
-public class TexturesPage extends AbstractPuzzleOptionsPage {
-
-    public TexturesPage(Screen parent) {
-        super(parent, new TranslatableText("puzzle.page.textures"), PuzzleApi.TEXTURE_OPTIONS);
-    }
-}

src/main/java/eu/midnightdust/puzzle/screen/widget/ButtonType.java

@@ -1,5 +0,0 @@
-package eu.midnightdust.puzzle.screen.widget;
-
-public enum ButtonType {
-    BUTTON, SLIDER, TEXT_FIELD
-}

src/main/java/eu/midnightdust/puzzle/screen/widget/PuzzleOptionListWidget.java

@@ -1,94 +0,0 @@
-package eu.midnightdust.puzzle.screen.widget;
-
-import com.google.common.collect.ImmutableMap;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.ElementListWidget;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import org.apache.logging.log4j.LogManager;
-
-import java.util.*;
-
-@Environment(EnvType.CLIENT)
-public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWidget.ButtonEntry> {
-    TextRenderer textRenderer;
-
-    public PuzzleOptionListWidget(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;
-    }
-
-    public void addButton(AbstractButtonWidget button, Text text) {
-        this.addEntry(ButtonEntry.create(button, text));
-    }
-
-    public void addAll(List<PuzzleWidget> buttons) {
-        for (int i = 0; i < buttons.size(); ++i) {
-            PuzzleWidget button = buttons.get(i);
-            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);
-            }
-            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);
-            }
-            else LogManager.getLogger("Puzzle").warn("Button " + button + " is missing the buttonType variable. This shouldn't happen!");
-        }
-    }
-
-    public int getRowWidth() {
-        return 400;
-    }
-
-    protected int getScrollbarPositionX() {
-        return super.getScrollbarPositionX() + 32;
-    }
-
-    public Optional<AbstractButtonWidget> getHoveredButton(double mouseX, double mouseY) {
-        for (ButtonEntry buttonEntry : this.children()) {
-            for (AbstractButtonWidget abstractButtonWidget : buttonEntry.buttons) {
-                if (abstractButtonWidget.isMouseOver(mouseX, mouseY)) {
-                    return Optional.of(abstractButtonWidget);
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
-    public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
-        private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        private final List<AbstractButtonWidget> buttons;
-        private final Map<AbstractButtonWidget, Text> buttonsWithText;
-
-        private ButtonEntry(ImmutableMap<AbstractButtonWidget, Text> buttons) {
-            this.buttons = buttons.keySet().asList();
-            this.buttonsWithText = buttons;
-        }
-
-        public static ButtonEntry create(AbstractButtonWidget button, Text text) {
-            return new ButtonEntry(ImmutableMap.of(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) -> {
-                button.y = y;
-                button.render(matrices, mouseX, mouseY, tickDelta);
-                drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
-            });
-        }
-
-        public List<? extends Element> children() {
-            return buttons;
-        }
-    }
-}

src/main/java/eu/midnightdust/puzzle/screen/widget/PuzzleSliderWidget.java

@@ -1,29 +0,0 @@
-package eu.midnightdust.puzzle.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;
-
-    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;
-    }
-
-    @Override
-    protected void updateMessage() {
-        Text text = new LiteralText((int) (min + this.value * difference) + "");
-        this.setMessage(new TranslatableText("label").append(": ").append((Text) text));
-    }
-
-    @Override
-    protected void applyValue() {
-
-    }
-}

src/main/java/eu/midnightdust/puzzle/screen/widget/PuzzleTextFieldWidget.java

@@ -1,17 +0,0 @@
-package eu.midnightdust.puzzle.screen.widget;
-
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.widget.SliderWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import org.jetbrains.annotations.Nullable;
-
-public class PuzzleTextFieldWidget extends TextFieldWidget {
-    private TranslatableText label;
-
-    public PuzzleTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, @Nullable TextFieldWidget copyFrom, Text text) {
-        super(textRenderer, x, y, width, height, text);
-    }
-}

src/main/java/eu/midnightdust/puzzle/screen/widget/PuzzleWidget.java

@@ -1,58 +0,0 @@
-package eu.midnightdust.puzzle.screen.widget;
-
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-
-public class PuzzleWidget {
-    public ButtonType buttonType;
-    public int min;
-    public int max;
-    public Text descriptionText;
-    public Text buttonText;
-    public TextAction buttonTextAction;
-    public ButtonWidget.PressAction onPress;
-    public PuzzleWidget.SaveAction onSave;
-
-    /**
-     * Puzzle Button Widget Container
-     * @param descriptionText Tells the user what the option does.
-     * @param getTitle Function to set the text on the button.
-     * @param onPress Function to call when the user presses the button.
-     */
-    public PuzzleWidget(Text descriptionText, PuzzleWidget.TextAction getTitle, ButtonWidget.PressAction onPress) {
-        this.buttonType = ButtonType.BUTTON;
-        this.descriptionText = descriptionText;
-        this.buttonTextAction = getTitle;
-        this.onPress = onPress;
-    }
-    /**
-     * Puzzle Slider Widget Container (WIP - Doesn't work)
-     */
-    public PuzzleWidget(int min, int max, Text descriptionText, TranslatableText buttonText) {
-        this.buttonType = ButtonType.SLIDER;
-        this.min = min;
-        this.max = max;
-        this.descriptionText = descriptionText;
-        this.buttonText = buttonText;
-    }
-    /**
-     * Puzzle Text Field Widget Container (WIP - Doesn't work)
-     */
-    public PuzzleWidget(Text descriptionText, Text buttonText) {
-        this.buttonType = ButtonType.TEXT_FIELD;
-        this.descriptionText = descriptionText;
-        this.buttonText = buttonText;
-    }
-    @Environment(EnvType.CLIENT)
-    public interface SaveAction {
-        void onSave(AbstractButtonWidget button);
-    }
-    @Environment(EnvType.CLIENT)
-    public interface TextAction {
-        void setTitle(AbstractButtonWidget button);
-    }
-}

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

@@ -1,9 +1,17 @@
 {
+	"puzzle.text.update_available":"An update is available!",
 	"puzzle.screen.title":"Puzzle Settings",
 	"puzzle.page.graphics":"Graphics Settings",
-	"puzzle.page.textures":"Texture Settings",
+	"puzzle.page.resources":"Resource Settings",
 	"puzzle.page.performance":"Performance Settings",
 	"puzzle.page.misc":"Miscellaneous Settings",
 	"puzzle.option.ctm":"Connected Textures",
-	"puzzle.option.inside_ctm":"Connect Inside Textures"
+	"puzzle.option.inside_ctm":"Connect Inside Textures",
+	"puzzle.midnightconfig.title":"Title",
+	"puzzle.midnightconfig.showPuzzleInfo":"Show Puzzle Info",
+	"puzzle.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info",
+	"test.midnightconfig.title":"I am a title",
+	"test.midnightconfig.text":"I am a comment *u*",
+	"test.midnightconfig.showInfo":"Show Info",
+	"test.midnightconfig.showInfo.tooltip":"Show more information"
 }

src/main/resources/fabric.mod.json

@@ -4,10 +4,10 @@
   "version": "${version}",
 
   "name": "Puzzle",
-  "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
+  "description": "Fancy and performance-improving features.",
   "authors": [
-    "Motschen",
+    "PuzzleMC",
-    "TeamMidnightDust"
+    "Motschen"
   ],
   "contact": {
     "homepage": "https://www.midnightdust.eu/",
@@ -18,19 +18,7 @@
   "license": "MIT",
   "icon": "assets/puzzle/icon.png",
 
-  "environment": "*",
+  "environment": "client",
-  "entrypoints": {
-    "client": [
-      "eu.midnightdust.puzzle.PuzzleClient"
-    ],
-    "modmenu": [
-      "eu.midnightdust.puzzle.config.ModMenuIntegration"
-    ]
-  },
-
-  "mixins": [
-    "puzzle.mixins.json"
-  ],
 
   "depends": {
     "fabric": "*"