Fix crash with newer ETF versions

README.md

@@ -1,4 +1,2 @@
 # Puzzle
 Unites optifine replacement mods in a clean & vanilla-style gui
-
-[![Download from Curseforge](https://cf.way2muchnoise.eu/full_563977_downloads%20on%20Curseforge.svg?badge_style=for_the_badge)](https://www.curseforge.com/minecraft/mc-mods/puzzle) [![Download from Modrinth](https://img.shields.io/modrinth/dt/puzzle?color=4&label=Download%20from%20Modrinth&style=for-the-badge)](https://modrinth.com/mod/puzzle) 

build.gradle

@@ -1,119 +1,168 @@
-import groovy.json.JsonSlurper
+// Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
-import groovy.json.JsonOutput
-
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "fabric-loom" version "0.12-SNAPSHOT" apply false
-    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
+    id "com.matthewprenger.cursegradle" version "1.4.0"
-    id "me.shedaniel.unified-publishing" version "0.1.+" apply false
+    id "maven-publish"
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id "java-library"
 }
 
-architectury {
+group = "net.puzzlemc"
-    minecraft = rootProject.minecraft_version
+archivesBaseName = "puzzle"
-}
 
 subprojects {
-    apply plugin: "dev.architectury.loom"
+    apply plugin: 'fabric-loom'
+    apply plugin: 'com.matthewprenger.cursegradle'
+    apply plugin: 'maven-publish'
+    apply plugin: 'java-library'
+
+    archivesBaseName = project.name
+    group = "${rootProject.group}.${rootProject.archivesBaseName}"
+}
+
+allprojects {
+    apply plugin: "fabric-loom"
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+    version = System.getenv("TRAVIS_TAG") ?: rootProject.mod_version
+
+    configurations {
+        dev
+    }
 
     repositories {
-        maven {
+        maven { url 'https://jitpack.io' }
-            url = "https://api.modrinth.com/maven"
-        }
-        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://www.cursemaven.com"
-            content {
-                includeGroup "curse.maven"
-            }
-        }
-        maven {
-            name = 'JitPack'
-            url 'https://jitpack.io'
-        }
-        maven {
-            url "https://maven.shedaniel.me/"
-        }
-        maven { url "https://maven.quiltmc.org/repository/release/" }
     }
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the yarn mappings you may select this one as well.
+        mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
-        mappings loom.layered {
+        modApi "net.fabricmc:fabric-loader:${rootProject.loader_version}"
-            it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
+        modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
-            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
-        }
-        modCompileOnlyApi ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
-
-        modCompileOnlyApi ("maven.modrinth:iris:${project.iris_version}")
-        modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
-        modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}")
-        modCompileOnlyApi ("maven.modrinth:animatica:${project.animatica_version}")
-        modCompileOnlyApi ("maven.modrinth:colormatic:${project.colormatic_version}")
-        modCompileOnlyApi ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
-        modCompileOnlyApi ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
-        modCompileOnlyApi ("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
-        modCompileOnlyApi ("maven.modrinth:entitytexturefeatures:${project.etf_version}")
-        modCompileOnlyApi ("maven.modrinth:entity-model-features:${project.emf_version}")
-        modCompileOnlyApi ("maven.modrinth:completeconfig:${project.complete_config_version}")
-        //modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
-
-
-        modCompileOnlyApi ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
-        modCompileOnly("dev.lambdaurora.lambdynamiclights:lambdynamiclights-api:${project.ldl_version}")
-        modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
-        modCompileOnlyApi "dev.lambdaurora:spruceui:${project.spruceui_version}"
     }
-}
 
-allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
-
-    archivesBaseName = rootProject.archives_base_name
-    version = rootProject.mod_version
-    group = rootProject.maven_group
-
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        options.release = 21
-    }
-    ext {
-        releaseChangelog = {
-            def changes = new StringBuilder()
-            changes << "## Puzzle v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/PuzzleMC/Puzzle/commits/)"
-            def proc = "git log --max-count=1 --pretty=format:%s".execute()
-            proc.in.eachLine { line ->
-                def processedLine = line.toString()
-                if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
-                    changes << "\n- ${processedLine.capitalize()}"
-                }
-            }
-            proc.waitFor()
-            return changes.toString()
-        }
-    }
     processResources {
-        // Minify json resources
+        inputs.property "version", project.version
-        doLast {
+
-            fileTree(dir: outputs.files.asPath, include: "**/*.json").each {
+        filesMatching("fabric.mod.json") {
-                File file -> file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
+            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 = 17
+    }
+
     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
+}
+
+subprojects.each { remapJar.dependsOn("${it.path}:remapJar") }
+
+repositories {
+    maven {
+        name = "JitPack"
+        url = "https://jitpack.io"
+    }
+    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"
+        }
+    }
+    maven {
+        name = 'JitPack'
+        url 'https://jitpack.io'
+    }
+    maven {
+        url "https://maven.shedaniel.me/"
+    }
+}
+
+dependencies {
+    modImplementation ("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
+    modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") {
+        exclude group: "net.fabricmc.fabric-api"
+    }
+    modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
+    modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
+    modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+    modImplementation ("maven.modrinth:iris:${project.iris_version}")
+    modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
+    modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
+    modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
+    modImplementation ("maven.modrinth:colormatic:${project.colormatic_version}")
+    modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
+    modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
+    modImplementation("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
+    modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
+    modImplementation ("maven.modrinth:cem:${project.cem_version}")
+    modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
+
+    modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
+        exclude group: 'com.google.code.gson'
+        exclude group: 'com.google.guava'
+    }
+    modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+    include "maven.modrinth:midnightlib:${project.midnightlib_version}"
+
+    subprojects.each {
+        api project(path: ":${it.name}", configuration: "dev")
+        include project(":${it.name}")
+    }
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) {
+                builtBy(remapJar)
+            }
+            pom.withXml {
+                subprojects.each {
+                    depNode.appendNode("groupId", it.group)
+                    depNode.appendNode("artifactId", it.name)
+                    depNode.appendNode("version", it.version)
+                    depNode.appendNode("scope", "compile")
+                }
+            }
+        }
+    }
 }

common/build.gradle

@@ -1,34 +0,0 @@
-architectury {
-    common(rootProject.enabled_platforms.split(","))
-}
-loom {
-    accessWidenerPath =  file("src/main/resources/puzzle-models.accesswidener")
-}
-
-dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modCompileOnly "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
-
-    modCompileOnly "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}"
-    modCompileOnlyApi "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilt_fabric_api_version}"
-    modCompileOnlyApi ("org.aperlambda:lambdajcommon:1.8.1") {
-        exclude group: 'com.google.code.gson'
-        exclude group: 'com.google.guava'
-    }
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
-            from components.java
-        }
-    }
-
-    // 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.
-    }
-}

common/src/main/java/net/puzzlemc/core/PuzzleCore.java

@@ -1,32 +0,0 @@
-package net.puzzlemc.core;
-
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.resource.SynchronousResourceReloader;
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.gui.PuzzleGui;
-import net.puzzlemc.predicates.PuzzlePredicates;
-import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class PuzzleCore {
-    public final static String MOD_ID = "puzzle";
-    private static final List<PuzzleModule> MODULES = new ArrayList<>();
-
-    public static void initModules() {
-        PuzzleConfig.init(MOD_ID, PuzzleConfig.class);
-        Collections.addAll(MODULES, PuzzleGui.INSTANCE, PuzzleSplashScreen.INSTANCE, PuzzlePredicates.INSTANCE);
-
-        MODULES.forEach(PuzzleModule::init);
-    }
-
-    public static class PuzzleResourceManager implements SynchronousResourceReloader {
-        public static PuzzleResourceManager INSTANCE = new PuzzleResourceManager();
-        @Override
-        public void reload(ResourceManager manager) {
-            MODULES.forEach(module -> module.reloadResources(manager));
-        }
-    }
-}

common/src/main/java/net/puzzlemc/core/PuzzleModule.java

@@ -1,13 +0,0 @@
-package net.puzzlemc.core;
-
-import net.minecraft.resource.ResourceManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public interface PuzzleModule {
-    default void init() {}
-    default void reloadResources(ResourceManager manager) {}
-    String getModuleId();
-
-    default Logger getLogger() {return LoggerFactory.getLogger("puzzle/"+getModuleId());}
-}

common/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java

@@ -1,28 +0,0 @@
-package net.puzzlemc.core.config;
-
-import eu.midnightdust.lib.config.MidnightConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PuzzleConfig extends MidnightConfig {
-    private static final String GUI = "gui";
-    private static final String INTERNAL = "internal";
-    private static final String FEATURES = "features";
-
-    @Entry(category = GUI, name = "Disabled integrations") public static List<String> disabledIntegrations = new ArrayList<>();
-    @Entry(category = GUI, name = "Enable Puzzle button") public static boolean enablePuzzleButton = true;
-
-    @Entry(category = FEATURES, name = "puzzle.option.resourcepack_splash_screen") public static boolean resourcepackSplashScreen = true;
-    @Entry(category = FEATURES, name = "puzzle.option.unlimited_model_rotations") public static boolean unlimitedRotations = true;
-    @Entry(category = FEATURES, name = "puzzle.option.bigger_custom_models") public static boolean biggerModels = true;
-
-    @Entry(category = INTERNAL, name = "Enable debug messages") public static boolean debugMessages = false;
-    @Entry(category = INTERNAL, name = "Has custom splash screen") public static boolean hasCustomSplashScreen = false;
-    @Entry(category = INTERNAL, name = "Splash Background Color") public static int backgroundColor = 15675965;
-    @Entry(category = INTERNAL, name = "Splash Progress Bar Color") public static int progressBarColor = 16777215;
-    @Entry(category = INTERNAL, name = "Splash Progress Bar Background Color") public static int progressBarBackgroundColor = 15675965;
-    @Entry(category = INTERNAL, name = "Splash Progress Bar Frame Color") public static int progressFrameColor = 16777215;
-    @Entry(category = INTERNAL, name = "puzzle.option.better_splash_screen_blend") public static boolean disableBlend = false;
-    @Entry(category = INTERNAL, name = "Custom Blend Function") public static List<String> customBlendFunction = new ArrayList<>();
-}

common/src/main/java/net/puzzlemc/core/mixin/PuzzleMixinPlugin.java

@@ -1,50 +0,0 @@
-package net.puzzlemc.core.mixin;
-
-import eu.midnightdust.lib.util.PlatformFunctions;
-import org.objectweb.asm.tree.ClassNode;
-import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
-import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
-
-import java.util.List;
-import java.util.Set;
-
-public class PuzzleMixinPlugin implements IMixinConfigPlugin {
-    private String mixinPackage;
-
-    @Override
-    public void onLoad(String mixinPackage) {
-        this.mixinPackage = mixinPackage + ".";
-    }
-
-    @Override
-    public String getRefMapperConfig() {
-        return null;
-    }
-
-    @Override
-    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        final String mixinName = mixinClassName.substring(this.mixinPackage.length());
-        final String packageName = mixinName.substring(0, mixinName.lastIndexOf('.'));
-
-        if (packageName.startsWith("sodium") && !PlatformFunctions.isModLoaded("sodium")) return false;
-
-        return true;
-    }
-
-    @Override
-    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
-    }
-
-    @Override
-    public List<String> getMixins() {
-        return null;
-    }
-
-    @Override
-    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-    }
-
-    @Override
-    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-    }
-}

common/src/main/java/net/puzzlemc/gui/PuzzleGui.java

@@ -1,77 +0,0 @@
-package net.puzzlemc.gui;
-
-import eu.midnightdust.core.MidnightLib;
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.util.Identifier;
-import net.puzzlemc.core.PuzzleModule;
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.gui.compat.*;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-import org.slf4j.Logger;
-
-public class PuzzleGui implements PuzzleModule {
-    public static final PuzzleGui INSTANCE = new PuzzleGui();
-    public final static String id = "puzzle";
-    public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN);
-    public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED);
-    public static final Identifier PUZZLE_BUTTON = Identifier.of(id, "icon/button");
-
-    @Override
-    public String getModuleId() {
-        return "gui";
-    }
-
-    @Override
-    public void init() {
-        MidnightLib.hiddenMods.add("puzzle");
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("\uD83E\uDDE9 Puzzle")));
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
-            MinecraftClient.getInstance().setScreen(PuzzleConfig.getScreen(MinecraftClient.getInstance().currentScreen, "puzzle"));
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("\uD83E\uDDE9 Puzzle")));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
-            PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
-            PuzzleSplashScreen.resetColors();
-            PuzzleConfig.write(id);
-            MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
-            PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
-            PuzzleConfig.write(id);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
-            PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
-            PuzzleConfig.write(id);
-        }));
-        if (isActive("cullleaves")) CullLeavesCompat.init();
-        if (isActive("colormatic")) ColormaticCompat.init();
-        if (isActive("borderlessmining")) BorderlessMiningCompat.init();
-        if (isActive("iris")) IrisCompat.init();
-    }
-
-    public static boolean lateInitDone = false;
-    public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
-        if (isActive("lambdynlights")) LDLCompat.init();
-        if (isActive("citresewn")) CITRCompat.init();
-        if (isActive("lambdabettergrass")) LBGCompat.init();
-        if (isActive("continuity")) ContinuityCompat.init();
-        try {
-            if (isActive("entity_texture_features")) ETFCompat.init();
-            if (isActive("entity_model_features")) EMFCompat.init();
-        } catch (Exception e) {
-            INSTANCE.getLogger().error("ETF/EMF config structure changed. Again...", e);
-        }
-
-        lateInitDone = true;
-    }
-    public static boolean isActive(String modid) {
-        return PlatformFunctions.isModLoaded(modid) && !PuzzleConfig.disabledIntegrations.contains(modid);
-    }
-    public static Logger logger() {
-        return INSTANCE.getLogger();
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/BorderlessMiningCompat.java

@@ -1,28 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import link.infra.borderlessmining.config.ConfigHandler;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class BorderlessMiningCompat {
-    public static void init() {
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("\uD83E\uDE9F Borderless Mining")));
-        ConfigHandler bmConfig = ConfigHandler.getInstance();
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
-            bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());
-            bmConfig.save();
-        }));
-        if (MinecraftClient.IS_SYSTEM_MAC) {
-            PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
-                bmConfig.enableMacOS = !bmConfig.enableMacOS;
-                bmConfig.setEnabledPending(bmConfig.isEnabled());
-                bmConfig.save();
-            }));
-        }
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/CITRCompat.java

@@ -1,60 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
-
-import static net.minecraft.screen.ScreenTexts.NO;
-import static net.minecraft.screen.ScreenTexts.YES;
-
-public class CITRCompat {
-    public static void init() {
-        if (CITResewnConfig.INSTANCE != null) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("⛏ CIT Resewn")));
-            CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("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(Text.translatable("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(Text.translatable("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(Text.translatable("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, Text.translatable("config.citresewn.cache_ms.title"), () -> citConfig.cache_ms,
-                    (button) -> button.setMessage(message(citConfig)),
-                    (slider) -> {
-                        try {
-                            citConfig.cache_ms = slider.getInt();
-                        } catch (NumberFormatException ignored) {
-                        }
-                        citConfig.write();
-                    }));
-        }
-    }
-    public static Text message(CITResewnConfig config) {
-        int ticks = config.cache_ms;
-        if (ticks <= 1) {
-            return (Text.translatable("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 (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
-        }
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/ColormaticCompat.java

@@ -1,46 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import io.github.kvverti.colormatic.Colormatic;
-import io.github.kvverti.colormatic.ColormaticConfig;
-import io.github.kvverti.colormatic.ColormaticConfigController;
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class ColormaticCompat {
-    public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("\uD83C\uDF08 Colormatic")));
-        ColormaticConfig colormaticConfig = Colormatic.config();
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
-            colormaticConfig.clearSky = !colormaticConfig.clearSky;
-            ColormaticConfigController.persist(colormaticConfig);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearVoid"), (button) -> button.setMessage(colormaticConfig.clearVoid ? YES : NO), (button) -> {
-            colormaticConfig.clearVoid = !colormaticConfig.clearVoid;
-            ColormaticConfigController.persist(colormaticConfig);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.blendSkyLight"), (button) -> button.setMessage(colormaticConfig.blendSkyLight ? YES : NO), (button) -> {
-            colormaticConfig.blendSkyLight = !colormaticConfig.blendSkyLight;
-            ColormaticConfigController.persist(colormaticConfig);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.flickerBlockLight"), (button) -> button.setMessage(colormaticConfig.flickerBlockLight ? YES : NO), (button) -> {
-            colormaticConfig.flickerBlockLight = !colormaticConfig.flickerBlockLight;
-            ColormaticConfigController.persist(colormaticConfig);
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Text.translatable("colormatic.config.option.relativeBlockLightIntensity"),
-                () -> (int) (100*(1.0 - colormaticConfig.relativeBlockLightIntensityExponent / -16.0)),
-                (button) -> button.setMessage(Text.translatable("colormatic.config.option.relativeBlockLightIntensity")
-                        .append(": ")
-                        .append(Text.literal(String.valueOf((int)(100 * Math.exp(ColormaticConfig.scaled(colormaticConfig.relativeBlockLightIntensityExponent))))).append("%"))),
-                (slider) -> {
-                    try {
-                        colormaticConfig.relativeBlockLightIntensityExponent = ((1.00 - ((slider.getInt())/100f)) * -16.0);
-                        ColormaticConfigController.persist(colormaticConfig);
-                    }
-                    catch (NumberFormatException ignored) {}
-                }));
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/ContinuityCompat.java

@@ -1,27 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import me.pepperbell.continuity.client.config.ContinuityConfig;
-import me.pepperbell.continuity.client.config.Option;
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class ContinuityCompat {
-    public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("▒ Continuity")));
-        ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
-        contConfig.getOptionMapView().forEach((s, option) -> {
-            if (s.equals("use_manual_culling")) return;
-            try {
-                Option.BooleanOption booleanOption = ((Option.BooleanOption)option);
-                PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> {
-                    booleanOption.set(!booleanOption.get());
-                    contConfig.save();
-                }));
-            } catch (Exception ignored) {}
-        });
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/CullLeavesCompat.java

@@ -1,21 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import eu.midnightdust.cullleaves.config.CullLeavesConfig;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class CullLeavesCompat {
-    public static void init() {
-        PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("\uD83C\uDF43 Cull Leaves")));
-        PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
-            CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
-            CullLeavesConfig.write("cullleaves");
-            MinecraftClient.getInstance().worldRenderer.reload();
-        }));
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/EMFCompat.java

@@ -1,32 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.screen.ScreenTexts;
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-import traben.entity_model_features.EMF;
-import traben.entity_model_features.config.EMFConfig;
-
-import java.util.EnumSet;
-import java.util.NavigableSet;
-import java.util.Objects;
-import java.util.TreeSet;
-
-public class EMFCompat {
-    public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.literal("\uD83D\uDC37 ").append(Text.translatable("entity_model_features.title"))));
-        EMFConfig emfConfig = EMF.config().getConfig();
-        if (PlatformFunctions.isModLoaded("physicsmod")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.physics"), (button) -> button.setMessage(emfConfig.attemptPhysicsModPatch_2 != EMFConfig.PhysicsModCompatChoice.OFF ?
-                    Text.translatable("entity_model_features.config." + (emfConfig.attemptPhysicsModPatch_2 == EMFConfig.PhysicsModCompatChoice.VANILLA ? "physics.1" : "physics.2")) : ScreenTexts.OFF), (button) -> {
-                final NavigableSet<EMFConfig.PhysicsModCompatChoice> set =
-                        new TreeSet<>(EnumSet.allOf(EMFConfig.PhysicsModCompatChoice.class));
-
-                emfConfig.attemptPhysicsModPatch_2 = Objects.requireNonNullElseGet(
-                        set.higher(emfConfig.attemptPhysicsModPatch_2), set::first);
-                EMF.config().saveToFile();
-            }));
-        }
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/ETFCompat.java

@@ -1,47 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-import traben.entity_texture_features.ETFApi;
-import traben.entity_texture_features.config.ETFConfig;
-
-import java.util.EnumSet;
-import java.util.NavigableSet;
-import java.util.Objects;
-import java.util.TreeSet;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class ETFCompat {
-    public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.literal("\uD83D\uDC2E ").append(Text.translatable("config.entity_texture_features.title"))));
-        ETFConfig etfConfig = ETFApi.getETFConfigObject();
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
-            etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
-            etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
-                Text.literal(etfConfig.emissiveRenderMode.toString())), (button) -> {
-            final NavigableSet<ETFConfig.EmissiveRenderModes> set =
-                    new TreeSet<>(EnumSet.allOf(ETFConfig.EmissiveRenderModes.class));
-
-            etfConfig.emissiveRenderMode = Objects.requireNonNullElseGet(
-                    set.higher(etfConfig.emissiveRenderMode), set::first);
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
-            etfConfig.enableBlinking = !etfConfig.enableBlinking;
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
-            etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
-            ETFApi.saveETFConfigChangesAndResetETF();
-        }));
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/IrisCompat.java

@@ -1,25 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import net.irisshaders.iris.api.v0.IrisApi;
-import net.irisshaders.iris.api.v0.IrisApiConfig;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.PuzzleGui;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-public class IrisCompat {
-    public static void init() {
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83D\uDC41 Iris")));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleGui.YES : PuzzleGui.NO), (button) -> {
-            IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
-            irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
-        }));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.literal("➥ ").append(Text.translatable("iris.puzzle.option.open").formatted(Formatting.GOLD))), (button) -> {
-            MinecraftClient client = MinecraftClient.getInstance();
-            client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
-        }));
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/LBGCompat.java

@@ -1,19 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import dev.lambdaurora.lambdabettergrass.LBGConfig;
-import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class LBGCompat {
-    public static void init() {
-        LBGConfig lbgConfig = LambdaBetterGrass.get().config;
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83C\uDF31 LambdaBetterGrass")));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
-    }
-}

common/src/main/java/net/puzzlemc/gui/compat/LDLCompat.java

@@ -1,23 +0,0 @@
-package net.puzzlemc.gui.compat;
-
-import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
-import dev.lambdaurora.lambdynlights.LambDynLights;
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
-
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
-public class LDLCompat {
-    public static void init() {
-        DynamicLightsConfig ldlConfig = LambDynLights.get().config;
-
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83D\uDCA1 LambDynamicLights")));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
-    }
-}

common/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java

@@ -1,52 +0,0 @@
-package net.puzzlemc.gui.mixin;
-
-import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.client.gui.widget.TextIconButtonWidget;
-import net.minecraft.client.gui.widget.ThreePartsLayoutWidget;
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.gui.PuzzleGui;
-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 org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-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 abstract class MixinOptionsScreen extends Screen {
-    @Shadow @Final private ThreePartsLayoutWidget layout;
-    @Unique TextIconButtonWidget puzzle$button = TextIconButtonWidget.builder(Text.translatable("puzzle.screen.title"), (buttonWidget) ->
-            (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), true)
-            .dimension(20, 20).texture(PuzzleGui.PUZZLE_BUTTON, 20, 20).build();
-
-    private MixinOptionsScreen(Text title) {super(title);}
-
-    @Inject(at = @At("HEAD"), method = "init")
-    public void puzzle$onInit(CallbackInfo ci) {
-        if (PuzzleConfig.enablePuzzleButton) {
-            this.puzzle$setButtonPos();
-            this.addDrawableChild(puzzle$button);
-        }
-    }
-
-    @Inject(at = @At("TAIL"), method = "refreshWidgetPositions")
-    public void puzzle$onResize(CallbackInfo ci) {
-        if (PuzzleConfig.enablePuzzleButton) this.puzzle$setButtonPos();
-    }
-
-    @Unique
-    public void puzzle$setButtonPos() {
-        int i = 0;
-        if (PlatformFunctions.isModLoaded("lod")) i = i + 358;
-        if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25;
-        puzzle$button.setPosition(this.width / 2 - 178 + i, layout.getY() + layout.getFooterHeight() - 4);
-    }
-}

common/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java

@@ -1,92 +0,0 @@
-package net.puzzlemc.gui.screen;
-
-import com.google.common.collect.Lists;
-import net.minecraft.client.gui.tab.GridScreenTab;
-import net.minecraft.client.gui.tab.Tab;
-import net.minecraft.client.gui.tab.TabManager;
-import net.minecraft.client.gui.widget.TabNavigationWidget;
-import net.minecraft.screen.ScreenTexts;
-import net.minecraft.text.Text;
-import net.puzzlemc.gui.PuzzleApi;
-import net.puzzlemc.gui.PuzzleGui;
-import net.puzzlemc.gui.screen.widget.*;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-
-import java.util.List;
-import java.util.Objects;
-
-public class PuzzleOptionsScreen extends Screen {
-    public PuzzleOptionListWidget list;
-    public List<Text> tooltip = null;
-    public TabManager tabManager = new TabManager(a -> {}, a -> {});
-    public Tab prevTab;
-    public TabNavigationWidget tabNavigation;
-    public static Text graphicsTab = Text.translatable("puzzle.page.graphics");
-    public static Text miscTab = Text.translatable("puzzle.page.misc");
-    public static Text performanceTab = Text.translatable("puzzle.page.performance");
-    public static Text resourcesTab = Text.translatable("puzzle.page.resources");
-
-    public PuzzleOptionsScreen(Screen parent) {
-        super(Text.translatable("puzzle.screen.title"));
-        this.parent = parent;
-    }
-    private final Screen parent;
-
-    @Override
-    protected void init() {
-        if (!PuzzleGui.lateInitDone) PuzzleGui.lateInit();
-
-        List<Tab> tabs = Lists.newArrayList();
-        if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(graphicsTab));
-        if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(resourcesTab));
-        if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(performanceTab));
-        if (!PuzzleApi.MISC_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(miscTab));
-
-        tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.toArray(new Tab[0])).build();
-        tabNavigation.selectTab(0, false);
-        tabNavigation.init();
-        prevTab = tabManager.getCurrentTab();
-
-        this.list = new PuzzleOptionListWidget(this.client, this.width, this.height - 57, 24, 25);
-        fillList();
-
-        if (tabs.size() > 1) {
-            this.addDrawableChild(tabNavigation);
-            list.renderHeaderSeparator = false;
-        }
-
-        this.addDrawableChild(list);
-
-        super.init();
-        this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height - 26, 200, 20).build());
-    }
-    private void fillList() {
-        List<PuzzleWidget> options = List.of();
-        if (tabManager.getCurrentTab() == null) return;
-        else {
-            Text title = tabManager.getCurrentTab().getTitle();
-            if (title.equals(graphicsTab)) options = PuzzleApi.GRAPHICS_OPTIONS;
-            else if (title.equals(miscTab)) options = PuzzleApi.MISC_OPTIONS;
-            else if (title.equals(performanceTab))
-                options = PuzzleApi.PERFORMANCE_OPTIONS;
-            else if (title.equals(resourcesTab)) options = PuzzleApi.RESOURCE_OPTIONS;
-        }
-        list.addAll(options);
-    }
-    @Override
-    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true;
-        return super.keyPressed(keyCode, scanCode, modifiers);
-    }
-    @Override
-    public void tick() {
-        super.tick();
-        if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
-            prevTab = tabManager.getCurrentTab();
-            this.list.clear();
-            fillList();
-            list.setScrollY(0);
-        }
-    }
-}

common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleButtonWidget.java

@@ -1,22 +0,0 @@
-package net.puzzlemc.gui.screen.widget;
-
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.text.Text;
-
-import java.util.function.Supplier;
-
-public class PuzzleButtonWidget extends ButtonWidget {
-    private final PuzzleWidget.TextAction title;
-
-    public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, PressAction onPress) {
-        super(x, y, width, height, Text.of(""), onPress, Supplier::get);
-        this.title = title;
-    }
-    @Override
-    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
-        try { title.setTitle(this);
-        } catch (Exception e) {e.fillInStackTrace(); this.visible = false;}
-        super.renderWidget(context, mouseX, mouseY, delta);
-    }
-}

common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java

@@ -1,96 +0,0 @@
-package net.puzzlemc.gui.screen.widget;
-
-import eu.midnightdust.lib.config.MidnightConfig;
-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.DrawContext;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.resource.language.I18n;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableTextContent;
-import net.minecraft.util.Formatting;
-import net.puzzlemc.gui.PuzzleGui;
-import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-@Environment(EnvType.CLIENT)
-public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWidget {
-    TextRenderer textRenderer;
-
-    public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l) {
-        super(minecraftClient, i, j, k, l);
-        this.centerListVertically = false;
-        textRenderer = minecraftClient.textRenderer;
-    }
-
-    public void addAll(List<PuzzleWidget> buttons) {
-        int buttonX = this.width - 160;
-        for (PuzzleWidget button : buttons) {
-            try {
-                if (button.buttonType == ButtonType.TEXT)
-                    this.addButton(List.of(), Text.literal("").append(button.descriptionText).formatted(Formatting.BOLD));
-                else if (button.buttonType == ButtonType.BUTTON)
-                    this.addButton(List.of(new PuzzleButtonWidget(buttonX, 0, 150, 20, button.buttonTextAction, button.onPress)), button.descriptionText);
-                else if (button.buttonType == ButtonType.SLIDER)
-                    this.addButton(List.of(new PuzzleSliderWidget(button.min, button.max, buttonX, 0, 150, 20, button.defaultSliderValue.getAsInt(), button.buttonTextAction, button.changeSliderValue)), button.descriptionText);
-                else if (button.buttonType == ButtonType.TEXT_FIELD)
-                    this.addButton(List.of(new PuzzleTextFieldWidget(textRenderer, buttonX, 0, 150, 20, button.setTextValue, button.changeTextValue)), button.descriptionText);
-                else
-                    PuzzleGui.logger().warn("Button {} is missing the buttonType variable. This shouldn't happen!", button);
-            }
-            catch (Exception e) {
-                PuzzleGui.logger().error("Failed to add button {}. Likely caused by an update of the specific mod.", button.descriptionText);
-            }
-
-        }
-    }
-    public void addButton(List<ClickableWidget> buttons, Text text) {
-        MidnightConfig.EntryInfo info = new MidnightConfig.EntryInfo(null, "puzzle");
-        if (buttons.isEmpty()) info.comment = new MidnightConfig.Comment(){
-            public Class<? extends Annotation> annotationType() {return null;}
-            public boolean centered() {return true;}
-            public String category() {return "";}
-            public String name() {return "";}
-            public String requiredMod() {return "";}
-        };
-        var entry = new MidnightConfig.ButtonEntry(buttons, text, info);
-        this.addEntry(entry);
-    }
-    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
-        super.renderWidget(context, mouseX, mouseY, delta);
-        MidnightConfig.ButtonEntry e = this.getHoveredEntry();
-        if (client.currentScreen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() &&
-                e.text.getContent() instanceof TranslatableTextContent content) {
-            ClickableWidget button = e.buttons.getFirst();
-            String key = null;
-            if (I18n.hasTranslation(content.getKey() + ".tooltip")) key = content.getKey() + ".tooltip";
-            else if (I18n.hasTranslation(content.getKey() + ".desc")) key = content.getKey() + ".desc";
-            if (key == null && content.getKey().endsWith(".title")) {
-                String strippedContent = content.getKey().substring(0, content.getKey().length()-6);
-                if (I18n.hasTranslation(strippedContent + ".tooltip")) key = strippedContent + ".tooltip";
-                else if (I18n.hasTranslation(strippedContent + ".desc")) key = strippedContent + ".desc";
-            }
-
-            if (key != null) {
-                List<Text> list = new ArrayList<>();
-                for (String str : I18n.translate(key).split("\n"))
-                    list.add(Text.literal(str));
-                page.tooltip = list;
-                if (!button.isMouseOver(mouseX, mouseY)) {
-                    context.drawTooltip(textRenderer, list, button.getX(), button.getY() + (button.getHeight() * 2));
-                }
-                else context.drawTooltip(textRenderer, list, mouseX, mouseY);
-            }
-        }
-    }
-
-    @Override
-    public MidnightConfig.ButtonEntry getHoveredEntry() {
-        return super.getHoveredEntry();
-    }
-}

common/src/main/java/net/puzzlemc/predicates/BlockStateOverride.java

@@ -1,14 +0,0 @@
-package net.puzzlemc.predicates;
-
-import com.mojang.serialization.MapCodec;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.puzzlemc.predicates.mixin.StateAccessor;
-
-public class BlockStateOverride extends BlockState {
-    public final Identifier overrideId;
-    public BlockStateOverride(BlockState baseState, Identifier overrideId) {
-        super(baseState.getBlock(), ((StateAccessor<?, ?>)baseState).getPropertyMap(), (MapCodec<BlockState>) ((StateAccessor<?, ?>)baseState).getCodec());
-        this.overrideId = overrideId;
-    }
-}

common/src/main/java/net/puzzlemc/predicates/MBPData.java

@@ -1,29 +0,0 @@
-package net.puzzlemc.predicates;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.logic.When;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-
-public class MBPData {
-    public static final HashMap<Block, List<When>> PREDICATES = new HashMap<>();
-
-    public static Optional<BlockStateOverride> meetsPredicate(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        if (PREDICATES.containsKey(state.getBlock())) {
-            for (When when : PREDICATES.get(state.getBlock())) {
-                if (when.meetsCondition(world, pos, state, renderContext)) {
-                    long seed = pos.hashCode();
-                    return Optional.of(new BlockStateOverride(state, when.getModel(seed)));
-                }
-            }
-        }
-
-        return Optional.empty();
-    }
-}

common/src/main/java/net/puzzlemc/predicates/MBPMixinPlugin.java

@@ -1,68 +0,0 @@
-package net.puzzlemc.predicates;
-
-import net.fabricmc.loader.api.FabricLoader;
-import org.objectweb.asm.tree.ClassNode;
-import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
-import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
-
-import java.util.List;
-import java.util.Set;
-
-public class MBPMixinPlugin implements IMixinConfigPlugin {
-    public static boolean HAS_SODIUM = false;
-    public static boolean HAS_WORLDMESHER = false;
-
-    @Override
-    public void onLoad(String mixinPackage) {
-        HAS_SODIUM = FabricLoader.getInstance().isModLoaded("sodium");
-        HAS_WORLDMESHER = FabricLoader.getInstance().isModLoaded("worldmesher");
-        StringBuilder builder = new StringBuilder();
-        if (HAS_SODIUM) {
-            builder.append("sodium, ");
-        }
-        if (HAS_WORLDMESHER) {
-            builder.append("worldmesher, ");
-        }
-        String str = "Starting MBP";
-        if (builder.length() > 0) {
-            str = str + " with " + builder.substring(0, builder.length()-2);
-        }
-        PuzzlePredicates.logger().debug(str);
-    }
-
-    @Override
-    public String getRefMapperConfig() {
-        return null;
-    }
-
-    @Override
-    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if (mixinClassName.equals("compat.sodium.ChunkBuilderMeshingTaskMixin"))
-            return HAS_SODIUM;
-        //if (mixinClassName.equals("BlockRenderManagerMixin"))
-        //    return !HAS_SODIUM;
-        //if (mixinClassName.equals("WorldMeshMixin"))
-            //return HAS_WORLDMESHER;
-        return true;
-    }
-
-    @Override
-    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
-
-    }
-
-    @Override
-    public List<String> getMixins() {
-        return List.of("compat.sodium.ChunkBuilderMeshingTaskMixin");
-    }
-
-    @Override
-    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-
-    }
-
-    @Override
-    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-
-    }
-}

common/src/main/java/net/puzzlemc/predicates/PuzzlePredicates.java

@@ -1,73 +0,0 @@
-package net.puzzlemc.predicates;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import net.minecraft.block.Block;
-import net.minecraft.client.render.entity.state.EntityRenderState;
-import net.minecraft.resource.Resource;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.util.Identifier;
-import net.puzzlemc.core.PuzzleModule;
-import net.puzzlemc.predicates.data.logic.When;
-import net.puzzlemc.predicates.util.Utils;
-import org.slf4j.Logger;
-
-import java.util.*;
-
-public class PuzzlePredicates implements PuzzleModule {
-    public static final PuzzlePredicates INSTANCE = new PuzzlePredicates();
-    public static EntityRenderState currentEntityRenderState;
-
-    @Override
-    public String getModuleId() {
-        return "predicates";
-    }
-
-    public static Logger logger() {
-        return INSTANCE.getLogger();
-    }
-
-    public static Identifier id(String path) {
-        return Identifier.of("mbp", path);
-    }
-
-    @Override
-    public void init() {
-        // TODO
-        //ModelLoadingPluginManager.registerPlugin(new MBPModelLoadingPlugin.ModelIdLoader(), new MBPModelLoadingPlugin());
-    }
-    @Override
-    public void reloadResources(ResourceManager manager) {
-        MBPData.PREDICATES.clear();
-
-        Map<Identifier, Resource> map = manager.findResources("mbp", id -> id.getPath().endsWith(".json"));
-        for (Identifier id : map.keySet()) {
-            getLogger().info("Loading MBP: " + id);
-            try {
-                Identifier blockTarget = Identifier.of(id.toString().substring(0,id.toString().length()-5).replace("mbp/", ""));
-                JsonObject asset = JsonParser.parseReader(map.get(id).getReader()).getAsJsonObject();
-
-                Optional<Block> block = Utils.getBlock(blockTarget);
-
-                if (block.isPresent()) {
-                    JsonArray overrides = asset.getAsJsonArray("overrides");
-                    List<When> whenList = new ArrayList<>();
-                    for(JsonElement overrideEntry : overrides) {
-                        When when = When.parse(overrideEntry);
-                        whenList.add(when);
-                    }
-                    MBPData.PREDICATES.put(block.get(), Collections.unmodifiableList(whenList));
-                    getLogger().info(MBPData.PREDICATES.toString());
-                } else {
-                    getLogger().error("Block entry not found in file %s: %s ".formatted(id, blockTarget));
-                }
-
-            } catch (Exception e) {
-                getLogger().error("Error in file: %s".formatted(id));
-                e.printStackTrace();
-            }
-        }
-    }
-}

common/src/main/java/net/puzzlemc/predicates/accessor/BlockRenderManagerAccess.java

@@ -1,12 +0,0 @@
-package net.puzzlemc.predicates.accessor;
-
-import net.minecraft.client.render.block.BlockRenderManager;
-import net.minecraft.client.render.entity.state.BlockDisplayEntityRenderState;
-
-public interface BlockRenderManagerAccess {
-    void moreBlockPredicates$setContextEntity(BlockDisplayEntityRenderState renderState);
-
-    static BlockRenderManagerAccess of(BlockRenderManager manager) {
-        return (BlockRenderManagerAccess) manager;
-    }
-}

common/src/main/java/net/puzzlemc/predicates/accessor/BlockStateModelManagerAccess.java

@@ -1,13 +0,0 @@
-package net.puzzlemc.predicates.accessor;
-
-import net.minecraft.client.render.model.BakedModelManager;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.puzzlemc.predicates.BlockStateOverride;
-
-public interface BlockStateModelManagerAccess {
-    BlockStateModel reallyGetModel(BlockStateOverride override);
-
-    static BlockStateModelManagerAccess of(BakedModelManager manager) {
-        return (BlockStateModelManagerAccess) manager;
-    }
-}

common/src/main/java/net/puzzlemc/predicates/common/BlockRendering.java

@@ -1,36 +0,0 @@
-package net.puzzlemc.predicates.common;
-
-import net.minecraft.block.BlockRenderType;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.render.block.BlockModels;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockRenderView;
-import net.puzzlemc.predicates.BlockStateOverride;
-import net.puzzlemc.predicates.MBPData;
-import net.puzzlemc.predicates.accessor.BlockStateModelManagerAccess;
-
-import java.util.Optional;
-
-public class BlockRendering {
-
-    public static BlockStateModel tryModelOverride(BlockModels models, BlockRenderView world, BlockState state, BlockPos pos, Identifier renderContext) {
-        BlockRenderType blockRenderType = state.getRenderType();
-        if (blockRenderType == BlockRenderType.MODEL) {
-            Optional<BlockStateOverride> override = MBPData.meetsPredicate(world, pos, state, renderContext);
-            if (override.isPresent()) {
-                BlockStateModel model;
-                BlockStateModelManagerAccess manager = ((BlockStateModelManagerAccess) models.getModelManager());
-                model = manager.reallyGetModel(override.get());
-                if (model == models.getModelManager().getMissingModel()) {
-                    var overId = override.get();
-                    model = models.getModelManager().getBlockModels().getModel((BlockState) model);
-                }
-                return model;
-            }
-        }
-        return null;
-    }
-
-}

common/src/main/java/net/puzzlemc/predicates/common/ContextIdentifiers.java

@@ -1,16 +0,0 @@
-package net.puzzlemc.predicates.common;
-
-import net.minecraft.util.Identifier;
-
-import static net.puzzlemc.predicates.PuzzlePredicates.id;
-
-public final class ContextIdentifiers {
-    public static final Identifier PISTON_PUSHING = id("pushed_by_piston");
-    public static final Identifier FALLING_BLOCK = id("falling_block");
-    public static final Identifier MARKER_PARTICLE = id("marker_particle");
-    public static final Identifier ITEM = id("item");
-    public static final Identifier ITEM_HELD = id("item_held");
-    public static final Identifier MISC = id("misc");
-    public static final Identifier CHUNK_MESH = id("chunk_mesh");
-    public static final Identifier ENTITY = id("entity");
-}

common/src/main/java/net/puzzlemc/predicates/data/BlockModelPredicate.java

@@ -1,63 +0,0 @@
-package net.puzzlemc.predicates.data;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import net.puzzlemc.predicates.PuzzlePredicates;
-import net.puzzlemc.predicates.data.conditions.*;
-import net.puzzlemc.predicates.data.logic.Not;
-import net.puzzlemc.predicates.data.logic.Or;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
-public abstract class BlockModelPredicate implements WorldViewCondition {
-    private static final HashMap<String, Function<JsonElement, BlockModelPredicate>> HANDLERS = new HashMap<>() {{
-        // Logical operators
-        put("or", Or::parse);
-        put("not", Not::parse);
-
-        // Actual conditions
-        put("adjacent_block", AdjacentBlock::parse);
-        put("coordinate_range", CoordinateRange::parse);
-        put("biome", InBiome::parse);
-        put("state", IsBlockState::parse);
-        put("light_range", LightRange::parse);
-        put("is_context", IsContext::parse);
-    }};
-
-    public static ArrayList<BlockModelPredicate> parseFromJson(JsonElement element) {
-        ArrayList<JsonObject> objects = new ArrayList<>();
-        if (element.isJsonArray()) {
-            JsonArray arr = element.getAsJsonArray();
-            for (JsonElement obj : arr) {
-                objects.add(obj.getAsJsonObject());
-            }
-        } else {
-            objects.add(element.getAsJsonObject());
-        }
-
-        ArrayList<BlockModelPredicate> predicates = new ArrayList<>();
-        for(JsonObject curObject : objects) {
-            for (Map.Entry<String, JsonElement> entries : curObject.entrySet()) {
-                if (HANDLERS.containsKey(entries.getKey())) {
-                    try {
-                        predicates.add(HANDLERS.get(entries.getKey()).apply(entries.getValue()));
-                    } catch (JsonParseException e) {
-                        PuzzlePredicates.logger().warn(String.format("Failed to load predicate \"%s\"! Reason: %s", entries.getKey(), e.getMessage()));
-                    }
-                } else {
-                    PuzzlePredicates.logger().warn(String.format("Unhandled predicate \"%s\"!", entries.getKey()));
-                }
-            }
-        }
-
-        return predicates;
-    }
-
-
-
-}

common/src/main/java/net/puzzlemc/predicates/data/DataHelper.java

@@ -1,33 +0,0 @@
-package net.puzzlemc.predicates.data;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import net.minecraft.predicate.NumberRange;
-import net.minecraft.util.math.BlockPos;
-
-public final class DataHelper {
-
-    public static NumberRange.IntRange parseIntRange(JsonElement arg) {
-        JsonObject object = arg.getAsJsonObject();
-
-        boolean hasMin = object.has("min"), hasMax = object.has("max");
-        if (hasMin && hasMax) {
-            return NumberRange.IntRange.between(object.get("min").getAsInt(), object.get("max").getAsInt());
-        } else if (hasMin) {
-            return NumberRange.IntRange.atLeast(object.get("min").getAsInt());
-        } else if (hasMax) {
-            return NumberRange.IntRange.atMost(object.get("max").getAsInt());
-        } else {
-            // none?!?!??!?!?!?!?!?!
-            throw new JsonParseException("No min or max defined for range!");
-        }
-    }
-
-    public static BlockPos parseBlockPos(JsonObject offset) {
-        int x = offset.get("x").getAsInt();
-        int y = offset.get("y").getAsInt();
-        int z = offset.get("z").getAsInt();
-        return new BlockPos(x, y, z);
-    }
-}

common/src/main/java/net/puzzlemc/predicates/data/WorldViewCondition.java

@@ -1,10 +0,0 @@
-package net.puzzlemc.predicates.data;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-
-public interface WorldViewCondition {
-    boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext);
-}

common/src/main/java/net/puzzlemc/predicates/data/conditions/AdjacentBlock.java

@@ -1,50 +0,0 @@
-package net.puzzlemc.predicates.data.conditions;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-import net.puzzlemc.predicates.data.DataHelper;
-import org.jetbrains.annotations.Nullable;
-
-public class AdjacentBlock extends BlockModelPredicate {
-
-    private final @Nullable IsBlockState stateCondition;
-    private final BlockPos offset;
-    private final boolean checkFullCube;
-    private final boolean checkTransparent;
-    public AdjacentBlock(@Nullable IsBlockState stateCondition, BlockPos offset, boolean checkFullCube, boolean checkTransparent) {
-        this.stateCondition = stateCondition;
-        this.offset = offset;
-        this.checkFullCube = checkFullCube;
-        this.checkTransparent = checkTransparent;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        BlockState block = world.getBlockState(pos);
-        boolean b = true;
-        if (checkFullCube) b = block.isFullCube(world, pos);
-        if (checkTransparent) b &= block.isTransparent();
-        if (stateCondition != null) b &= stateCondition.meetsCondition(world, pos.add(offset), state, renderContext);
-        return b;
-    }
-
-    public static AdjacentBlock parse(JsonElement arg) {
-        JsonObject obj = arg.getAsJsonObject();
-        IsBlockState stateCondition = null;
-        if (obj.has("state")) {
-            stateCondition = IsBlockState.parse(obj.get("state"));
-        }
-
-        boolean checkFullCube = false;
-        boolean checkTransparent = false;
-        if (obj.has("is_full_cube")) checkFullCube = obj.get("is_full_cube").getAsBoolean();
-        if (obj.has("is_transparent")) checkTransparent = obj.get("is_transparent").getAsBoolean();
-
-        return new AdjacentBlock(stateCondition, DataHelper.parseBlockPos(obj.getAsJsonObject("offset")), checkFullCube, checkTransparent);
-    }
-}

common/src/main/java/net/puzzlemc/predicates/data/conditions/CoordinateRange.java

@@ -1,35 +0,0 @@
-package net.puzzlemc.predicates.data.conditions;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import net.minecraft.block.BlockState;
-import net.minecraft.predicate.NumberRange;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-import net.puzzlemc.predicates.data.DataHelper;
-
-public class CoordinateRange extends BlockModelPredicate {
-
-    public final NumberRange.IntRange range;
-    public final Direction.Axis axis;
-
-    public CoordinateRange(NumberRange.IntRange range, Direction.Axis axis) {
-        this.range = range;
-        this.axis = axis;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        return range.test(pos.getComponentAlongAxis(this.axis));
-    }
-
-    public static CoordinateRange parse(JsonElement arg) {
-        JsonObject object = arg.getAsJsonObject();
-
-        Direction.Axis axis = Direction.Axis.fromId(object.get("axis").getAsString());
-        return new CoordinateRange(DataHelper.parseIntRange(arg), axis);
-    }
-}

common/src/main/java/net/puzzlemc/predicates/data/conditions/InBiome.java

@@ -1,30 +0,0 @@
-package net.puzzlemc.predicates.data.conditions;
-
-import com.google.gson.JsonElement;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.minecraft.world.World;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-
-public class InBiome extends BlockModelPredicate {
-
-    final Identifier biomeID;
-
-    public InBiome(Identifier biomeID) {
-        this.biomeID = biomeID;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        World w = MinecraftClient.getInstance().world;;
-        assert w != null;
-        return w.getBiome(pos).matchesId(biomeID);
-    }
-
-    public static InBiome parse(JsonElement arg) {
-        return new InBiome(Identifier.of(arg.getAsString()));
-    }
-}

common/src/main/java/net/puzzlemc/predicates/data/conditions/IsBlockState.java

@@ -1,68 +0,0 @@
-package net.puzzlemc.predicates.data.conditions;
-
-import com.google.gson.JsonElement;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.pattern.CachedBlockPosition;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.command.argument.BlockArgumentParser;
-import net.minecraft.command.argument.BlockPredicateArgumentType;
-import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-import org.jetbrains.annotations.Nullable;
-
-public class IsBlockState extends BlockModelPredicate {
-
-    final @Nullable BlockPredicateImpl blockStatePredicate;
-    public IsBlockState(@Nullable BlockPredicateImpl blockStatePredicate) {
-        this.blockStatePredicate = blockStatePredicate;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        if (blockStatePredicate == null) return true;
-        return blockStatePredicate.test(new CachedBlockPosition(MinecraftClient.getInstance().world, pos, false));
-    }
-
-    public static IsBlockState parse(JsonElement arg) {
-        try {
-            String str = arg.getAsString();
-
-            if (str != null) {
-                return new IsBlockState(new BlockPredicateImpl(str));
-            }
-
-            return null; // explode
-        } catch (CommandSyntaxException e) {
-           throw new RuntimeException(e);
-        }
-    }
-
-    private static class BlockPredicateImpl implements BlockPredicateArgumentType.BlockPredicate {
-        final BlockArgumentParser.BlockResult res;
-        public final String stateString;
-        public final boolean fuzzy;
-
-        public BlockPredicateImpl(String stateString) throws CommandSyntaxException {
-            this.stateString = stateString;
-            fuzzy = !stateString.contains("[");
-            res = BlockArgumentParser.block(Registries.BLOCK, stateString, false);
-        }
-
-        @Override
-        public boolean hasNbt() {
-            return false;
-        }
-
-        @Override
-        public boolean test(CachedBlockPosition cachedBlockPosition) {
-            if (fuzzy) return cachedBlockPosition.getBlockState().getBlock() == res.blockState().getBlock();
-            return cachedBlockPosition.getBlockState().equals(res.blockState());
-        }
-    }
-
-
-}

common/src/main/java/net/puzzlemc/predicates/data/conditions/IsContext.java

@@ -1,27 +0,0 @@
-package net.puzzlemc.predicates.data.conditions;
-
-import com.google.gson.JsonElement;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-
-public class IsContext extends BlockModelPredicate {
-
-    final Identifier expectedContext;
-
-    public IsContext(Identifier expectedContext) {
-        this.expectedContext = expectedContext;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        return expectedContext.equals(renderContext);
-    }
-
-    public static IsContext parse(JsonElement arg) {
-        return new IsContext(Identifier.of(arg.getAsString()));
-    }
-
-}

common/src/main/java/net/puzzlemc/predicates/data/conditions/LightRange.java

@@ -1,39 +0,0 @@
-package net.puzzlemc.predicates.data.conditions;
-
-import com.google.gson.JsonElement;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.predicate.NumberRange;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.minecraft.world.World;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-import net.puzzlemc.predicates.data.DataHelper;
-
-public class LightRange extends BlockModelPredicate {
-
-    public final NumberRange.IntRange range;
-
-    public LightRange(NumberRange.IntRange range) {
-        this.range = range;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView _unused, BlockPos pos, BlockState state, Identifier renderContext) {
-        World world = MinecraftClient.getInstance().world;
-
-        // ;-;
-        return range.test(world.getLightLevel(pos))
-             || range.test(world.getLightLevel(pos.up()))
-             || range.test(world.getLightLevel(pos.down()))
-             || range.test(world.getLightLevel(pos.north()))
-             || range.test(world.getLightLevel(pos.south()))
-             || range.test(world.getLightLevel(pos.east()))
-             || range.test(world.getLightLevel(pos.west()));
-    }
-
-    public static LightRange parse(JsonElement arg) {
-        return new LightRange(DataHelper.parseIntRange(arg));
-    }
-}

common/src/main/java/net/puzzlemc/predicates/data/logic/And.java

@@ -1,32 +0,0 @@
-package net.puzzlemc.predicates.data.logic;
-
-import com.google.common.collect.ImmutableList;
-import com.google.gson.JsonElement;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-
-import java.util.List;
-
-public class And extends BlockModelPredicate {
-
-    final List<BlockModelPredicate> predicates;
-
-    public And(List<BlockModelPredicate> predicates) {
-        this.predicates = predicates;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        for (BlockModelPredicate action : predicates) {
-            if (!action.meetsCondition(world, pos, state, renderContext)) return false;
-        }
-        return true;
-    }
-
-    public static And parse(JsonElement arg) {
-        return new And(ImmutableList.copyOf(BlockModelPredicate.parseFromJson(arg)));
-    }
-}

common/src/main/java/net/puzzlemc/predicates/data/logic/Not.java

@@ -1,26 +0,0 @@
-package net.puzzlemc.predicates.data.logic;
-
-import com.google.gson.JsonElement;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-
-public class Not extends BlockModelPredicate {
-
-    final And condition;
-
-    public Not(And condition) {
-        this.condition = condition;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        return !condition.meetsCondition(world, pos, state, renderContext);
-    }
-
-    public static Not parse(JsonElement arg) {
-        return new Not(And.parse(arg));
-    }
-}

common/src/main/java/net/puzzlemc/predicates/data/logic/Or.java

@@ -1,39 +0,0 @@
-package net.puzzlemc.predicates.data.logic;
-
-import com.google.common.collect.ImmutableList;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Or extends BlockModelPredicate {
-
-    final List<And> conditions;
-
-    public Or(List<And> conditions) {
-        this.conditions = conditions;
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        for (And action : conditions) {
-            if (action.meetsCondition(world, pos, state, renderContext)) return true;
-        }
-        return false;
-    }
-
-    public static Or parse(JsonElement arg) {
-        ArrayList<And> conditionsList = new ArrayList<>();
-        JsonArray entryArray = arg.getAsJsonArray();
-        for (JsonElement entry : entryArray) {
-            conditionsList.add(And.parse(entry));
-        }
-        return new Or(ImmutableList.copyOf(conditionsList));
-    }
-}

common/src/main/java/net/puzzlemc/predicates/data/logic/When.java

@@ -1,71 +0,0 @@
-package net.puzzlemc.predicates.data.logic;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
-import net.puzzlemc.predicates.data.BlockModelPredicate;
-import net.puzzlemc.predicates.data.WorldViewCondition;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class When implements WorldViewCondition {
-
-    final And conditions;
-    private final List<Identifier> applyModelList;
-
-    public When(And conditions, List<Identifier> applyModelList) {
-        this.conditions = conditions;
-        this.applyModelList = Collections.unmodifiableList(applyModelList);
-    }
-
-    public Identifier getModel(long seed) {
-        return applyModelList.get((int) (Math.abs(seed) % applyModelList.size()));
-    }
-
-    public List<Identifier> getModels() {
-        return applyModelList;
-    }
-
-    public static When parse(JsonElement arg) {
-        JsonObject object = arg.getAsJsonObject();
-        List<BlockModelPredicate> conditions = BlockModelPredicate.parseFromJson(object.get("when"));
-
-        List<Identifier> applyModelList;
-        JsonElement apply = object.get("apply");
-        if (apply.isJsonArray()) {
-            applyModelList = new ArrayList<>();
-            for (JsonElement entry : apply.getAsJsonArray()) {
-                String applyId;
-                int weight = 1;
-                if (entry.isJsonObject()) {
-                    JsonObject obj = entry.getAsJsonObject();
-                    applyId = obj.get("model").getAsString();
-                    if (obj.has("weight")) weight = obj.get("weight").getAsInt();
-                } else {
-                    applyId = entry.getAsString();
-                }
-
-                String[] id = applyId.split(":");
-                Identifier currentModelID = Identifier.of(id[0], "block/" + id[1]);
-                for (int i = 0; i < weight; i++) {
-                    applyModelList.add(currentModelID);
-                }
-            }
-        } else {
-            String[] id = apply.getAsString().split(":");
-            applyModelList = List.of(Identifier.of(id[0], "block/" + id[1]));
-        }
-
-        return new When(new And(conditions), applyModelList);
-    }
-
-    @Override
-    public boolean meetsCondition(BlockView world, BlockPos pos, BlockState state, Identifier renderContext) {
-        return conditions.meetsCondition(world, pos, state, renderContext);
-    }
-}

common/src/main/java/net/puzzlemc/predicates/mixin/BakedModelManagerMixin.java

@@ -1,60 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import net.minecraft.client.render.block.BlockModels;
-import net.minecraft.client.render.model.BakedModelManager;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.puzzlemc.predicates.BlockStateOverride;
-import net.puzzlemc.predicates.accessor.BlockStateModelManagerAccess;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-
-@Mixin(BakedModelManager.class)
-public abstract class BakedModelManagerMixin implements BlockStateModelManagerAccess {
-
-    //@Shadow private Map<Identifier, BlockStateModel> models;
-
-    @Shadow public abstract BlockStateModel getMissingModel();
-
-    @Shadow public abstract BlockModels getBlockModels();
-
-    @Override @Unique
-    public BlockStateModel reallyGetModel(BlockStateOverride override) {
-        return getBlockModels().getModel(override);
-        //return models.getOrDefault(model, this.getMissingModel());
-    }
-
-
-    // ITEMS (originally from ItemRendererMixin)
-
-//    @Inject(method = "getModel", at = @At(value = "HEAD"))
-//    private void getHeldItemModelVariableStealerLol(ItemStack stack, World world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
-//        this.world = world;
-//        this.entity = entity;
-//    }
-//
-//    @Redirect(method = "getModel", at = @At(value = "INVOKE",target = "Lnet/minecraft/client/render/item/ItemModels;getModel(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/client/render/model/BakedModel;"))
-//    private BakedModel getHeldItemModelMixin(ItemModels itemModels, ItemStack stack) {
-//        if (world == null || entity == null) return itemModels.getModel(stack);
-//
-//        BlockPos targetPos = entity.getBlockPos();
-//        if (entity instanceof PlayerEntity player) {
-//            HitResult hit = player.raycast(8, MinecraftClient.getInstance().getTickDelta(), false);
-//            if (hit instanceof BlockHitResult blockHitResult) {
-//                targetPos = blockHitResult.getBlockPos().add(blockHitResult.getSide().getVector());
-//            }
-//        }
-//
-//        Optional<Identifier> identifier = MBPData.meetsPredicate(world, targetPos, Block.getBlockFromItem(stack.getItem()).getDefaultState(), ContextIdentifiers.ITEM_HELD);
-//
-//        if (identifier.isPresent()) {
-//            BlockStateModelManagerAccess access = BlockStateModelManagerAccess.of(itemModels.getModelManager());
-//            return access.reallyGetModel(identifier.get());
-//        }
-//
-//        world = null;
-//        entity = null;
-//        return itemModels.getModel(stack);
-//    }
-
-}

common/src/main/java/net/puzzlemc/predicates/mixin/BlockDisplayEntityRendererMixin.java

@@ -1,24 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.block.BlockRenderManager;
-import net.minecraft.client.render.entity.DisplayEntityRenderer;
-import net.minecraft.client.render.entity.state.BlockDisplayEntityRenderState;
-import net.minecraft.client.util.math.MatrixStack;
-import net.puzzlemc.predicates.accessor.BlockRenderManagerAccess;
-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;
-
-@Mixin(DisplayEntityRenderer.BlockDisplayEntityRenderer.class)
-public class BlockDisplayEntityRendererMixin {
-    @Shadow @Final private BlockRenderManager blockRenderManager;
-
-    @Inject(method = "render(Lnet/minecraft/client/render/entity/state/BlockDisplayEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IF)V", at = @At("HEAD"))
-    public void getContext(BlockDisplayEntityRenderState blockDisplayEntityRenderState, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, float f, CallbackInfo ci) {
-        BlockRenderManagerAccess.of(blockRenderManager).moreBlockPredicates$setContextEntity(blockDisplayEntityRenderState);
-    }
-}

common/src/main/java/net/puzzlemc/predicates/mixin/BlockDustParticleMixin.java

@@ -1,40 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.particle.BlockDustParticle;
-import net.minecraft.client.particle.SpriteBillboardParticle;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.puzzlemc.predicates.BlockStateOverride;
-import net.puzzlemc.predicates.MBPData;
-import net.puzzlemc.predicates.accessor.BlockStateModelManagerAccess;
-import net.puzzlemc.predicates.common.ContextIdentifiers;
-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.Optional;
-
-@Mixin(BlockDustParticle.class)
-public abstract class BlockDustParticleMixin extends SpriteBillboardParticle {
-
-    protected BlockDustParticleMixin(ClientWorld clientWorld, double d, double e, double f) {
-        super(clientWorld, d, e, f);
-    }
-
-    @Inject(at = @At(value = "TAIL"), method = "<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)V")
-    public void init(ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ, BlockState state, BlockPos blockPos, CallbackInfo ci) {
-        Optional<BlockStateOverride> identifier = MBPData.meetsPredicate(world, blockPos, state, ContextIdentifiers.FALLING_BLOCK);
-
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (identifier.isPresent()) {
-            BlockStateModelManagerAccess access = BlockStateModelManagerAccess.of(client.getBakedModelManager());
-            setSprite(access.reallyGetModel(identifier.get()).particleSprite());
-        } else {
-            this.setSprite(client.getBlockRenderManager().getModels().getModelParticleSprite(state));
-        }
-    }
-}

common/src/main/java/net/puzzlemc/predicates/mixin/BlockMarkerParticleMixin.java

@@ -1,41 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.particle.BlockMarkerParticle;
-import net.minecraft.client.particle.SpriteBillboardParticle;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.puzzlemc.predicates.BlockStateOverride;
-import net.puzzlemc.predicates.MBPData;
-import net.puzzlemc.predicates.accessor.BlockStateModelManagerAccess;
-import net.puzzlemc.predicates.common.ContextIdentifiers;
-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.Optional;
-
-@Mixin(BlockMarkerParticle.class)
-public abstract class BlockMarkerParticleMixin extends SpriteBillboardParticle {
-
-    protected BlockMarkerParticleMixin(ClientWorld clientWorld, double d, double e, double f) {
-        super(clientWorld, d, e, f);
-
-    }
-
-    @Inject(at = @At(value = "TAIL"), method = "<init>")
-    public void init(ClientWorld world, double x, double y, double z, BlockState state, CallbackInfo ci) {
-        Optional<BlockStateOverride> identifier = MBPData.meetsPredicate(world, BlockPos.ofFloored(x, y, z), state, ContextIdentifiers.MARKER_PARTICLE);
-
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (identifier.isPresent()) {
-            BlockStateModelManagerAccess access = BlockStateModelManagerAccess.of(client.getBakedModelManager());
-            setSprite(access.reallyGetModel(identifier.get()).particleSprite());
-        } else {
-            this.setSprite(client.getBlockRenderManager().getModels().getModelParticleSprite(state));
-        }
-    }
-}

common/src/main/java/net/puzzlemc/predicates/mixin/BlockModelRendererMixin.java

@@ -1,47 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import net.minecraft.block.BlockRenderType;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.block.BlockModelRenderer;
-import net.minecraft.client.render.model.BlockModelPart;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockRenderView;
-import net.puzzlemc.predicates.PuzzlePredicates;
-import org.spongepowered.asm.mixin.Mixin;
-
-import java.util.List;
-
-@Mixin(BlockModelRenderer.class)
-public class BlockModelRendererMixin {
-
-    @WrapMethod(method = "render(Lnet/minecraft/world/BlockRenderView;Ljava/util/List;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZI)V")
-    public void renderBlock(BlockRenderView world, List<BlockModelPart> parts, BlockState state, BlockPos pos, MatrixStack matrices, VertexConsumer vertexConsumer, boolean cull, int overlay, Operation<Void> original) {
-        BlockRenderType blockRenderType = state.getRenderType();
-        System.out.println("B");
-        if (blockRenderType == BlockRenderType.MODEL) {
-            if (state.getBlock() == Blocks.SPRUCE_LEAVES) PuzzlePredicates.logger().info(":( Should be activated now");
-//            BlockStateModel newModel = BlockRendering.tryModelOverride(BlockModels, world, state, pos, ContextIdentifiers.MISC);
-//            if (newModel != null) {
-//                PuzzlePredicates.logger().info(":) Replacing "+state.getBlock().toString());
-//                // TODO: Don't create an instance of Random here
-//                original.call(world, newModel.getParts(Random.create()), state, pos, matrices, vertexConsumer, cull, OverlayTexture.DEFAULT_UV);
-//                //this.blockModelRenderer.render(world, newModel.getParts(random), state, pos, matrices, vertexConsumer, cull, OverlayTexture.DEFAULT_UV);
-//                //ci.cancel();
-//                return;
-//            }
-        }
-        original.call(world, parts, state, pos, matrices, vertexConsumer, cull, overlay);
-    }
-
-    @WrapMethod(method = "render(Lnet/minecraft/client/util/math/MatrixStack$Entry;Lnet/minecraft/client/render/VertexConsumer;Lnet/minecraft/client/render/model/BlockStateModel;FFFII)V")
-    private static void c(MatrixStack.Entry entry, VertexConsumer vertexConsumer, BlockStateModel model, float red, float green, float blue, int light, int overlay, Operation<Void> original) {
-        System.out.println("c");
-        original.call(entry, vertexConsumer, model, red, green, blue, light, overlay);
-    }
-}

common/src/main/java/net/puzzlemc/predicates/mixin/BlockRenderManagerMixin.java

@@ -1,99 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import net.minecraft.block.BlockRenderType;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.color.block.BlockColors;
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.RenderLayers;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.block.BlockModelRenderer;
-import net.minecraft.client.render.block.BlockModels;
-import net.minecraft.client.render.block.BlockRenderManager;
-import net.minecraft.client.render.entity.state.BlockDisplayEntityRenderState;
-import net.minecraft.client.render.model.BlockModelPart;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.random.Random;
-import net.minecraft.world.BlockRenderView;
-import net.puzzlemc.predicates.BlockStateOverride;
-import net.puzzlemc.predicates.MBPData;
-import net.puzzlemc.predicates.PuzzlePredicates;
-import net.puzzlemc.predicates.accessor.BlockStateModelManagerAccess;
-import net.puzzlemc.predicates.accessor.BlockRenderManagerAccess;
-import net.puzzlemc.predicates.common.BlockRendering;
-import net.puzzlemc.predicates.common.ContextIdentifiers;
-import net.puzzlemc.predicates.util.Utils;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-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.List;
-import java.util.Optional;
-
-@Mixin(value = BlockRenderManager.class, priority = 2000)
-public class BlockRenderManagerMixin implements BlockRenderManagerAccess {
-
-    @Shadow @Final private BlockModelRenderer blockModelRenderer;
-    @Shadow @Final private BlockModels models;
-    @Shadow @Final private BlockColors blockColors;
-    @Shadow @Final private Random random;
-
-    @Unique private BlockDisplayEntityRenderState mbp$contextRenderState;
-
-    @Inject(at = @At("HEAD"), method = "renderBlock", cancellable = true)
-    public void renderBlock(BlockState state, BlockPos pos, BlockRenderView world, MatrixStack matrices, VertexConsumer vertexConsumer, boolean cull, List<BlockModelPart> parts, CallbackInfo ci) {
-        BlockRenderType blockRenderType = state.getRenderType();
-        System.out.println("a");
-        if (blockRenderType == BlockRenderType.MODEL) {
-            if (state.getBlock() == Blocks.SPRUCE_LEAVES) PuzzlePredicates.logger().info(":( Should be activated now");
-            BlockStateModel newModel = BlockRendering.tryModelOverride(this.models, world, state, pos, ContextIdentifiers.MISC);
-            if (newModel != null) {
-                PuzzlePredicates.logger().info(":) Replacing "+state.getBlock().toString());
-                this.blockModelRenderer.render(world, newModel.getParts(random), state, pos, matrices, vertexConsumer, cull, OverlayTexture.DEFAULT_UV);
-                ci.cancel();
-            }
-        }
-    }
-
-    @Inject(at = @At("HEAD"), method = "renderBlockAsEntity", cancellable = true)
-    public void renderBlockAsEntity(BlockState state, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, CallbackInfo ci) {
-        if (state.getRenderType() == BlockRenderType.MODEL) {
-            BlockPos pos = mbp$contextRenderState == null ? BlockPos.ORIGIN : Utils.posFromRenderState(mbp$contextRenderState);
-            mbp$contextRenderState = null;
-            Optional<BlockStateOverride> id = MBPData.meetsPredicate(MinecraftClient.getInstance().world, pos, state, ContextIdentifiers.ENTITY);
-            if (id.isEmpty()) return;
-
-            BlockStateModel bakedModel = ((BlockStateModelManagerAccess) this.models.getModelManager()).reallyGetModel(id.get());
-            int i = this.blockColors.getColor(state, null, null, 0);
-            float f = (float) (i >> 16 & 0xFF) / 255.0F;
-            float g = (float) (i >> 8 & 0xFF) / 255.0F;
-            float h = (float) (i & 0xFF) / 255.0F;
-            BlockModelRenderer
-                    .render(
-                            matrices.peek(),
-                            vertexConsumers.getBuffer(RenderLayers.getEntityBlockLayer(state)),
-                            bakedModel,
-                            f,
-                            g,
-                            h,
-                            light,
-                            overlay
-                    );
-            ci.cancel();
-        }
-    }
-
-    @Override
-    public void moreBlockPredicates$setContextEntity(BlockDisplayEntityRenderState renderState) {
-        mbp$contextRenderState = renderState;
-    }
-}

common/src/main/java/net/puzzlemc/predicates/mixin/FallingBlockEntityRendererMixin.java

@@ -1,48 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.block.BlockRenderManager;
-import net.minecraft.client.render.entity.FallingBlockEntityRenderer;
-import net.minecraft.client.render.entity.state.FallingBlockEntityRenderState;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.puzzlemc.predicates.BlockStateOverride;
-import net.puzzlemc.predicates.MBPData;
-import net.puzzlemc.predicates.accessor.BlockStateModelManagerAccess;
-import net.puzzlemc.predicates.common.ContextIdentifiers;
-import net.puzzlemc.predicates.util.Utils;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-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.Optional;
-
-@Mixin(value = FallingBlockEntityRenderer.class, priority = 1100)
-public class FallingBlockEntityRendererMixin {
-
-    @Unique private FallingBlockEntityRenderState mbp$fallingBlockEntityRenderState;
-
-    @Inject(at = @At("HEAD"), method = "render(Lnet/minecraft/client/render/entity/state/FallingBlockEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V")
-    public void render(FallingBlockEntityRenderState fallingBlockEntityRenderState, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) {
-        this.mbp$fallingBlockEntityRenderState = fallingBlockEntityRenderState;
-    }
-
-    @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockRenderManager;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BlockStateModel;"),method = "render(Lnet/minecraft/client/render/entity/state/FallingBlockEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V")
-    public BlockStateModel render(BlockRenderManager instance, BlockState state, Operation<BlockStateModel> original) {
-        Optional<BlockStateOverride> identifier = MBPData.meetsPredicate(mbp$fallingBlockEntityRenderState.world, Utils.posFromRenderState(mbp$fallingBlockEntityRenderState), state, ContextIdentifiers.FALLING_BLOCK);
-
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (identifier.isPresent()) {
-            BlockStateModelManagerAccess access = BlockStateModelManagerAccess.of(client.getBakedModelManager());
-            return access.reallyGetModel(identifier.get());
-        } else {
-            return original.call(instance, state);
-        }
-    }
-}

common/src/main/java/net/puzzlemc/predicates/mixin/ItemEntityRendererMixin.java

@@ -1,21 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.ItemEntityRenderer;
-import net.minecraft.client.render.entity.state.ItemEntityRenderState;
-import net.minecraft.client.util.math.MatrixStack;
-import net.puzzlemc.predicates.PuzzlePredicates;
-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(ItemEntityRenderer.class)
-public class ItemEntityRendererMixin {
-
-    @Inject(at = @At("HEAD"), method = "render(Lnet/minecraft/client/render/entity/state/ItemEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V")
-    private void beforeRender(ItemEntityRenderState itemEntityRenderState, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) {
-        PuzzlePredicates.currentEntityRenderState = itemEntityRenderState;
-    }
-
-}

common/src/main/java/net/puzzlemc/predicates/mixin/ItemFrameEntityRendererMixin.java

@@ -1,22 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.ItemFrameEntityRenderer;
-import net.minecraft.client.render.entity.state.ItemFrameEntityRenderState;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.decoration.ItemFrameEntity;
-import net.puzzlemc.predicates.PuzzlePredicates;
-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(ItemFrameEntityRenderer.class)
-public class ItemFrameEntityRendererMixin<T extends ItemFrameEntity> {
-
-    @Inject(method = "render(Lnet/minecraft/client/render/entity/state/ItemFrameEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At("HEAD"))
-    public void renderMixin(ItemFrameEntityRenderState itemFrameEntityRenderState, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) {
-        PuzzlePredicates.currentEntityRenderState = itemFrameEntityRenderState;
-    }
-
-}

common/src/main/java/net/puzzlemc/predicates/mixin/ItemRendererMixin.java

@@ -1,73 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.hit.BlockHitResult;
-import net.minecraft.util.hit.HitResult;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.puzzlemc.predicates.MBPData;
-import net.puzzlemc.predicates.PuzzlePredicates;
-import net.puzzlemc.predicates.accessor.BlockStateModelManagerAccess;
-import net.puzzlemc.predicates.common.ContextIdentifiers;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Optional;
-
-@Mixin(ItemRenderer.class)
-public abstract class ItemRendererMixin {
-    //@Shadow @Final private ItemModels models;
-    @Unique private World world;
-    @Unique private Entity entity;
-
-
-
-    //@Redirect(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformation$Mode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/render/model/BakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/ItemRenderer;renderBakedItemModel(Lnet/minecraft/client/render/model/BakedModel;Lnet/minecraft/item/ItemStack;IILnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;)V"))
-//    @Redirect(
-//            method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/render/model/BakedModel;)V",
-//            at = @At(
-//                    value = "INVOKE",
-//                    target = "Lnet/minecraft/client/render/item/ItemRenderer;renderBakedItemModel(Lnet/minecraft/client/render/model/BakedModel;Lnet/minecraft/item/ItemStack;IILnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;)V"
-//            )
-//    )
-//    private void renderBakedModelMixin(ItemRenderer instance, BakedModel model, ItemStack stack, int light, int overlay, MatrixStack matrices, VertexConsumer vertices) {
-//        if (world == null) world = MinecraftClient.getInstance().world;
-//        if (entity == null) entity = MBPClient.currentEntity;
-//        if (entity == null) entity = MinecraftClient.getInstance().player;
-//
-//        if (entity != null) {
-//            BlockPos targetPos = entity.getBlockPos();
-//            if (entity instanceof PlayerEntity player) {
-//                HitResult hit = player.raycast(8, MinecraftClient.getInstance().getTickDelta(), false);
-//                if (hit instanceof BlockHitResult blockHitResult) {
-//                    targetPos = blockHitResult.getBlockPos().add(blockHitResult.getSide().getVector());
-//                }
-//            }
-//
-//            Optional<Identifier> identifier = MBPData.meetsPredicate(world, targetPos, Block.getBlockFromItem(stack.getItem()).getDefaultState(), ContextIdentifiers.ITEM);
-//            if (identifier.isPresent()) {
-//                BlockStateModelManagerAccess access = BlockStateModelManagerAccess.of(models.getModelManager());
-//                model = access.reallyGetModel(identifier.get());
-//            }
-//            PuzzlePredicates.currentEntityRenderState = null;
-//        }
-//
-//        this.renderBakedItemModel(model, stack, light, overlay, matrices, vertices);
-//    }
-}

common/src/main/java/net/puzzlemc/predicates/mixin/PistonBlockEntityRendererMixin.java

@@ -1,50 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.block.BlockRenderManager;
-import net.minecraft.client.render.block.entity.PistonBlockEntityRenderer;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.puzzlemc.predicates.BlockStateOverride;
-import net.puzzlemc.predicates.MBPData;
-import net.puzzlemc.predicates.accessor.BlockStateModelManagerAccess;
-import net.puzzlemc.predicates.common.ContextIdentifiers;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-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.Optional;
-
-@Mixin(value = PistonBlockEntityRenderer.class, priority = 1100)
-public class PistonBlockEntityRendererMixin {
-    @Unique private BlockPos mbp$tempBlockPos;
-    @Unique private World mbp$tempWorld;
-
-    @Inject(at = @At("HEAD"), method = "renderModel")
-    public void renderModel(BlockPos pos, BlockState state, MatrixStack matrices, VertexConsumerProvider vertexConsumers, World world, boolean cull, int overlay, CallbackInfo ci) {
-        this.mbp$tempBlockPos = pos;
-        this.mbp$tempWorld = world;
-    }
-
-    @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockRenderManager;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BlockStateModel;"), method = "renderModel")
-    public BlockStateModel renderModel(BlockRenderManager instance, BlockState state, Operation<BlockStateModel> original) {
-        Optional<BlockStateOverride> identifier = MBPData.meetsPredicate(mbp$tempWorld, mbp$tempBlockPos, state, ContextIdentifiers.PISTON_PUSHING);
-
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (identifier.isPresent()) {
-            BlockStateModelManagerAccess access = BlockStateModelManagerAccess.of(client.getBakedModelManager());
-            return access.reallyGetModel(identifier.get());
-        } else {
-            return original.call(instance, state);
-        }
-    }
-
-}

common/src/main/java/net/puzzlemc/predicates/mixin/StateAccessor.java

@@ -1,17 +0,0 @@
-package net.puzzlemc.predicates.mixin;
-
-import com.mojang.serialization.MapCodec;
-import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
-import net.minecraft.state.State;
-import net.minecraft.state.property.Property;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(State.class)
-public interface StateAccessor<O, S> {
-    @Accessor
-    Reference2ObjectArrayMap<Property<?>, Comparable<?>> getPropertyMap();
-
-    @Accessor
-    MapCodec<S> getCodec();
-}

common/src/main/java/net/puzzlemc/predicates/mixin/compat/sodium/ChunkBuilderMeshingTaskMixin.java

@@ -1,40 +0,0 @@
-package net.puzzlemc.predicates.mixin.compat.sodium;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.block.BlockModels;
-import net.minecraft.client.render.model.BlockStateModel;
-import net.minecraft.util.math.BlockPos;
-import net.puzzlemc.predicates.common.BlockRendering;
-import net.puzzlemc.predicates.common.ContextIdentifiers;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-
-//@Mixin(value = ChunkBuilderMeshingTask.class)
-public class ChunkBuilderMeshingTaskMixin {
-
-    @Unique private int x = 0;
-    @Unique private int y = 0;
-    @Unique private int z = 0;
-
-//    @Redirect(method = "execute(Lme/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lme/jellysquid/mods/sodium/client/util/task/CancellationToken;)Lme/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/world/WorldSlice;getBlockState(III)Lnet/minecraft/block/BlockState;"))
-//    public BlockState getBlockStateRedirect(WorldSlice worldSlice, int x, int y, int z) {
-//        this.x = x;
-//        this.y = y;
-//        this.z = z;
-//        return worldSlice.getBlockState(x,y,z);
-//    }
-//
-//    @Redirect(method = "execute(Lme/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lme/jellysquid/mods/sodium/client/util/task/CancellationToken;)Lme/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockModels;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BakedModel;"))
-//    public BlockStateModel getModelRedirect(BlockModels models, BlockState state) {
-//        BakedModel newModel = BlockRendering.tryModelOverride(models, MinecraftClient.getInstance().world, state, new BlockPos(x, y, z), ContextIdentifiers.CHUNK_MESH);
-//        if (newModel != null)
-//            return newModel;
-//
-//        // If failed return original method call
-//        return models.getModel(state);
-//    }
-}

common/src/main/java/net/puzzlemc/predicates/resources/MBPModelLoadingPlugin.java

@@ -1,65 +0,0 @@
-package net.puzzlemc.predicates.resources;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import net.minecraft.block.Block;
-import net.minecraft.resource.Resource;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.util.Identifier;
-import net.puzzlemc.predicates.PuzzlePredicates;
-import net.puzzlemc.predicates.data.logic.When;
-import net.puzzlemc.predicates.util.Utils;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-
-
-//public class MBPModelLoadingPlugin implements PreparableModelLoadingPlugin<HashSet<Identifier>> {
-//
-//
-//    @Override
-//    public void onInitializeModelLoader(HashSet<Identifier> data, ModelLoadingPlugin.Context pluginContext) {
-//        pluginContext.addModels(data);
-//    }
-//
-//    public static class ModelIdLoader implements PreparableModelLoadingPlugin.DataLoader<HashSet<Identifier>> {
-//        @Override
-//        public CompletableFuture<HashSet<Identifier>> load(ResourceManager manager, Executor executor) {
-//
-//            return CompletableFuture.supplyAsync(() -> {
-//                HashSet<Identifier> wantedModels = new HashSet<>();
-//
-//                Map<Identifier, Resource> map = manager.findResources("mbp", id -> id.getPath().endsWith(".json"));
-//                for (Identifier id : map.keySet()) {
-//
-//                    try {
-//                        Identifier blockTarget = Identifier.of(id.toString().substring(0,id.toString().length()-5).replace("mbp/", ""));
-//                        JsonObject asset = JsonParser.parseReader(map.get(id).getReader()).getAsJsonObject();
-//
-//                        Optional<Block> block = Utils.getBlock(blockTarget);
-//
-//                        if (block.isPresent()) {
-//                            JsonArray overrides = asset.getAsJsonArray("overrides");
-//                            for(JsonElement overrideEntry : overrides) {
-//                                When when = When.parse(overrideEntry);
-//
-//                                wantedModels.addAll(when.getModels());
-//                            }
-//                        }
-//
-//                    } catch (Exception e) {
-//                        PuzzlePredicates.logger().error("Error found in file: " + id, e);
-//                    }
-//                }
-//                return wantedModels;
-//            }, executor);
-//
-//
-//        }
-//    }
-//}

common/src/main/java/net/puzzlemc/predicates/util/Utils.java

@@ -1,50 +0,0 @@
-package net.puzzlemc.predicates.util;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.entity.state.EntityRenderState;
-import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.biome.Biome;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-
-public class Utils {
-    private static DynamicRegistryManager getRegistryManager() {
-        MinecraftClient instance = MinecraftClient.getInstance();
-        return instance != null && instance.world != null ? instance.world.getRegistryManager() : null;
-    }
-
-    public static final Supplier<Optional<Registry<Biome>>> BIOME_REGISTRY = () -> {
-        DynamicRegistryManager drm = getRegistryManager();
-        if (drm != null) return drm.getOptional(RegistryKeys.BIOME);
-
-        return Optional.empty();
-    };
-
-    public static Optional<Biome> getBiome(Identifier biomeId) {
-        Optional<Registry<Biome>> registry = BIOME_REGISTRY.get();
-        if (registry.isPresent()) {
-            return registry.get().getOptionalValue(biomeId);
-        }
-        return Optional.empty();
-    }
-
-    public static Optional<Identifier> getBiome(Biome biome) {
-        Optional<Registry<Biome>> registry = BIOME_REGISTRY.get();
-        return registry.map(biomes -> biomes.getId(biome));
-    }
-
-    public static Optional<Block> getBlock(Identifier blockId) {
-        return Registries.BLOCK.getOptionalValue(blockId);
-    }
-
-    public static BlockPos posFromRenderState(EntityRenderState state) {
-        return BlockPos.ofFloored(state.x, state.y, state.z);
-    }
-}

common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java

@@ -1,227 +0,0 @@
-package net.puzzlemc.splashscreen;
-
-import com.mojang.blaze3d.pipeline.BlendFunction;
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.DestFactor;
-import com.mojang.blaze3d.platform.SourceFactor;
-import eu.midnightdust.lib.util.MidnightColorUtil;
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.client.gui.screen.SplashOverlay;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.RenderPhase;
-import net.minecraft.client.texture.NativeImageBackedTexture;
-import net.minecraft.client.texture.TextureContents;
-import net.minecraft.resource.*;
-import net.minecraft.util.TriState;
-import net.minecraft.util.Util;
-import net.puzzlemc.core.PuzzleModule;
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.resource.metadata.TextureResourceMetadata;
-import net.minecraft.client.texture.NativeImage;
-import net.minecraft.client.texture.ResourceTexture;
-import net.minecraft.util.Identifier;
-import net.puzzlemc.splashscreen.mixin.RenderPipelinesAccessor;
-
-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.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static net.puzzlemc.core.PuzzleCore.MOD_ID;
-
-public class PuzzleSplashScreen implements PuzzleModule {
-    public static final PuzzleSplashScreen INSTANCE = new PuzzleSplashScreen();
-    public static final Identifier LOGO = Identifier.of("textures/gui/title/mojangstudios.png");
-    public static final Identifier BACKGROUND = Identifier.of("puzzle/splash_background.png");
-    public static File CONFIG_PATH = new File(String.valueOf(PlatformFunctions.getConfigDirectory().resolve(".puzzle_cache")));
-    public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
-    public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png");
-    private static MinecraftClient client = MinecraftClient.getInstance();
-    private static boolean keepBackground = false;
-    private static RenderLayer CUSTOM_LOGO_LAYER;
-
-    @Override
-    public String getModuleId() {
-        return "splashscreen";
-    }
-
-    @Override
-    public void init() {
-        // When config directory is nonexistent, create it and set the folder as hidden on Windows systems //
-        if (!CONFIG_PATH.exists() && CONFIG_PATH.mkdir() && Util.getOperatingSystem().equals(Util.OperatingSystem.WINDOWS)) {
-            try { Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
-            } catch (IOException ignored) {}
-        }
-        buildRenderLayer();
-    }
-
-    public static RenderLayer getCustomLogoRenderLayer() {
-        return CUSTOM_LOGO_LAYER;
-    }
-
-    public void buildRenderLayer() {
-        if (PuzzleConfig.resourcepackSplashScreen) {
-            BlendFunction blendFunction = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE);
-            if (PuzzleConfig.disableBlend) blendFunction = null;
-            else if (PuzzleConfig.customBlendFunction.size() == 4) {
-                try {
-                    blendFunction = new BlendFunction(
-                            SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
-                            DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
-                            SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
-                            DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
-                } catch (Exception e) {
-                    getLogger().error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
-                }
-            }
-
-            var CUSTOM_LOGO_PIPELINE_BUILDER = RenderPipeline.builder(RenderPipelinesAccessor.getPOSITION_TEX_COLOR_SNIPPET())
-                .withLocation("pipeline/mojang_logo_puzzle")
-                .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
-                .withDepthWrite(false);
-            CUSTOM_LOGO_PIPELINE_BUILDER = blendFunction != null ? CUSTOM_LOGO_PIPELINE_BUILDER.withBlend(blendFunction) : CUSTOM_LOGO_PIPELINE_BUILDER.withoutBlend();
-
-            CUSTOM_LOGO_LAYER = RenderLayer.of("mojang_logo_puzzle", 786432, CUSTOM_LOGO_PIPELINE_BUILDER.build(),
-                            RenderLayer.MultiPhaseParameters.builder()
-                            .texture(new RenderPhase.Texture(SplashOverlay.LOGO, TriState.DEFAULT, false))
-                            .build(false));
-        }
-    }
-
-
-    @Override
-    public void reloadResources(ResourceManager manager) {
-        client = MinecraftClient.getInstance();
-        if (PuzzleConfig.resourcepackSplashScreen) {
-            PuzzleSplashScreen.resetColors();
-            client.getTextureManager().registerTexture(LOGO, new LogoTexture(LOGO));
-            client.getTextureManager().registerTexture(BACKGROUND, new LogoTexture(BACKGROUND));
-
-            manager.findResources("optifine", path -> path.getPath().contains("color.properties")).forEach((id, resource) -> {
-                try (InputStream stream = resource.getInputStream()) {
-                    Properties properties = new Properties();
-                    properties.load(stream);
-
-                    if (properties.get("screen.loading") != null) {
-                        PuzzleConfig.backgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading").toString()).getRGB();
-                        PuzzleConfig.hasCustomSplashScreen = true;
-                    }
-                    if (properties.get("screen.loading.bar") != null) {
-                        PuzzleConfig.progressBarBackgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString()).getRGB();
-                        PuzzleConfig.hasCustomSplashScreen = true;
-                    }
-                    if (properties.get("screen.loading.progress") != null) {
-                        PuzzleConfig.progressBarColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString()).getRGB();
-                        PuzzleConfig.hasCustomSplashScreen = true;
-                    }
-                    if (properties.get("screen.loading.outline") != null) {
-                        PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB();
-                        PuzzleConfig.hasCustomSplashScreen = true;
-                    }
-                    if (properties.get("screen.loading.blend") != null) {
-                        // Recommended blend: SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE ZERO
-                        PuzzleConfig.disableBlend = properties.get("screen.loading.blend").toString().equals("off");
-                        PuzzleConfig.customBlendFunction = new ArrayList<>(Arrays.stream(properties.get("screen.loading.blend").toString().split(" ")).toList());
-                        PuzzleConfig.hasCustomSplashScreen = true;
-                    }
-
-                } catch (Exception e) {
-                    getLogger().error("Error occurred while loading color.properties {}", id.toString(), e);
-                }
-            });
-            AtomicInteger logoCount = new AtomicInteger();
-            manager.findResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> {
-                try (InputStream stream = resource.getInputStream()) {
-                    Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
-                    client.getTextureManager().registerTexture(LOGO, new DynamicLogoTexture());
-                    if (logoCount.get() > 0) PuzzleConfig.hasCustomSplashScreen = true;
-                    logoCount.getAndIncrement();
-                } catch (Exception e) {
-                    getLogger().error("Error occurred while loading custom minecraft logo {}", id.toString(), e);
-                }
-            });
-            manager.findResources(MOD_ID, path -> path.getPath().contains("splash_background.png")).forEach((id, resource) -> {
-                try (InputStream stream = resource.getInputStream()) {
-                    Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
-                    InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
-                    client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(() -> "splash_screen_background", NativeImage.read(input)));
-                    keepBackground = true;
-                    PuzzleConfig.hasCustomSplashScreen = true;
-                } catch (Exception e) {
-                    getLogger().error("Error occurred while loading custom splash background {}", id.toString(), e);
-                }
-            });
-            if (!keepBackground) {
-                try {
-                    Files.delete(BACKGROUND_TEXTURE);
-                } catch (Exception ignored) {
-                }
-            }
-            keepBackground = false;
-            PuzzleConfig.write(MOD_ID);
-            buildRenderLayer();
-        }
-    }
-
-    public static void resetColors() {
-        PuzzleConfig.backgroundColor = 15675965;
-        PuzzleConfig.progressBarColor = 16777215;
-        PuzzleConfig.progressBarBackgroundColor = 15675965;
-        PuzzleConfig.progressFrameColor = 16777215;
-        PuzzleConfig.disableBlend = false;
-        PuzzleConfig.customBlendFunction = new ArrayList<>();
-        PuzzleConfig.hasCustomSplashScreen = false;
-    }
-
-    public static class LogoTexture extends ResourceTexture {
-        public LogoTexture(Identifier logo) { super(logo); }
-
-        @Override
-        public TextureContents loadContents(ResourceManager resourceManager) {
-            MinecraftClient minecraftClient = MinecraftClient.getInstance();
-            DefaultResourcePack defaultResourcePack = minecraftClient.getDefaultResourcePack();
-            try {
-                InputStream inputStream = Objects.requireNonNull(defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO)).get();
-                TextureContents var6;
-                try {
-                    var6 = new TextureContents(NativeImage.read(inputStream), new TextureResourceMetadata(true, true));
-                } finally {
-                    if (inputStream != null) {
-                        inputStream.close();
-                    }
-                }
-                return var6;
-            } catch (IOException var18) {
-                return TextureContents.createMissing();
-            }
-        }
-    }
-
-    public static class DynamicLogoTexture extends ResourceTexture {
-        public DynamicLogoTexture() {
-            super(LOGO);
-        }
-        @Override
-        public TextureContents loadContents(ResourceManager resourceManager) {
-            try {
-                InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
-                return new TextureContents(NativeImage.read(input), new TextureResourceMetadata(true, true));
-            } catch (IOException e) {
-                INSTANCE.getLogger().error("Encountered an error during logo loading: ", e);
-                try {
-                    return TextureContents.load(resourceManager, LOGO);
-                } catch (IOException ex) {
-                    return TextureContents.createMissing();
-                }
-            }
-        }
-    }
-}

common/src/main/java/net/puzzlemc/splashscreen/mixin/RenderPipelinesAccessor.java

@@ -1,14 +0,0 @@
-package net.puzzlemc.splashscreen.mixin;
-
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import net.minecraft.client.gl.RenderPipelines;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(RenderPipelines.class)
-public interface RenderPipelinesAccessor {
-    @Accessor
-    static RenderPipeline.Snippet getPOSITION_TEX_COLOR_SNIPPET() {
-        return null;
-    }
-}

common/src/main/resources/architectury.puzzle.json

@@ -1,3 +0,0 @@
-{
-  "accessWidener": "puzzle-models.accesswidener"
-}

common/src/main/resources/assets/puzzle/lang/be_by.json

@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"Даступна абнаўленне!",
-	"puzzle.screen.title":"Налады Puzzle",
-	"puzzle.page.graphics":"Графіка",
-	"puzzle.page.resources":"Рэсурсы",
-	"puzzle.page.performance":"Прадукцыйнасць",
-	"puzzle.page.misc":"Рознае",
-	"puzzle.option.check_for_updates":"Праверыць абнаўленні",
-	"puzzle.option.check_for_updates.tooltip":"Уключае ўбудаваны правершчык абнаўленняў",
-	"puzzle.option.show_version_info":"Паказваць версію Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Паказваць інфармацыю пра бягучую\nверсію Puzzle и наяўнасць абнаўленняў на\nтытульным экране і меню F3",
-	"puzzle.option.resourcepack_splash_screen":"Выкарыстанне пакетаў рэсурсаў для сплэшэй",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Уключае пакеты рэсурсаў, якія змяняюць\nзагрузачныя экраны/сплэшы\nMinecraft, якія выкарыстоўваюць фармат OptiFine",
-	"puzzle.option.better_splash_screen_blend":"Палепшанае спалучэнне сплэшэй і лагатыпу",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Змяняе тып спалучэння\nлагатыпу і сплэшэй\nкаб палепшыць працу з лагатыпамі карыстальніцкіх колераў",
-	"puzzle.option.unlimited_model_rotations":"Неабмежаванае вярчэнне мадэлі",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Дазваляе вярчэнне на 360° на карыстальніцкіх мадэляў блокаў/прадметаў",
-	"puzzle.option.bigger_custom_models":"Павялічаныя карыстальніцкія мадэлі",
-	"puzzle.option.bigger_custom_models.tooltip":"Павялічвае ліміт памеру\nкарыстальніцкіх мадэляў блокаў/прадметаў\nз 3x3x3 да 5x5x5",
-	"puzzle.midnightconfig.title":"Пашыраныя налады Puzzle",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Асаблівасці",
-	"puzzle.midnightconfig.category.debug":"Debug",
-	"puzzle.midnightconfig.tooltip":"Налады толькі для вопытных карыстальнікаў",
-
-	"cullleaves.puzzle.option.enabled": "Адбракоўваць лісце",
-	"cullleaves.puzzle.option.enabled.tooltip": "Уключыць адбракоўванне лісця, каб павялічыць прадукцыйнасць",
-	"iris.puzzle.option.enableShaders": "Уключыць шэйдэры",
-	"iris.puzzle.option.enableShaders.tooltip": "Дазваляе уключаць ці выключаць шэйдэры",
-	"iris.puzzle.option.open": "АДКРЫЦЬ",
-	"options.iris.shaderPackSelection.tooltip": "Адкрывае экран выбару\nшэйдэраў і іх налад",
-	"lambdabettergrass.option.mode.tooltip": "Робіць бакі\nзямлі з дзёрнам злучанымі з\nверхам гэтага блоку",
-	"lambdabettergrass.option.better_snow.tooltip": "Дадае крыху бачны слой снег/імху\nна непоўныя блокі, якія\nакружаны снегам/імхом",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Зніжае FPS у Minecraft калі ён не актыўны\n(то бок калі іншая прагракма адчынена ці гульня згорнута)\nкаб захаваць рэсурсы сістэмы",
-	"config.dynamicfps.unfocused_fps.tooltip": "Колькасць кадраў у секунду, калі\nMinecraft згорнуты",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Дазваляе скасаваць ці не\nабмежаванне FPS, калі Minecraft актыны\n(то бок актыўны ці наведзены курсорам з панелі задач)",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Запусціць збіральнік смецця калі\nMinecraft неактыўны,\n каб ачысціць крыху АЗУ",
-	"config.dynamicfps.unfocused_volume.tooltip": "Гучнасць прайгравальных гукаў\nкалі гульня не актыўна\n(то бок іншае акно абрана)",
-	"config.dynamicfps.hidden_volume.tooltip": "Гучнасць прайгравальных гукаў\nкали гульня не бачна\n(то бок згорнута, знаходзіцца пад іншымі вокнамі\nці на ішай віртуальнай машыне)",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eЯрчэй",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Стандартна"
-}

common/src/main/resources/assets/puzzle/lang/es_es.json

@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"¡Hay una actualización disponible!",
-	"puzzle.screen.title":"Configuración de Puzzle",
-	"puzzle.page.graphics":"Gráficos",
-	"puzzle.page.resources":"Recursos",
-	"puzzle.page.performance":"Rendimiento",
-	"puzzle.page.misc":"Variado",
-	"puzzle.option.check_for_updates":"Comprobar Actualizaciones",
-	"puzzle.option.check_for_updates.tooltip":"Activa el comprobador de actualizaciones integrado de Puzzle.",
-	"puzzle.option.show_version_info":"Mostrar información de la versión Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Muestra información sobre la versión actual\nde Puzzle y el estado de actualización\nen la pantalla de título y en el menú F3.",
-	"puzzle.option.resourcepack_splash_screen":"Usar la Pantalla de Carga del Paquete de Recursos [*]",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Permite que los paquetes de recursos\ncambien el aspecto de la pantalla de carga/principal\nde Minecraft utilizando el formato OptiFine.",
-	"puzzle.option.better_splash_screen_blend":"Mejor Mezcla del Logo de la Pantalla de Carga",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Cambia el tipo de mezcla utilizada\npor el logotipo de la pantalla de carga\npara que funcione mejor con logotipos\nde colores personalizados.",
-	"puzzle.option.unlimited_model_rotations":"Rotaciones Ilimitadas de Modelos",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Desbloquea la rotación completa de 360° en los modelos de bloques/objetos personalizados.",
-	"puzzle.option.bigger_custom_models":"Modelos Personalizados más Grandes",
-	"puzzle.option.bigger_custom_models.tooltip":"Aumenta el límite de tamaños\nde los modelos de bloques/objetos personalizados\nde 3x3x3 a 5x5x5.",
-	"puzzle.midnightconfig.title":"Acceder a las Opciones adicionales de Puzzle para Expertos",
-	"puzzle.midnightconfig.category.gui":"Interfaz",
-	"puzzle.midnightconfig.category.features":"Características",
-	"puzzle.midnightconfig.category.debug":"Depuración",
-	"puzzle.midnightconfig.tooltip":"Ajustes para usuarios experimentados.",
-
-	"cullleaves.puzzle.option.enabled": "Reducir Cantidad de Hojas",
-	"cullleaves.puzzle.option.enabled.tooltip": "Permitir reducir la cantidad de hojas para mejorar el rendimiento.",
-	"iris.puzzle.option.enableShaders": "Activar Sombreadores",
-	"iris.puzzle.option.enableShaders.tooltip": "Activar o no los paquetes de sombreadores.",
-	"iris.puzzle.option.open": "ABRIR",
-	"options.iris.shaderPackSelection.tooltip": "Abre la pantalla de selección\nde los paquetes de sombreadores.",
-	"lambdabettergrass.option.mode.tooltip": "Hace que los lados de los bloques de\ncésped se conecten con los bloques de\ncésped adyacentes.",
-	"lambdabettergrass.option.better_snow.tooltip": "Añade una capa de nieve/musgo puramente\nvisual a los bloques no llenos que están rodeados\nde nieve/musgo.",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduce los FPS de Minecraft cuando el\njuego se encuentra en segundo plano (es decir,\ncuando otra ventana está en primer plano o el juego\nestá oculto) para ahorrar energía y recursos\ndel sistema.",
-	"config.dynamicfps.unfocused_fps.tooltip": "La cantidad de fotogramas por segundo que\nMinecraft puede renderizar mientras se\nencuentra en segundo plano.",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Detener o no la limitación de FPS mientras\ndurante la previsualización de Minecraft\n(por ejemplo cuando se señala en la barra de\ntareas o en el área de notificación).",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Ejecutar un recolector de basura mientras\nMinecraft se encuentra en segundo plano\npara liberar algo de RAM.",
-	"config.dynamicfps.unfocused_volume.tooltip": "El volumen del sonido del juego cuando permanece\nen segundo plano (es decir, cuando hay otra\nventana seleccionada).",
-	"config.dynamicfps.hidden_volume.tooltip": "El volumen del juego cuando no es visible (es decir, minimizado, cubierto por otras ventanas o en otro escritorio virtual).",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eResplandeciente",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Predeterminado"
-}

common/src/main/resources/assets/puzzle/lang/pt_br.json

@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"Uma atualização está disponível!",
-	"puzzle.screen.title":"Configurações do Puzzle",
-	"puzzle.page.graphics":"Gráficas",
-	"puzzle.page.resources":"Recursos",
-	"puzzle.page.performance":"Desempenho",
-	"puzzle.page.misc":"Diversas",
-	"puzzle.option.check_for_updates":"Verifique se há atualizações",
-	"puzzle.option.check_for_updates.tooltip":"Ativa o verificador de atualização integrado do Puzzle",
-	"puzzle.option.show_version_info":"Mostrar informações da versão do Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Mostrar informações sobre o atual\nversão do Puzzle e status de atualização em\n Tela de Título e o Menu F3",
-	"puzzle.option.resourcepack_splash_screen":"Use a tela inicial do pacote de recursos",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Permite que os pacotes de recursos mudem a aparência\ndo carregamento do Minecraft/splash\ntela usando o formato OptiFine",
-	"puzzle.option.better_splash_screen_blend":"Melhor combinação do logotipo da tela inicial",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Muda o tipo de mistura usado\npelo logotipo na tela inicial\npara trabalhar melhor com logotipos coloridos personalizados",
-	"puzzle.option.unlimited_model_rotations":"Rotações de Modelo Ilimitadas",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Desbloqueia rotação total de 360° em modelos de itens/blocos personalizados",
-	"puzzle.option.bigger_custom_models":"Modelos Personalizados Maiores",
-	"puzzle.option.bigger_custom_models.tooltip":"Aumenta o limite de\ntamanhos de modelo de bloco/item personalizados\nde 3x3x3 a 5x5x5",
-	"puzzle.midnightconfig.title":"Configuração Avançada do Puzzle",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Recursos",
-	"puzzle.midnightconfig.category.internal":"Interno",
-	"puzzle.midnightconfig.tooltip":"Opções apenas para usuários avançados",
-
-	"cullleaves.puzzle.option.enabled": "Abate de Folhas",
-	"cullleaves.puzzle.option.enabled.tooltip": "Ative o abate de folhas para melhorar o desempenho",
-	"iris.puzzle.option.enableShaders": "Ativar sombreadores",
-	"iris.puzzle.option.enableShaders.tooltip": "Habilitar ou não shaderpacks",
-	"iris.puzzle.option.open": "ABRIR",
-	"options.iris.shaderPackSelection.tooltip": "Abra uma tela para selecionar\nshaderpacks e configurá-los",
-	"lambdabettergrass.option.mode.tooltip": "Faz os lados de\nblocos de grama se conectam a\nblocos de grama adjacentes",
-	"lambdabettergrass.option.better_snow.tooltip": "Adiciona uma neve puramente visual/camada de musgo\na blocos não completos que\nestão rodeados de neve/musgo",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduz o FPS do Minecraft quando desfocado\n(ou seja, outra janela está focada ou o jogo está oculto)\npara economizar energia e recursos do sistema",
-	"config.dynamicfps.unfocused_fps.tooltip": "A quantidade de quadros por segundo\nMinecraft é permitido\nrenderizar enquanto estiver fora de foco",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Interromper ou não o\nLimitação de FPS enquanto o Minecraft é visualizado\n(ou seja, pairou na barra de tarefas ou dock)",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Execute um coletor de lixo enquanto\nMinecraft não está focado em\nliberar um pouco de RAM",
-	"config.dynamicfps.unfocused_volume.tooltip": "O volume que o jogo deve reproduzir\nsom enquanto desfocado\n(ou seja, outra janela é selecionada)",
-	"config.dynamicfps.hidden_volume.tooltip": "O volume que o jogo deve reproduzir\nsom em enquanto não visível\n(ou seja, minimizado, coberto por outras janelas\nem em outra área de trabalho virtual)",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eMais Brilhante",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Padrão"
-}

common/src/main/resources/assets/puzzle/lang/vi_vn.json

@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"Đã có bản cập nhật!",
-	"puzzle.screen.title":"Cài đặt Puzzle",
-	"puzzle.page.graphics":"Đồ họa",
-	"puzzle.page.resources":"Tài nguyên",
-	"puzzle.page.performance":"Hiệu năng",
-	"puzzle.page.misc":"Khác",
-	"puzzle.option.check_for_updates":"Kiểm tra cập nhật",
-	"puzzle.option.check_for_updates.tooltip":"Bật trình kiểm tra cập nhật tích hợp của Puzzle",
-	"puzzle.option.show_version_info":"Hiển thị thông tin phiên bản Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Hiển thị thông tin về phiên bản \nPuzzle hiện tại và trạng thái cập nhật trên\nMàn hình Tiêu đề và Menu F3",
-	"puzzle.option.resourcepack_splash_screen":"Sử dụng màn hình đốm gói tài nguyên",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Cho phép gói tài nguyên thay đổi giao diện\nmàn hình tải/đốm\ncủa Minecraft bằng định dạng OptiFine",
-	"puzzle.option.better_splash_screen_blend":"Logo màn hình đốm tốt hơn",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Thay đổi kiểu hòa trộn được sử dụng\nbởi biểu trưng trên màn hình đốm\nđể hoạt động tốt hơn với các biểu trưng có màu tùy chỉnh",
-	"puzzle.option.unlimited_model_rotations":"Xoay mô hình không giới hạn",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Mở khóa xoay 360° đầy đủ trên các mô hình khối/vật phẩm tùy chỉnh",
-	"puzzle.option.bigger_custom_models":"Mô hình tùy chỉnh lớn hơn",
-	"puzzle.option.bigger_custom_models.tooltip":"Tăng giới hạn của\nkích thước mô hình khối/vật phẩm tùy chỉnh\ntừ 3x3x3 lên 5x5x5",
-	"puzzle.midnightconfig.title":"Cấu hình Puzzle nâng cao",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Tính năng",
-	"puzzle.midnightconfig.category.debug":"Gỡ lỗi",
-	"puzzle.midnightconfig.tooltip":"Tùy chọn chỉ dành cho người dùng nâng cao",
-
-	"cullleaves.puzzle.option.enabled": "Loại bỏ Lá",
-	"cullleaves.puzzle.option.enabled.tooltip": "Bật tính năng loại bỏ lá để nâng cao hiệu suất",
-	"iris.puzzle.option.enableShaders": "Bật Shader",
-	"iris.puzzle.option.enableShaders.tooltip": "Bật shaderpack",
-	"iris.puzzle.option.open": "MỞ",
-	"options.iris.shaderPackSelection.tooltip": "Mở một màn hình để chọn\nshaderpack và định cấu hình chúng",
-	"lambdabettergrass.option.mode.tooltip": "Làm cho các cạnh của\nkhối cỏ kết nối với\nkhối cỏ liền kề",
-	"lambdabettergrass.option.better_snow.tooltip": "Thêm một lớp tuyết/rêu hoàn toàn trực quan\nvào các khối không đầy đủ\nđược bao quanh bởi tuyết/rêu",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Giảm FPS của Minecraft khi không tập trung\n(tức là một cửa sổ khác được tập trung hoặc trò chơi bị ẩn)\nđể tiết kiệm năng lượng và tài nguyên hệ thống",
-	"config.dynamicfps.unfocused_fps.tooltip": "Lượng khung hình mỗi giây\nMinecraft được phép\nkết xuất khi không tập trung",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Dừng giới hạn\nFPS trong khi Minecraft được xem trước\n(tức là được di chuột trên thanh tác vụ hoặc thanh công cụ)",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Chạy trình thu gom rác trong khi\nMinecraft không tập trung vào\ngiải phóng một số RAM",
-	"config.dynamicfps.unfocused_volume.tooltip": "Âm lượng mà trò chơi sẽ phát\nâm thanh khi không tập trung\n(tức là một cửa sổ khác được chọn)",
-	"config.dynamicfps.hidden_volume.tooltip": "Âm lượng mà trò chơi sẽ phát\nâm thanh trong khi không hiển thị\n(tức là được thu nhỏ, bị che bởi các cửa sổ khác\ncũng như trên màn hình ảo khác)",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eSáng hơn",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Mặc định"
-}

common/src/main/resources/assets/puzzle/lang/zh_tw.json

@@ -1,42 +0,0 @@
-{
-	"puzzle.text.update_available":"有新的更新可用！",
-	"puzzle.screen.title":"Puzzle 設定",
-	"puzzle.page.graphics":"圖形",
-	"puzzle.page.resources":"資源",
-	"puzzle.page.performance":"效能",
-	"puzzle.page.misc":"其他",
-	"puzzle.option.check_for_updates":"檢查更新",
-	"puzzle.option.check_for_updates.tooltip":"啟用 Puzzle 內建的更新檢查器",
-	"puzzle.option.show_version_info":"顯示 Puzzle 版本資訊",
-	"puzzle.option.show_version_info.tooltip":"在標題畫面和 F3 選單上顯示\n目前 Puzzle 版本和更新狀態的資訊",
-	"puzzle.option.resourcepack_splash_screen":"使用資源包的啟動畫面",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"允許資源包使用 OptiFine 格式變更\nMinecraft 的載入/啟動畫面",
-	"puzzle.option.better_splash_screen_blend":"更好的啟動畫面標誌混合",
-	"puzzle.option.better_splash_screen_blend.tooltip":"變更啟動畫面標誌使用的混合類型，\n使其更好地與自訂顏色的標誌配合使用",
-	"puzzle.option.unlimited_model_rotations":"無限模型旋轉",
-	"puzzle.option.unlimited_model_rotations.tooltip":"解鎖自訂方塊/物品模型的完整 360° 旋轉",
-	"puzzle.option.bigger_custom_models":"更大的自訂模型",
-	"puzzle.option.bigger_custom_models.tooltip":"將自訂方塊/物品模型的大小限制\n從 3×3×3 增加到 5×5×5",
-	"puzzle.midnightconfig.title":"Puzzle 進階設定",
-	"puzzle.midnightconfig.category.gui":"介面",
-	"puzzle.midnightconfig.category.features":"功能",
-	"puzzle.midnightconfig.category.internal":"內部",
-	"puzzle.midnightconfig.tooltip":"僅供進階使用者使用的選項",
-
-	"cullleaves.puzzle.option.enabled": "剔除樹葉",
-	"cullleaves.puzzle.option.enabled.tooltip": "啟用樹葉剔除以提升效能",
-	"iris.puzzle.option.enableShaders": "啟用光影",
-	"iris.puzzle.option.enableShaders.tooltip": "是否啟用光影包",
-	"iris.puzzle.option.open": "開啟",
-	"options.iris.shaderPackSelection.tooltip": "開啟一個畫面以選擇\n並設定光影包",
-	"lambdabettergrass.option.mode.tooltip": "使草地的側面與\n相鄰的草地連接",
-	"lambdabettergrass.option.better_snow.tooltip": "為被雪/苔蘚包圍的非完整方塊\n加入純粹視覺上的雪/苔蘚層",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "在未聚焦時降低 Minecraft 的 FPS\n（例如，另一個視窗被聚焦或遊戲被隱藏）\n以節省電力和系統資源",
-	"config.dynamicfps.unfocused_fps.tooltip": "Minecraft 在未聚焦時\n允許繪製的 FPS",
-	"config.dynamicfps.restore_when_hovered.tooltip": "當預覽 Minecraft 時是否停止\nFPS 限制（例如，將滑鼠懸停在工作列或 Dock 上）",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "在 Minecraft 未聚焦時執行垃圾回收器\n以釋放一些記憶體",
-	"config.dynamicfps.unfocused_volume.tooltip": "遊戲在未聚焦時播放聲音的音量\n（例如，選取了另一個視窗）",
-	"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時播放聲音的音量\n（例如，最小化、被其他視窗覆蓋\n或在另一個虛擬桌面上）",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§e更亮",
-	"entity_texture_features.puzzle.emissive_type.default": "§6預設"
-}

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

@@ -1,7 +0,0 @@
-accessWidener	v1	named
-accessible   class   net/minecraft/client/render/model/json/ModelElement$Deserializer
-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
-accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
-accessible class net/minecraft/client/render/RenderPhase$Texture
-accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder texture (Lnet/minecraft/client/render/RenderPhase$TextureBase;)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder;
-accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder build (Z)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;

common/src/main/resources/puzzle-predicates.mixins.json

@@ -1,24 +0,0 @@
-{
-  "required": true,
-  "package": "net.puzzlemc.predicates.mixin",
-  "compatibilityLevel": "JAVA_17",
-  "client": [
-    "BakedModelManagerMixin",
-    "BlockDisplayEntityRendererMixin",
-    "BlockDustParticleMixin",
-    "BlockMarkerParticleMixin",
-    "BlockModelRendererMixin",
-    "BlockRenderManagerMixin",
-    "FallingBlockEntityRendererMixin",
-    "ItemEntityRendererMixin",
-    "ItemFrameEntityRendererMixin",
-    "ItemRendererMixin",
-    "PistonBlockEntityRendererMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
-  "mixins": [
-    "StateAccessor"
-  ]
-}

common/src/main/resources/puzzle-predicates_compat.mixins.json

@@ -1,11 +0,0 @@
-{
-  "required": true,
-  "package": "net.puzzlemc.predicates.mixin.compat",
-  "compatibilityLevel": "JAVA_17",
-  "plugin": "net.puzzlemc.core.mixin.PuzzleMixinPlugin",
-  "client": [
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

fabric/build.gradle

@@ -1,109 +0,0 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
-    id "me.shedaniel.unified-publishing"
-}
-repositories {
-    maven { url "https://maven.terraformersmc.com/releases" }
-}
-
-architectury {
-    platformSetupLoomIde()
-    fabric()
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentFabric.extendsFrom common
-    archivesBaseName = rootProject.archives_base_name + "-fabric"
-    version = rootProject.mod_version + "+" + rootProject.minecraft_version
-}
-
-dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
-
-    modImplementation ("com.terraformersmc:modmenu:${project.modmenu_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-    }
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-}
-
-processResources {
-    inputs.property "version", rootProject.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": rootProject.version
-    }
-}
-
-shadowJar {
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier = "dev-shadow"
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-unifiedPublishing {
-    project {
-        displayName = "Puzzle $rootProject.version - Fabric $project.minecraft_version"
-        releaseType = "$project.release_type"
-        changelog = releaseChangelog()
-        gameVersions = []
-        gameLoaders = ["fabric","quilt"]
-        mainPublication remapJar
-        relations {
-            depends {
-                curseforge = "fabric-api"
-                modrinth = "fabric-api"
-            }
-            includes {
-                curseforge = "midnightlib"
-                modrinth = "midnightlib"
-            }
-        }
-
-        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
-        if (CURSEFORGE_TOKEN != null) {
-            curseforge {
-                token = CURSEFORGE_TOKEN
-                id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-
-        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
-        if (MODRINTH_TOKEN != null) {
-            modrinth {
-                token = MODRINTH_TOKEN
-                id = rootProject.modrinth_id
-                version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-    }
-}

fabric/src/main/java/net/puzzlemc/fabric/MBPModelLoadingPlugin.java

@@ -1,68 +0,0 @@
-package net.puzzlemc.fabric;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
-import net.fabricmc.fabric.api.client.model.loading.v1.PreparableModelLoadingPlugin;
-import net.minecraft.block.Block;
-import net.minecraft.resource.Resource;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.util.Identifier;
-import net.puzzlemc.predicates.PuzzlePredicates;
-import net.puzzlemc.predicates.data.logic.When;
-import net.puzzlemc.predicates.util.Utils;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-
-
-public class MBPModelLoadingPlugin implements PreparableModelLoadingPlugin<HashSet<Identifier>> {
-
-
-    @Override
-    public void initialize(HashSet<Identifier> data, ModelLoadingPlugin.Context pluginContext) {
-        //pluginContext.addModels(data);
-    }
-
-    public static class ModelIdLoader implements DataLoader<HashSet<Identifier>> {
-        @Override
-        public CompletableFuture<HashSet<Identifier>> load(ResourceManager manager, Executor executor) {
-
-            return CompletableFuture.supplyAsync(() -> {
-                HashSet<Identifier> wantedModels = new HashSet<>();
-
-                Map<Identifier, Resource> map = manager.findResources("mbp", id -> id.getPath().endsWith(".json"));
-                for (Identifier id : map.keySet()) {
-
-                    try {
-                        Identifier blockTarget = Identifier.of(id.toString().substring(0,id.toString().length()-5).replace("mbp/", ""));
-                        JsonObject asset = JsonParser.parseReader(map.get(id).getReader()).getAsJsonObject();
-
-                        Optional<Block> block = Utils.getBlock(blockTarget);
-
-                        if (block.isPresent()) {
-                            JsonArray overrides = asset.getAsJsonArray("overrides");
-                            PuzzlePredicates.logger().info("* Model Loader: "+blockTarget+ " " + overrides);
-                            for(JsonElement overrideEntry : overrides) {
-                                When when = When.parse(overrideEntry);
-
-                                wantedModels.addAll(when.getModels());
-                            }
-                        }
-
-                    } catch (Exception e) {
-                        PuzzlePredicates.logger().error("Error found in file: " + id, e);
-                    }
-                }
-                return wantedModels;
-            }, executor);
-
-
-        }
-    }
-}

fabric/src/main/java/net/puzzlemc/fabric/PuzzleFabric.java

@@ -1,29 +0,0 @@
-package net.puzzlemc.fabric;
-
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
-import net.fabricmc.fabric.impl.client.model.loading.ModelLoadingPluginManager;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.resource.ResourceType;
-import net.minecraft.util.Identifier;
-import net.puzzlemc.core.PuzzleCore;
-
-public class PuzzleFabric implements ClientModInitializer {
-    @Override
-    public void onInitializeClient() {
-        PuzzleCore.initModules();
-        ModelLoadingPluginManager.registerPlugin(new MBPModelLoadingPlugin.ModelIdLoader(), new MBPModelLoadingPlugin());
-
-        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
-            @Override
-            public Identifier getFabricId() {
-                return Identifier.of("puzzle", "splash_screen");
-            }
-            @Override
-            public void reload(ResourceManager manager) {
-                PuzzleCore.PuzzleResourceManager.INSTANCE.reload(manager);
-            }
-        });
-    }
-}

fabric/src/main/java/net/puzzlemc/fabric/modmenu/ModMenuIntegration.java

@@ -1,12 +0,0 @@
-package net.puzzlemc.fabric.modmenu;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
-
-public class ModMenuIntegration implements ModMenuApi {
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return PuzzleOptionsScreen::new;
-    }
-}

gradle.properties

@@ -1,47 +1,35 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx4G
 
-minecraft_version=1.21.5
+# Fabric Properties
-supported_versions=
+	# check these on https://fabricmc.net/use
-yarn_mappings=1.21.5+build.1
+	minecraft_version=1.19
-enabled_platforms=fabric,neoforge
+	yarn_mappings=1.19+build.4
+	loader_version=0.14.8
 
 # Mod Properties
-mod_version = 2.1.0
+	mod_version = 1.4.2-1.19
-maven_group = net.puzzlemc
+	maven_group = net.puzzlemc
-archives_base_name = puzzle
+	archives_base_name = puzzle
-release_type=release
-curseforge_id=563977
-modrinth_id=3IuO68q1
 
-# Modloaders
+# Dependencies
-fabric_loader_version=0.16.10
+	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_api_version=0.119.5+1.21.5
+	fabric_version=0.57.0+1.19
-
+	mod_menu_version = 4.0.0
-neoforge_version=21.5.3-beta
+	
-yarn_mappings_patch_neoforge_version = 1.21+build.4
+	cull_leaves_version = 2.3.3
-
+	ldl_version = 2.1.2+1.19
-# Libraries
+	lbg_version = 1.3.0+1.19
-midnightlib_version = 1.7.0+1.21.4
+	iris_version = 1.19.x-v1.2.5
-modmenu_version = 13.0.0-beta.1
+	continuity_version = 2.0.0+1.19
-
+	animatica_version = 0.5+1.19
-# Mod Integrations
+	colormatic_version = 3.1.2
-cull_leaves_version = 3.0.2-fabric
+	borderless_mining_version = 1.1.5+1.19
-ldl_version = 4.0.0+1.21.4
+	dynamic_fps_version = 2.2.0
-lbg_version = 1.5.2+1.20.1
+	toml4j_version = 0.7.2
-iris_version = 1.8.0-beta.3+1.21-fabric
+	cit_resewn_version = 1.1.1+1.19
-continuity_version = 3.0.0-beta.5+1.21
+	cem_version = 0.7.1-1.19
-animatica_version = 0.6.1+1.21
+	complete_config_version = 1.0.0
-colormatic_version = 3.1.2
+	spruceui_version=4.0.0+1.19
-borderless_mining_version = 1.1.8+1.20.1
+	midnightlib_version=0.5.2
-dynamic_fps_version = 3.6.3
+	entitytexturefeatures_version=4.3.1.fabric.1.19.2
-toml4j_version = 0.7.2
-cit_resewn_version = 1.1.3+1.20
-complete_config_version = 2.3.0
-spruceui_version=5.0.0+1.20
-emf_version=2.4.1
-etf_version=6.2.10
-exordium_version=1.2.1-1.20.2
-# Required for LBG
-quilt_loader_version=0.19.0-beta.18
-quilt_fabric_api_version=7.0.1+0.83.0-1.20

gradle/wrapper/gradle-wrapper.properties

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

neoforge/build.gradle

@@ -1,115 +0,0 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
-    id "me.shedaniel.unified-publishing"
-}
-
-repositories {
-    maven {
-        name = 'NeoForged'
-        url = 'https://maven.neoforged.net/releases'
-    }
-}
-
-
-architectury {
-    platformSetupLoomIde()
-    neoForge()
-}
-
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
-
-configurations {
-    common {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentNeoForge.extendsFrom common
-
-    // Files in this configuration will be bundled into your mod using the Shadow plugin.
-    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
-    shadowBundle {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-    archivesBaseName = rootProject.archives_base_name + "-neoforge"
-    version = rootProject.mod_version + "+" + rootProject.minecraft_version
-}
-
-dependencies {
-    neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
-    modImplementation ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-neoforge")
-
-    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
-    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
-}
-
-processResources {
-    inputs.property 'version', rootProject.version
-
-    filesMatching('META-INF/neoforge.mods.toml') {
-        expand version: rootProject.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowBundle]
-    archiveClassifier = 'dev-shadow'
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-unifiedPublishing {
-    project {
-        displayName = "Puzzle $rootProject.version - NeoForge $project.minecraft_version"
-        releaseType = "alpha"
-        changelog = releaseChangelog()
-        gameVersions = []
-        gameLoaders = ["neoforge"]
-        mainPublication remapJar
-        relations {
-            depends {
-                curseforge = "midnightlib"
-                modrinth = "midnightlib"
-            }
-        }
-
-        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
-        if (CURSEFORGE_TOKEN != null) {
-            curseforge {
-                token = CURSEFORGE_TOKEN
-                id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-
-        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
-        if (MODRINTH_TOKEN != null) {
-            modrinth {
-                token = MODRINTH_TOKEN
-                id = rootProject.modrinth_id
-                version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-    }
-}

neoforge/gradle.properties

@@ -1 +0,0 @@
-loom.platform=neoforge

neoforge/src/main/java/net/puzzlemc/neoforge/PuzzleNeoForge.java

@@ -1,31 +0,0 @@
-package net.puzzlemc.neoforge;
-
-import net.minecraft.util.Identifier;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.ModList;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
-import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
-import net.puzzlemc.core.PuzzleCore;
-import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
-import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-
-import static net.puzzlemc.core.PuzzleCore.MOD_ID;
-
-@Mod(value = MOD_ID, dist = Dist.CLIENT)
-public class PuzzleNeoForge {
-    public PuzzleNeoForge() {
-        PuzzleCore.initModules();
-        ModList.get().getModContainerById(MOD_ID).orElseThrow().registerExtensionPoint(IConfigScreenFactory.class, (client, parent) -> new PuzzleOptionsScreen(parent));
-    }
-
-    @EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-    public static class MidnightLibBusEvents {
-        @SubscribeEvent
-        public static void onResourceReload(AddClientReloadListenersEvent event) {
-            event.addListener(Identifier.of(MOD_ID, "splash_screen"), PuzzleSplashScreen.ReloadListener.INSTANCE);
-        }
-    }
-}

neoforge/src/main/java/net/puzzlemc/neoforge/mixin/splashscreen/MixinNeoForgeLoadingOverlay.java

@@ -1,30 +0,0 @@
-package net.puzzlemc.neoforge.mixin.splashscreen;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.SplashOverlay;
-import net.minecraft.resource.ResourceReload;
-import net.neoforged.neoforge.client.loading.NeoForgeLoadingOverlay;
-import net.puzzlemc.core.config.PuzzleConfig;
-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.Optional;
-import java.util.function.Consumer;
-
-@Mixin(NeoForgeLoadingOverlay.class)
-public class MixinNeoForgeLoadingOverlay extends SplashOverlay {
-    public MixinNeoForgeLoadingOverlay(MinecraftClient client, ResourceReload monitor, Consumer<Optional<Throwable>> exceptionHandler, boolean reloading) {
-        super(client, monitor, exceptionHandler, reloading);
-    }
-
-    @Inject(method = "render", at = @At("HEAD"), cancellable = true) // Replaces the NeoForge loading screen in later stages with the (customized) vanilla version
-    private void redirectNeoForgeLoading(DrawContext context, int mouseX, int mouseY, float tickDelta, CallbackInfo ci) {
-        if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.hasCustomSplashScreen) {
-            super.render(context, mouseX, mouseY, tickDelta);
-            ci.cancel();
-        }
-    }
-}

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,37 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[2,)"
-#issueTrackerURL = ""
-license = "MIT License"
-
-[[mods]]
-modId = "puzzle"
-version = "${version}"
-displayName = "Puzzle"
-logoFile = "puzzle.png"
-authors = "PuzzleMC, Motschen"
-description = '''
-Unites optifine replacement mods in a clean & vanilla-style gui
-'''
-
-[[mixins]]
-config = "puzzle-gui.mixins.json"
-[[mixins]]
-config = "puzzle-models.mixins.json"
-[[mixins]]
-config = "puzzle-splashscreen.mixins.json"
-[[mixins]]
-config = "puzzle-splashscreen_neoforge.mixins.json"
-
-[[dependencies.puzzle]]
-modId = "neoforge"
-mandatory = true
-versionRange = "[21.0,)"
-ordering = "NONE"
-side = "CLIENT"
-
-[[dependencies.puzzle]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.21,)"
-ordering = "NONE"
-side = "CLIENT"

puzzle-base/build.gradle

@@ -0,0 +1,9 @@
+archivesBaseName = "puzzle-base"
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
+dependencies {
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+}

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

@@ -0,0 +1,23 @@
+package net.puzzlemc.core;
+
+import net.fabricmc.loader.api.FabricLoader;
+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 "+ (FabricLoader.getInstance().getModContainer("puzzle").isPresent() ? FabricLoader.getInstance().getModContainer("puzzle").get().getMetadata().getVersion() : "Test");
+    public final static String name = "Puzzle";
+    public final static String id = "puzzle";
+    public final static String website = "https://github.com/PuzzleMC/Puzzle";
+    public final static String updateURL = "https://modrinth.com/mod/puzzle";
+
+    public final static String UPDATE_CHECKER_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle-Versions/main/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/PuzzleConfig.java

@@ -0,0 +1,24 @@
+package net.puzzlemc.core.config;
+
+import eu.midnightdust.lib.config.MidnightConfig;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PuzzleConfig extends MidnightConfig {
+    @Entry public static List<String> disabledIntegrations = new ArrayList<>();
+    @Entry public static boolean enablePuzzleButton = true;
+    @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 unlimitedRotations = true;
+    @Entry public static boolean biggerModels = true;
+
+    @Entry public static int backgroundColor = 15675965;
+    @Entry public static int progressBarColor = 16777215;
+    @Entry public static int progressBarBackgroundColor = 15675965;
+    @Entry public static int progressFrameColor = 16777215;
+    @Entry public static boolean disableBlend = false;
+}

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 abstract class MixinDebugHud extends DrawableHelper {
+    @Inject(at = @At("RETURN"), method = "getRightText")
+    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,78 @@
+package net.puzzlemc.core.mixin;
+
+import net.fabricmc.loader.api.FabricLoader;
+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.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 abstract class MixinTitleScreen extends Screen {
+
+    @Shadow @Final private boolean doBackgroundFade;
+    @Shadow private long backgroundFadeStart;
+    private Text puzzleText;
+    private int puzzleTextWidth;
+    private int yOffset;
+
+    protected MixinTitleScreen(Text title) {
+        super(title);
+    }
+    @Inject(at = @At("TAIL"), method = "init")
+    private void puzzle$init(CallbackInfo ci) {
+        yOffset = 20;
+        if (FabricLoader.getInstance().isModLoaded("dashloader")) yOffset = yOffset + 10;
+        if (UpdateChecker.isUpToDate) {
+            puzzleText = Text.of(PuzzleCore.version);
+        }
+        else {
+            puzzleText = Text.translatable("").append(Text.of(PuzzleCore.version + " | ")).append(Text.translatable("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 - yOffset, 16777215 | l);
+            if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - yOffset && mouseY < this.height - yOffset + 10) {
+                fill(matrices, 2, this.height - yOffset + 9, 2 + this.puzzleTextWidth, this.height - yOffset + 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 - yOffset) && mouseY < (double)this.height - yOffset + 10) {
+            if (Objects.requireNonNull(this.client).options.getChatLinksPrompt().getValue()) {
+                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/UpdateChecker.java

@@ -0,0 +1,54 @@
+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_CHECKER_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;
+                    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 occurred, could not check for updates.");
+            }
+        }, MinecraftClient.getInstance());
+    }
+}

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

@@ -0,0 +1,40 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-base",
+  "version": "${version}",
+
+  "name": "Puzzle Base",
+  "description": "Shared code between all Puzzle modules",
+  "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

@@ -1,9 +1,10 @@
 {
   "required": true,
-  "package": "net.puzzlemc.neoforge.mixin",
+  "package": "net.puzzlemc.core.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "splashscreen.MixinNeoForgeLoadingOverlay"
+    "MixinTitleScreen",
+    "MixinDebugHud"
   ],
   "injectors": {
     "defaultRequire": 1

puzzle-gui/build.gradle

@@ -0,0 +1,59 @@
+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"
+		}
+	}
+	maven {
+		name = 'JitPack'
+		url 'https://jitpack.io'
+	}
+	maven {
+		url "https://maven.shedaniel.me/"
+	}
+}
+
+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 ("maven.modrinth:colormatic:${project.colormatic_version}")
+	modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
+	modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
+	modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
+	modImplementation ("maven.modrinth:cem:${project.cem_version}")
+	modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
+
+	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/IrisCompat.java

@@ -0,0 +1,27 @@
+package net.puzzlemc.gui;
+
+import eu.midnightdust.lib.util.MidnightColorUtil;
+import net.fabricmc.loader.api.FabricLoader;
+import net.irisshaders.iris.api.v0.IrisApi;
+import net.irisshaders.iris.api.v0.IrisApiConfig;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+
+public class IrisCompat {
+    public static void init() {
+        if (FabricLoader.getInstance().isModLoaded("iris")) {
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
+                IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
+                irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
+            }));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.literal("➥ ").append(Text.translatable("iris.puzzle.option.open").setStyle(Style.EMPTY.withColor(MidnightColorUtil.radialRainbow(0.5f, 1).getRGB())))), (button) -> {
+                MinecraftClient client = MinecraftClient.getInstance();
+                client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
+            }));
+        }
+    }
+}

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

@@ -2,11 +2,15 @@ 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<>();
@@ -14,22 +18,18 @@ public class PuzzleApi {
 
     public static void addToGraphicsOptions(PuzzleWidget button) {
         GRAPHICS_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages)
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Graphics Options");
-            PuzzleGui.logger().info("{} -> Graphics Options", button.descriptionText.getContent().toString());
     }
     public static void addToMiscOptions(PuzzleWidget button) {
         MISC_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages)
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Misc Options");
-            PuzzleGui.logger().info("{} -> Misc Options", button.descriptionText.getContent().toString());
     }
     public static void addToPerformanceOptions(PuzzleWidget button) {
         PERFORMANCE_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages)
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + "- > Performance Options");
-            PuzzleGui.logger().info("{}- > Performance Options", button.descriptionText.getContent().toString());
     }
     public static void addToResourceOptions(PuzzleWidget button) {
         RESOURCE_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages)
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Resource Options");
-            PuzzleGui.logger().info("{} -> Resource Options", button.descriptionText.getContent().toString());
     }
 }

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

@@ -0,0 +1,309 @@
+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 dynamicfps.DynamicFPSConfig;
+import dynamicfps.DynamicFPSMod;
+import eu.midnightdust.core.MidnightLibClient;
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import io.github.kvverti.colormatic.Colormatic;
+import io.github.kvverti.colormatic.ColormaticConfigController;
+import link.infra.borderlessmining.config.ConfigHandler;
+import me.pepperbell.continuity.client.config.ContinuityConfig;
+import me.pepperbell.continuity.client.config.Option;
+import net.dorianpb.cem.internal.config.CemConfig;
+import net.dorianpb.cem.internal.config.CemConfigFairy;
+import net.dorianpb.cem.internal.config.CemOptions;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.gui.mixin.CemConfigAccessor;
+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.util.Formatting;
+import net.puzzlemc.splashscreen.PuzzleSplashScreen;
+import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
+import traben.entity_texture_features.ETFApi;
+import traben.entity_texture_features.config.ETFConfig;
+import io.github.kvverti.colormatic.ColormaticConfig;
+
+public class PuzzleClient implements ClientModInitializer {
+
+    public final static String id = "puzzle";
+    public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN);
+    public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED);
+
+    @Override
+    public void onInitializeClient() {
+        MidnightLibClient.hiddenMods.add("puzzle");
+        MinecraftClient client = MinecraftClient.getInstance();
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
+            PuzzleConfig.checkUpdates = !PuzzleConfig.checkUpdates;
+            PuzzleConfig.write(id);
+        }));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
+            PuzzleConfig.showPuzzleInfo = !PuzzleConfig.showPuzzleInfo;
+            PuzzleConfig.write(id);
+        }));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
+            client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
+        }));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
+        if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen") && !PuzzleConfig.disabledIntegrations.contains("puzzle-splashscreen")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.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(PuzzleSplashScreen.LOGO));
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("puzzle-models") && !PuzzleConfig.disabledIntegrations.contains("puzzle-models")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
+                PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
+                PuzzleConfig.write(id);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
+                PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
+                PuzzleConfig.write(id);
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("cullleaves") && !PuzzleConfig.disabledIntegrations.contains("cullleaves")) {
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
+                CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
+                CullLeavesConfig.write("cullleaves");
+                MinecraftClient.getInstance().worldRenderer.reload();
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("colormatic") && !PuzzleConfig.disabledIntegrations.contains("colormatic")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Colormatic")));
+            ColormaticConfig colormaticConfig = Colormatic.config();
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
+                colormaticConfig.clearSky = !colormaticConfig.clearSky;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearVoid"), (button) -> button.setMessage(colormaticConfig.clearVoid ? YES : NO), (button) -> {
+                colormaticConfig.clearVoid = !colormaticConfig.clearVoid;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.blendSkyLight"), (button) -> button.setMessage(colormaticConfig.blendSkyLight ? YES : NO), (button) -> {
+                colormaticConfig.blendSkyLight = !colormaticConfig.blendSkyLight;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.flickerBlockLight"), (button) -> button.setMessage(colormaticConfig.flickerBlockLight ? YES : NO), (button) -> {
+                colormaticConfig.flickerBlockLight = !colormaticConfig.flickerBlockLight;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Text.translatable("colormatic.config.option.relativeBlockLightIntensity"),
+                    () -> (int) (100*(1.0 - colormaticConfig.relativeBlockLightIntensityExponent / -16.0)),
+                    (button) -> button.setMessage(Text.translatable("colormatic.config.option.relativeBlockLightIntensity")
+                        .append(": ")
+                        .append(Text.literal(String.valueOf((int)(100 * Math.exp(ColormaticConfig.scaled(colormaticConfig.relativeBlockLightIntensityExponent))))).append("%"))),
+                        (slider) -> {
+                            try {
+                                colormaticConfig.relativeBlockLightIntensityExponent = ((1.00 - ((slider.getInt())/100f)) * -16.0);
+                                ColormaticConfigController.persist(colormaticConfig);
+                            }
+                            catch (NumberFormatException ignored) {}
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("dynamicfps") && !PuzzleConfig.disabledIntegrations.contains("dynamicfps")) {
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Dynamic FPS")));
+            DynamicFPSConfig fpsConfig = DynamicFPSMod.config;
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.reduce_when_unfocused"), (button) -> button.setMessage(fpsConfig.reduceFPSWhenUnfocused ? YES : NO), (button) -> {
+                fpsConfig.reduceFPSWhenUnfocused = !fpsConfig.reduceFPSWhenUnfocused;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 60,Text.translatable("config.dynamicfps.unfocused_fps"), () -> fpsConfig.unfocusedFPS,
+                    (button) -> button.setMessage(Text.of(fpsConfig.unfocusedFPS + " FPS")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.unfocusedFPS = slider.getInt();
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.restore_when_hovered"), (button) -> button.setMessage(fpsConfig.restoreFPSWhenHovered ? YES : NO), (button) -> {
+                fpsConfig.restoreFPSWhenHovered = !fpsConfig.restoreFPSWhenHovered;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.run_gc_on_unfocus"), (button) -> button.setMessage(fpsConfig.runGCOnUnfocus ? YES : NO), (button) -> {
+                fpsConfig.runGCOnUnfocus = !fpsConfig.runGCOnUnfocus;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.unfocused_volume"), () -> ((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue(),
+                    (button) -> button.setMessage(Text.of(((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue() + "%")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.unfocusedVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.hidden_volume"), () -> ((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue(),
+                    (button) -> button.setMessage(Text.of(((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue() + "%")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.hiddenVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("borderlessmining") && !PuzzleConfig.disabledIntegrations.contains("borderlessmining")) {
+            PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Borderless Mining")));
+            ConfigHandler bmConfig = ConfigHandler.getInstance();
+            PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
+                bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());
+                bmConfig.save();
+            }));
+            if (MinecraftClient.IS_SYSTEM_MAC) {
+                PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
+                    bmConfig.enableMacOS = !bmConfig.enableMacOS;
+                    bmConfig.setEnabledPending(bmConfig.isEnabled());
+                    bmConfig.save();
+                }));
+            }
+        }
+        if (FabricLoader.getInstance().isModLoaded("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) {
+            IrisCompat.init();
+        }
+    }
+    public static boolean lateInitDone = false;
+    public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
+        if (FabricLoader.getInstance().isModLoaded("lambdynlights") && !PuzzleConfig.disabledIntegrations.contains("lambdynlights")) {
+            DynamicLightsConfig ldlConfig = LambDynLights.get().config;
+
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("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(Text.translatable("").append("DynLights: ").append(Text.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("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("citresewn") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewnConfig.INSTANCE != null) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
+            CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("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(Text.translatable("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(Text.translatable("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(Text.translatable("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,Text.translatable("config.citresewn.cache_ms.title"), () -> citConfig.cache_ms,
+                    (button) -> button.setMessage(message(citConfig)),
+                    (slider) -> {
+                try {
+                    citConfig.cache_ms = slider.getInt();
+                }
+                catch (NumberFormatException ignored) {}
+                citConfig.write();
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass") && !PuzzleConfig.disabledIntegrations.contains("lambdabettergrass")) {
+            LBGConfig lbgConfig = LambdaBetterGrass.get().config;
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
+        }
+        if (FabricLoader.getInstance().isModLoaded("cem") && FabricLoader.getInstance().isModLoaded("completeconfig") && !PuzzleConfig.disabledIntegrations.contains("cem")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models")));
+            CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig();
+            CemOptions cemOptions = CemConfigFairy.getConfig();
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> {
+                ((CemConfigAccessor)cemOptions).setUseOptifineFolder(!cemConfig.useOptifineFolder());
+                cemConfig.save();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_new_model_creation_fix"), (button) -> button.setMessage(cemConfig.useTransparentParts() ? YES : NO), (button) -> {
+                ((CemConfigAccessor)cemOptions).setUseModelCreationFix(!cemConfig.useTransparentParts());
+                cemConfig.save();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> {
+                ((CemConfigAccessor)cemOptions).setUseOldAnimations(!cemConfig.useOldAnimations());
+                cemConfig.save();
+            }));
+        }
+        if (FabricLoader.getInstance().isModLoaded("continuity") && !PuzzleConfig.disabledIntegrations.contains("continuity")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
+            ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
+            contConfig.getOptionMapView().forEach((s, option) -> {
+                if (s.equals("use_manual_culling")) return;
+                try {
+                    Option.BooleanOption booleanOption = ((Option.BooleanOption)option);
+                    PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> {
+                        booleanOption.set(!booleanOption.get());
+                        contConfig.onChange();
+                        contConfig.save();
+                    }));
+                } catch (Exception ignored) {}
+            });
+        }
+        if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.title")));
+            ETFConfig etfConfig = ETFApi.getETFConfigObject;
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
+                etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
+                etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
+                    Text.literal(etfConfig.emissiveRenderMode.toString())), (button) -> {
+                etfConfig.emissiveRenderMode = etfConfig.emissiveRenderMode.next();
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
+                etfConfig.enableBlinking = !etfConfig.enableBlinking;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
+                etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+        }
+        lateInitDone = true;
+    }
+    public static Text message(CITResewnConfig config) {
+        int ticks = config.cache_ms;
+            if (ticks <= 1) {
+                return (Text.translatable("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 (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
+            }
+    }
+}

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

@@ -0,0 +1,31 @@
+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 {
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return PuzzleOptionsScreen::new;
+    }
+
+    //Used to set the config screen for all modules //
+    @Override
+    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
+        Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
+        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-splashscreen",PuzzleOptionsScreen::new);
+        map.put("puzzle",PuzzleOptionsScreen::new);
+        return map;
+    }
+}

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

@@ -0,0 +1,17 @@
+package net.puzzlemc.gui.mixin;
+
+import net.dorianpb.cem.internal.config.CemConfig;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(value = CemConfig.class, remap = false)
+public interface CemConfigAccessor {
+    @Accessor("use_optifine_folder")
+    void setUseOptifineFolder(boolean value);
+
+    @Accessor("use_new_model_creation_fix")
+    void setUseModelCreationFix(boolean value);
+
+    @Accessor("use_old_animations")
+    void setUseOldAnimations(boolean value);
+}

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

@@ -0,0 +1,37 @@
+package net.puzzlemc.gui.mixin;
+
+import eu.midnightdust.core.config.MidnightLibConfig;
+import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.util.Identifier;
+import net.puzzlemc.core.config.PuzzleConfig;
+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 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 abstract 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 puzzle$init(CallbackInfo ci) {
+        if (PuzzleConfig.enablePuzzleButton) {
+            int i = 0;
+            if (FabricLoader.getInstance().isModLoaded("lod")) i = i + 358;
+            if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25;
+            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178 + i, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), Text.translatable("midnightlib.overview.title")));
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package net.puzzlemc.gui.screen;
+
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Text;
+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.widget.ButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+
+import java.util.Objects;
+
+public class PuzzleOptionsScreen extends Screen {
+
+    public PuzzleOptionsScreen(Screen parent) {
+        super(Text.translatable("puzzle.screen.title"));
+        this.parent = parent;
+    }
+    private final Screen parent;
+
+    @Override
+    protected void init() {
+        super.init();
+        if (!PuzzleClient.lateInitDone) PuzzleClient.lateInit();
+        GraphicsPage graphicsPage = new GraphicsPage(this);
+        MiscPage miscPage = new MiscPage(this);
+        PerformancePage performancePage = new PerformancePage(this);
+        ResourcesPage resourcesPage = new ResourcesPage(this);
+
+        if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) 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)));
+        if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) 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)));
+        if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) 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)));
+        if (!PuzzleApi.MISC_OPTIONS.isEmpty()) 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)));
+        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

@@ -0,0 +1,53 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+
+import java.util.List;
+import java.util.Objects;
+
+public abstract class AbstractPuzzleOptionsPage extends Screen {
+    public PuzzleOptionListWidget list;
+    private final List<PuzzleWidget> options;
+    public List<Text> tooltip = null;
+
+    public AbstractPuzzleOptionsPage(Screen parent, Text title, List<PuzzleWidget> options) {
+        super(title);
+        this.parent = parent;
+        this.options = options;
+    }
+    private final Screen parent;
+
+    @Override
+    protected void init() {
+        this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
+        list.addAll(options);
+        this.addSelectableChild(this.list);
+
+        super.init();
+
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
+    }
+
+    @Override
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        this.renderBackground(matrices);
+        if (client != null && client.world != null) this.list.setRenderBackground(false);
+        this.list.render(matrices, mouseX, mouseY, delta);
+
+        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
+        super.render(matrices, mouseX, mouseY, delta);
+        if (tooltip != null) {
+            if (this.list.getFocused() != null && (this.list.getHoveredEntry() == null || this.list.getHoveredEntry().button == null || !this.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY))) {
+                renderTooltip(matrices, tooltip, this.list.getFocused().getX() + this.list.getFocused().getWidth(), this.list.getFocused().getY() + (this.list.getFocused().getHeight() * 2));
+            }
+            else renderTooltip(matrices, tooltip, mouseX, mouseY);
+        }
+        tooltip = null;
+    }
+}