Puzzle 1.2.1 - Fix CITResewn 1.0.0+

Fix #18
Fix #17
Fix #13
Russian translations by @Felix14-v2
German translations by @2020Sanoj

build.gradle

@@ -1,6 +1,6 @@
 // Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
 plugins {
-    id "fabric-loom" version "0.8-SNAPSHOT" apply false
+    id "fabric-loom" version "0.10-SNAPSHOT" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "maven-publish"
     id "java-library"
@@ -17,13 +17,11 @@ subprojects {
 
     archivesBaseName = project.name
     group = "${rootProject.group}.${rootProject.archivesBaseName}"
-
-    //apply from: "https://raw.githubusercontent.com/OnyxStudios/Gradle-Scripts/master/scripts/fabric/basic_project.gradle"
 }
 
 allprojects {
     apply plugin: "fabric-loom"
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
     version = System.getenv("TRAVIS_TAG") ?: rootProject.mod_version
 
     configurations {
@@ -55,7 +53,7 @@ allprojects {
     // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
     tasks.withType(JavaCompile).configureEach {
         it.options.encoding = "UTF-8"
-        it.options.release = 16
+        it.options.release = 17
     }
 
     java {
@@ -119,10 +117,17 @@ repositories {
             includeGroup "curse.maven"
         }
     }
+    maven {
+        name = 'JitPack'
+        url 'https://jitpack.io'
+    }
+    maven {
+        url "https://maven.shedaniel.me/"
+    }
 }
 
 dependencies {
-    modImplementation "net.fabricmc.fabric-api:fabric-api:0.34.8+1.17"
+    modImplementation ("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
     modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") {
         exclude group: "net.fabricmc.fabric-api"
     }
@@ -133,7 +138,9 @@ dependencies {
     modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
     modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
     modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
-    modImplementation "curse.maven:custom-entity-models-cem-477078:3440846"
+    modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
+    modImplementation ("curse.maven:custom-entity-models-cem-477078:${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'

gradle.properties

@@ -3,26 +3,29 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17.1
+	minecraft_version=1.18.1
-	yarn_mappings=1.17.1+build.61
+	yarn_mappings=1.18.1+build.14
-	loader_version=0.11.7
+	loader_version=0.13.3
 
 # Mod Properties
-	mod_version = 1.1.0
+	mod_version = 1.2.1
 	maven_group = net.puzzlemc
 	archives_base_name = puzzle
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.40.1+1.17
+	fabric_version=0.45.0+1.18
 	mod_menu_version = 2.0.13
 	
-	cull_leaves_version = 2.3.0
+	cull_leaves_version = 2.3.2
 	ldl_version = 2.1.0+1.17
-	lbg_version = 1.2.1+1.17
+	lbg_version = 1.2.2+1.17
-	iris_version = mc1.17.1-1.1.2
+	iris_version = 1.18.x-v1.1.4
-	continuity_version = 1.0.0+1.17
+	continuity_version = 1.0.3+1.18
-	animatica_version = 0.1+1.17
+	animatica_version = 0.2+1.18
-	cit_resewn_version = 0.8.1
+	cit_resewn_version = 1.0.1+1.18.2
-	spruceui_version=3.3.0+1.17
+	cem_version = 3561474
-	midnightlib_version=0.3.1
+	complete_config_version = 1.0.0
+	spruceui_version=3.3.2+1.17
+	midnightlib_version=0.4.0
+	entitytexturefeatures_version=2.4.5

puzzle-base/build.gradle

@@ -1,3 +1,9 @@
 archivesBaseName = "puzzle-base"
-dependencies {
+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

@@ -1,18 +1,19 @@
 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 R1";
+    public final static String version = "Puzzle "+ FabricLoader.getInstance().getModContainer("puzzle").get().getMetadata().getVersion();
     public final static String name = "Puzzle";
     public final static String id = "puzzle";
     public final static String website = "https://github.com/PuzzleMC/Puzzle";
-    public static String updateURL = website; //+"download";
+    public final static String updateURL = "https://modrinth.com/mod/puzzle";
 
-    public final static String UPDATE_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle/1.17/puzzle_versions.json";
+    public final static String UPDATE_CHECKER_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle-Versions/main/puzzle_versions.json";
 
     @Override
     public void onInitializeClient() {

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

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

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

@@ -1,13 +1,20 @@
 package net.puzzlemc.core.config;
 
-public class PuzzleConfig extends MidnightConfigLite {
+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 randomEntityTextures = true;
+    @Entry public static boolean disableSplashScreenBlend = false;
-    @Entry public static boolean customRenderLayers = true;
+    @Entry public static boolean emissiveTextures = true;
     @Entry public static boolean unlimitedRotations = true;
     @Entry public static boolean biggerModels = true;
 

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

@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.List;
 
 @Mixin(DebugHud.class)
-public class MixinDebugHud extends DrawableHelper {
+public abstract class MixinDebugHud extends DrawableHelper {
     @Inject(at = @At("RETURN"), method = "getRightText", cancellable = true)
     private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
         if (PuzzleConfig.showPuzzleInfo) {

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

@@ -1,5 +1,6 @@
 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;
@@ -20,18 +21,21 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.Objects;
 
 @Mixin(TitleScreen.class)
-public class MixinTitleScreen extends Screen {
+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);
         }
@@ -47,9 +51,9 @@ public class MixinTitleScreen extends Screen {
             float f = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
             float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F;
             int l = MathHelper.ceil(g * 255.0F) << 24;
-            textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - 20, 16777215 | l);
+            textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - yOffset, 16777215 | l);
-            if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - 20 && mouseY < this.height - 10) {
+            if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - yOffset && mouseY < this.height - yOffset + 10) {
-                fill(matrices, 2, this.height - 11, 2 + this.puzzleTextWidth, this.height-10, 16777215 | l);
+                fill(matrices, 2, this.height - yOffset + 9, 2 + this.puzzleTextWidth, this.height - yOffset + 10, 16777215 | l);
             }
         }
     }
@@ -63,7 +67,7 @@ public class MixinTitleScreen extends Screen {
 
     @Inject(at = @At("HEAD"), method = "mouseClicked",cancellable = true)
     private void puzzle$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
-        if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - 20) && mouseY < (double)this.height-10) {
+        if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - yOffset) && mouseY < (double)this.height - yOffset + 10) {
             if (Objects.requireNonNull(this.client).options.chatLinksPrompt) {
                 this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
             } else {

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

@@ -29,7 +29,7 @@ public class UpdateChecker {
 
     public static void init() {
         CompletableFuture.supplyAsync(() -> {
-            try (Reader reader = new InputStreamReader(new URL(PuzzleCore.UPDATE_URL).openStream())) {
+            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());
@@ -43,12 +43,11 @@ public class UpdateChecker {
                 latestVersion = versionMap.get(minecraftVersion);
                 if (!latestVersion.equals(PuzzleCore.version)) {
                     isUpToDate = false;
-                    PuzzleCore.updateURL = PuzzleCore.website + "download/" + latestVersion.replace(PuzzleCore.name + " ","");
                     logger.log(Level.INFO, "There is a newer version of "+ PuzzleCore.name +" available: " + latestVersion);
                     logger.log(Level.INFO, "Please update immediately!");
                 }
             } else {
-                logger.log(Level.WARN, "A problem with the database occured, could not check for updates.");
+                logger.log(Level.WARN, "A problem with the database occurred, could not check for updates.");
             }
         }, MinecraftClient.getInstance());
     }

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

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

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

@@ -3,8 +3,8 @@
   "id": "puzzle-base",
   "version": "${version}",
 
-  "name": "Puzzle",
+  "name": "Puzzle Base",
-  "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
+  "description": "Shared code between all Puzzle modules",
   "authors": [
     "PuzzleMC",
     "Motschen"

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

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.puzzlemc.core.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_17",
   "client": [
     "MixinTitleScreen",
     "MixinDebugHud"

puzzle-blocks/build.gradle

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

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

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

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

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

puzzle-gui/build.gradle

@@ -20,6 +20,13 @@ repositories {
 			includeGroup "curse.maven"
 		}
 	}
+	maven {
+		name = 'JitPack'
+		url 'https://jitpack.io'
+	}
+	maven {
+		url "https://maven.shedaniel.me/"
+	}
 }
 
 dependencies {
@@ -35,7 +42,9 @@ dependencies {
 	modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
  	modImplementation ("maven.modrinth:iris:${project.iris_version}")
 	modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
-	modImplementation "curse.maven:custom-entity-models-cem-477078:3440846"
+	modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
+	modImplementation ("curse.maven:custom-entity-models-cem-477078:${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'

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

@@ -0,0 +1,26 @@
+package net.puzzlemc.gui;
+
+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.Text;
+import net.minecraft.text.TranslatableText;
+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.of("Enable Shaders"), (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(new TranslatableText("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
+                MinecraftClient client = MinecraftClient.getInstance();
+                client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
+            }));
+        }
+    }
+}

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

@@ -6,7 +6,11 @@ import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
 import dev.lambdaurora.lambdynlights.LambDynLights;
 import eu.midnightdust.cullleaves.config.CullLeavesConfig;
 import me.pepperbell.continuity.client.config.ContinuityConfig;
+import net.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;
@@ -17,6 +21,10 @@ import net.minecraft.util.Formatting;
 import net.puzzlemc.splashscreen.PuzzleSplashScreen;
 import shcm.shsupercm.fabric.citresewn.CITResewn;
 import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
+import traben.entity_texture_features.client.ETF_CLIENT;
+import traben.entity_texture_features.client.ETF_METHODS;
+import traben.entity_texture_features.config.ETFConfig;
+import traben.entity_texture_features.config.ETFConfigScreen;
 
 public class PuzzleClient implements ClientModInitializer {
 
@@ -26,48 +34,43 @@ public class PuzzleClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
+        MinecraftClient client = MinecraftClient.getInstance();
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Check for Updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("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.of("Show Puzzle version info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
             PuzzleConfig.showPuzzleInfo = !PuzzleConfig.showPuzzleInfo;
             PuzzleConfig.write(id);
         }));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("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")) {
+        if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen") && !PuzzleConfig.disabledIntegrations.contains("puzzle-splashscreen")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Use resourcepack splash screen "), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("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());
             }));
-        }
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.disable_splash_screen_blend"), (button) -> button.setMessage(PuzzleConfig.disableSplashScreenBlend ? YES : NO), (button) -> {
-        if (FabricLoader.getInstance().isModLoaded("puzzle-randomentities")) {
+                PuzzleConfig.disableSplashScreenBlend = !PuzzleConfig.disableSplashScreenBlend;
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Random Entity Textures"), (button) -> button.setMessage(PuzzleConfig.randomEntityTextures ? YES : NO), (button) -> {
-                PuzzleConfig.randomEntityTextures = !PuzzleConfig.randomEntityTextures;
                 PuzzleConfig.write(id);
             }));
         }
-        if (FabricLoader.getInstance().isModLoaded("puzzle-models")) {
+        if (FabricLoader.getInstance().isModLoaded("puzzle-models") && !PuzzleConfig.disabledIntegrations.contains("puzzle-models")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Unlimited Model Rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("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.of("Bigger Custom Models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
                 PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
                 PuzzleConfig.write(id);
             }));
         }
-        if (FabricLoader.getInstance().isModLoaded("puzzle-blocks")) {
+        if (FabricLoader.getInstance().isModLoaded("cullleaves") && !PuzzleConfig.disabledIntegrations.contains("cullleaves")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Render Layer Overwrites"), (button) -> button.setMessage(PuzzleConfig.customRenderLayers ? YES : NO), (button) -> {
-                PuzzleConfig.customRenderLayers = !PuzzleConfig.customRenderLayers;
-                PuzzleConfig.write(id);
-            }));
-        }
-
-        if (FabricLoader.getInstance().isModLoaded("cullleaves")) {
             PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
             PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Cull Leaves"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
                 CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
@@ -75,18 +78,11 @@ public class PuzzleClient implements ClientModInitializer {
                 MinecraftClient.getInstance().worldRenderer.reload();
             }));
         }
-
+        if (FabricLoader.getInstance().isModLoaded("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) {
-        if (FabricLoader.getInstance().isModLoaded("lambdynlights")) {
+            IrisCompat.init();
-            DynamicLightsConfig ldlConfig = LambDynLights.get().config;
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
         }
-        if (FabricLoader.getInstance().isModLoaded("continuity")) {
+
+        if (FabricLoader.getInstance().isModLoaded("continuity") && !PuzzleConfig.disabledIntegrations.contains("continuity")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
             ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
             PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.disable_ctm"), (button) -> button.setMessage(contConfig.disableCTM.get() ? YES : NO), (button) -> {
@@ -100,19 +96,53 @@ public class PuzzleClient implements ClientModInitializer {
                 contConfig.save();
             }));
         }
-
+        if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
-        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Entity Texture Features")));
-            LBGConfig lbgConfig = LambdaBetterGrass.get().config;
+            ETFConfig etfConfig = ETF_CLIENT.ETFConfigData;
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
+            ETFConfigScreen etfConfigScreen = new ETFConfigScreen();
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Optifine Random mobs"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
+                etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Optifine Emissive entity textures"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
+                etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive texture Z-Fighting / Shader patch"), (button) -> button.setMessage(etfConfig.doShadersEmissiveFix ? YES : NO), (button) -> {
+                etfConfig.doShadersEmissiveFix = !etfConfig.doShadersEmissiveFix;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Blinking Mobs"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
+                etfConfig.enableBlinking = !etfConfig.enableBlinking;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Player Skin Features"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
+                etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
         }
     }
-    public static boolean citInitialized = false;
+    public static boolean lateInitDone = false;
-    public static void initCITResewn() { // CITResewn is initialized after Puzzle, so we can't access it in our ClientModInitializer
+    public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
-        if (!citInitialized && FabricLoader.getInstance().isModLoaded("citresewn") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) {
+        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(new TranslatableText("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
+        }
+        if (FabricLoader.getInstance().isModLoaded("citresewn") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewnConfig.INSTANCE != null) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
-            CITResewnConfig citConfig = CITResewnConfig.INSTANCE();
+            CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
             PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
                 citConfig.enabled = !citConfig.enabled;
                 citConfig.write();
@@ -139,8 +169,31 @@ public class PuzzleClient implements ClientModInitializer {
                 catch (NumberFormatException ignored) {}
                 citConfig.write();
             }));
-            citInitialized = true;
         }
+        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(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
+        }
+        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(new TranslatableText("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> {
+                ((CemConfigAccessor)cemOptions).setUseOptifineFolder(!cemConfig.useOptifineFolder());
+                cemConfig.save();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("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(new TranslatableText("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> {
+                ((CemConfigAccessor)cemOptions).setUseOldAnimations(!cemConfig.useOldAnimations());
+                cemConfig.save();
+            }));
+        }
+        lateInitDone = true;
     }
     public static Text message(CITResewnConfig config) {
         int ticks = config.cache_ms;

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

@@ -11,18 +11,21 @@ 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 //
+    //Used to set the config screen for all modules //
     @Override
     public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
         Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
-        map.put("puzzle",PuzzleOptionsScreen::new);
         map.put("puzzle-gui",PuzzleOptionsScreen::new);
         map.put("puzzle-blocks",PuzzleOptionsScreen::new);
         map.put("puzzle-base",PuzzleOptionsScreen::new);
         map.put("puzzle-models",PuzzleOptionsScreen::new);
-        map.put("puzzle-randomentities",PuzzleOptionsScreen::new);
         map.put("puzzle-splashscreen",PuzzleOptionsScreen::new);
+        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

@@ -2,6 +2,7 @@ package net.puzzlemc.gui.mixin;
 
 import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
 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;
@@ -16,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.Objects;
 
 @Mixin(OptionsScreen.class)
-public class MixinOptionsScreen extends Screen {
+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) {
@@ -25,6 +26,7 @@ public class MixinOptionsScreen extends Screen {
 
     @Inject(at = @At("HEAD"), method = "init")
     private void midnightlib$init(CallbackInfo ci) {
+        if (PuzzleConfig.enablePuzzleButton)
             this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), new TranslatableText("midnightlib.overview.title")));
     }
 }

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

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

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

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

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

@@ -39,5 +39,8 @@
 
   "depends": {
     "fabric": "*"
+  },
+  "breaks": {
+    "citresewn": "<=1.0.0+1.18.2"
   }
 }

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

@@ -1,9 +1,10 @@
 {
   "required": true,
   "package": "net.puzzlemc.gui.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_17",
   "client": [
-    "MixinOptionsScreen"
+    "MixinOptionsScreen",
+    "CemConfigAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

puzzle-models/build.gradle

@@ -1,9 +1,14 @@
 archivesBaseName = "puzzle-models"
 
-minecraft {
+loom {
-    accessWidener =  file("src/main/resources/puzzle-models.accesswidener")
+    accessWidenerPath =  file("src/main/resources/puzzle-models.accesswidener")
+}
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
 }
-
 dependencies {
     api project(":puzzle-base")
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
 }

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

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.puzzlemc.models.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_17",
   "client": [
     "MixinModelElementDeserializer"
   ],

puzzle-splashscreen/build.gradle

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

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

@@ -2,6 +2,8 @@ package net.puzzlemc.splashscreen;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.util.Util;
+import net.minecraft.util.math.ColorHelper;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.core.util.ColorUtil;
 import net.fabricmc.api.EnvType;
@@ -10,7 +12,6 @@ import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.hud.BackgroundHelper;
 import net.minecraft.client.resource.metadata.TextureResourceMetadata;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.ResourceTexture;
@@ -45,11 +46,13 @@ public class PuzzleSplashScreen implements ClientModInitializer {
     }
 
     public void onInitializeClient() {
-        if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistant //
+        if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
             if (CONFIG_PATH.mkdir()) { // Create our custom config directory //
-                try {
+                if (Util.getOperatingSystem().equals(Util.OperatingSystem.WINDOWS)) {
-                    Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
+                    try {
-                } catch (IOException ignored) {
+                        Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
+                    } catch (IOException ignored) {
+                    }
                 }
             }
         }
@@ -72,15 +75,15 @@ public class PuzzleSplashScreen implements ClientModInitializer {
 
                             if (properties.get("screen.loading") != null) {
                                 Color backgroundColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading").toString());
-                                PuzzleConfig.backgroundColor = BackgroundHelper.ColorMixer.getArgb(backgroundColorRGB.getAlpha(), backgroundColorRGB.getRed(), backgroundColorRGB.getGreen(), backgroundColorRGB.getGreen());
+                                PuzzleConfig.backgroundColor = ColorHelper.Argb.getArgb(backgroundColorRGB.getAlpha(), backgroundColorRGB.getRed(), backgroundColorRGB.getGreen(), backgroundColorRGB.getGreen());
                             }
                             if (properties.get("screen.loading.bar") != null) {
                                 Color progressFrameColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString());
-                                PuzzleConfig.progressFrameColor = BackgroundHelper.ColorMixer.getArgb(progressFrameColorRGB.getAlpha(), progressFrameColorRGB.getRed(), progressFrameColorRGB.getGreen(), progressFrameColorRGB.getGreen());
+                                PuzzleConfig.progressFrameColor = ColorHelper.Argb.getArgb(progressFrameColorRGB.getAlpha(), progressFrameColorRGB.getRed(), progressFrameColorRGB.getGreen(), progressFrameColorRGB.getGreen());
                             }
                             if (properties.get("screen.loading.progress") != null) {
                                 Color progressBarColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString());
-                                PuzzleConfig.progressBarColor = BackgroundHelper.ColorMixer.getArgb(progressBarColorRGB.getAlpha(), progressBarColorRGB.getRed(), progressBarColorRGB.getGreen(), progressBarColorRGB.getGreen());
+                                PuzzleConfig.progressBarColor = ColorHelper.Argb.getArgb(progressBarColorRGB.getAlpha(), progressBarColorRGB.getRed(), progressBarColorRGB.getGreen(), progressBarColorRGB.getGreen());
                             }
                             if (properties.get("screen.loading") != null) {
                                 PuzzleConfig.write("puzzle");

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

@@ -1,6 +1,7 @@
 package net.puzzlemc.splashscreen.mixin;
 
 import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Overlay;
 import net.minecraft.client.gui.screen.SplashOverlay;
@@ -54,7 +55,7 @@ public abstract class MixinSplashScreen extends Overlay {
     private void modifyBackgroundColor2(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
         long l = Util.getMeasuringTimeMs();
         float g = this.reloadStartTime > -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F;
-        int m = MathHelper.ceil(MathHelper.clamp((double)g, 0.15D, 1.0D) * 255.0D);
+        int m = MathHelper.ceil(MathHelper.clamp(g, 0.15D, 1.0D) * 255.0D);
         if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965)
             fill(matrices, 0, 0, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight(), withAlpha(PuzzleConfig.backgroundColor, m));
     }
@@ -69,6 +70,10 @@ public abstract class MixinSplashScreen extends Overlay {
             GlStateManager._clear(16384, MinecraftClient.IS_SYSTEM_MAC);
         }
     }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableBlend()V", shift = At.Shift.AFTER), remap = false)
+    private void disableBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (PuzzleConfig.disableSplashScreenBlend) RenderSystem.disableBlend();
+    }
 
     @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5)
     private int modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value //

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

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.puzzlemc.splashscreen.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_17",
   "client": [
     "MixinSplashScreen"
   ],

puzzle_versions.json

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

settings.gradle

@@ -11,6 +11,4 @@ include 'puzzle-base'
 
 include 'puzzle-splashscreen'
 include 'puzzle-models'
-include 'puzzle-blocks'
-//include 'puzzle-randomentities'
 include 'puzzle-gui'

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

@@ -0,0 +1,17 @@
+{
+	"puzzle.text.update_available":"Ein Update ist verfügbar!",
+	"puzzle.screen.title":"Puzzle Einstellungen",
+	"puzzle.page.graphics":"Grafik Einstellungen",
+	"puzzle.page.resources":"Resourcen Einstellungen",
+	"puzzle.page.performance":"Performance Einstellungen",
+	"puzzle.page.misc":"Sonstige Einstellungen",
+	"puzzle.option.check_for_updates":"Auf Updates überprüfen",
+	"puzzle.option.show_version_info":"Zeige Puzzles Versions Informationen",
+	"puzzle.option.resourcepack_splash_screen":"Nutzte den Resourcepack-splash-Screen",
+	"puzzle.option.disable_splash_screen_blend":"Deaktiviere das Überblenden des Splash-Screen-Logos",
+	"puzzle.option.emissive_textures":"Emissive Texturen",
+	"puzzle.option.unlimited_model_rotations":"Unbegrenzte Modellrotationen",
+	"puzzle.option.bigger_custom_models":"Größere benutzerdefinierte Modelle",
+	"puzzle.option.render_layer_overrides":"Render Layer Overrides",
+	"puzzle.midnightconfig.title":"Erweiterte Puzzle Einstellungen"
+}

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

@@ -5,13 +5,13 @@
 	"puzzle.page.resources":"Resource Settings",
 	"puzzle.page.performance":"Performance Settings",
 	"puzzle.page.misc":"Miscellaneous Settings",
-	"puzzle.option.ctm":"Connected Textures",
+	"puzzle.option.check_for_updates":"Check for Updates",
-	"puzzle.option.inside_ctm":"Connect Inside Textures",
+	"puzzle.option.show_version_info":"Show Puzzle version info",
-	"puzzle.midnightconfig.title":"Title",
+	"puzzle.option.resourcepack_splash_screen":"Use resourcepack splash screen",
-	"puzzle.midnightconfig.showPuzzleInfo":"Show Puzzle Info",
+	"puzzle.option.disable_splash_screen_blend":"Disable splash screen logo blending",
-	"puzzle.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info",
+	"puzzle.option.emissive_textures":"Emissive Textures",
-	"test.midnightconfig.title":"I am a title",
+	"puzzle.option.unlimited_model_rotations":"Unlimited Model Rotations",
-	"test.midnightconfig.text":"I am a comment *u*",
+	"puzzle.option.bigger_custom_models":"Bigger Custom Models",
-	"test.midnightconfig.showInfo":"Show Info",
+	"puzzle.option.render_layer_overrides":"Render Layer Overrides",
-	"test.midnightconfig.showInfo.tooltip":"Show more information"
+	"puzzle.midnightconfig.title":"Puzzle Advanced Configuration"
 }

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

@@ -0,0 +1,17 @@
+{
+	"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.show_version_info":"Показывать информацию о версии",
+	"puzzle.option.resourcepack_splash_screen":"Пользовательский экран загрузки",
+	"puzzle.option.disable_splash_screen_blend":"Отключить смешивание логотипа",
+	"puzzle.option.emissive_textures":"Светящиеся текстуры",
+	"puzzle.option.unlimited_model_rotations":"Неограниченные повороты моделей",
+	"puzzle.option.bigger_custom_models":"Увеличенный размер моделей",
+	"puzzle.option.render_layer_overrides":"Переопределение слоёв рендеринга",
+	"puzzle.midnightconfig.title":"Расширенные настройки Puzzle"
+}