Fix emissive texture Z-fighting with shaders, Fix crashing without Iris

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,8 @@ 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 ("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,28 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17.1
-	yarn_mappings=1.17.1+build.61
-	loader_version=0.11.7
+	minecraft_version=1.18.1
+	yarn_mappings=1.18.1+build.14
+	loader_version=0.12.12
 
 # Mod Properties
-	mod_version = 1.1.0
+	mod_version = 1.0.0-pre4
 	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
-	iris_version = mc1.17.1-1.1.2
-	continuity_version = 1.0.0+1.17
-	animatica_version = 0.1+1.17
-	cit_resewn_version = 0.8.1
-	spruceui_version=3.3.0+1.17
+	lbg_version = 1.2.2+1.17
+	iris_version = mc1.18.1-1.1.3
+	continuity_version = 1.0.3+1.18
+	animatica_version = 0.2+1.18
+	cit_resewn_version = 0.8.1-1.18
+	cem_version = 3561474
+	complete_config_version = 1.0.0
+	spruceui_version=3.3.2+1.17
 	midnightlib_version=0.3.1

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

@@ -6,13 +6,13 @@ import net.fabricmc.api.ClientModInitializer;
 
 public class PuzzleCore implements ClientModInitializer {
 
-    public final static String version = "Puzzle R1";
+    public final static String version = "Puzzle B0";
     public final static String name = "Puzzle";
     public final static String id = "puzzle";
     public final static String website = "https://github.com/PuzzleMC/Puzzle";
     public static String updateURL = website; //+"download";
 
-    public final static String UPDATE_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle/1.17/puzzle_versions.json";
+    public final static String UPDATE_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/PuzzleConfig.java

@@ -6,7 +6,8 @@ public class PuzzleConfig extends MidnightConfigLite {
     @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 emissiveTextures = true;
     @Entry public static boolean customRenderLayers = 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

@@ -20,7 +20,7 @@ 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;

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",
-  "description": "Unites optifine replacement mods in a clean & vanilla-style gui",
+  "name": "Puzzle Base",
+  "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-emissives/build.gradle

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

puzzle-emissives/src/main/java/net/puzzlemc/emissives/PuzzleEmissiveTextures.java

@@ -0,0 +1,60 @@
+package net.puzzlemc.emissives;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
+import org.apache.logging.log4j.LogManager;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+public class PuzzleEmissiveTextures implements ClientModInitializer {
+    public static final Map<Identifier, Identifier> emissiveTextures = new HashMap<>();
+
+    public void onInitializeClient() {
+        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
+            @Override
+            public Identifier getFabricId() {
+                return new Identifier("puzzle", "emissive_textures");
+            }
+
+            @Override
+            public void reload(ResourceManager manager) {
+                if (PuzzleConfig.emissiveTextures) {
+                    String suffix = "_e";
+
+                    for (Identifier id : manager.findResources("optifine", path -> path.contains("emissive.properties"))) {
+                        try (InputStream stream = manager.getResource(id).getInputStream()) {
+                            Properties properties = new Properties();
+                            properties.load(stream);
+
+                            if (properties.get("suffix.emissive") != null) {
+                                suffix = properties.get("suffix.emissive").toString();
+                            }
+                        } catch (Exception e) {
+                            LogManager.getLogger("Puzzle").error("Error occurred while loading emissive.properties " + id.toString(), e);
+                        }
+                        String finalSuffix = suffix;
+                        for (Identifier emissiveId : manager.findResources("textures", path -> path.endsWith(finalSuffix + ".png"))) {
+                            try {
+                                String normalTexture = emissiveId.toString();
+                                normalTexture = normalTexture.substring(0, normalTexture.lastIndexOf(finalSuffix));
+                                Identifier normalId =  Identifier.tryParse(normalTexture + ".png");
+                                emissiveTextures.put(normalId, emissiveId);
+                                if (PuzzleConfig.debugMessages) LogManager.getLogger("Puzzle").info(normalId + " " + emissiveId);
+                            } catch (Exception e) {
+                                LogManager.getLogger("Puzzle").error("Error occurred while loading emissive texture " + emissiveId.toString(), e);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+    }
+}

puzzle-emissives/src/main/java/net/puzzlemc/emissives/mixin/MixinLivingEntityRenderer.java

@@ -0,0 +1,39 @@
+package net.puzzlemc.emissives.mixin;
+
+import net.minecraft.client.render.OverlayTexture;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.*;
+import net.minecraft.client.render.entity.feature.FeatureRendererContext;
+import net.minecraft.client.render.entity.model.EntityModel;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.LivingEntity;
+import net.puzzlemc.core.config.PuzzleConfig;
+import net.puzzlemc.emissives.PuzzleEmissiveTextures;
+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(value = LivingEntityRenderer.class)
+public abstract class MixinLivingEntityRenderer<T extends LivingEntity, M extends EntityModel<T>> extends EntityRenderer<T> implements FeatureRendererContext<T, M> {
+
+    @Shadow public abstract M getModel();
+
+    protected MixinLivingEntityRenderer(EntityRendererFactory.Context ctx) {
+        super(ctx);
+    }
+
+    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/EntityModel;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;IIFFFF)V", shift = At.Shift.AFTER), method = "render*")
+    private void onRender(T entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
+        if (PuzzleConfig.emissiveTextures && PuzzleEmissiveTextures.emissiveTextures.containsKey(this.getTexture(entity))) {
+            VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(PuzzleEmissiveTextures.emissiveTextures.get(this.getTexture(entity)),true));
+
+            matrices.scale(1.015f,1.015f,1.015f);
+            this.getModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
+            matrices.scale(1f,1f,1f);
+        }
+    }
+}

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

@@ -0,0 +1,40 @@
+{
+  "schemaVersion": 1,
+  "id": "puzzle-emissives",
+  "version": "${version}",
+
+  "name": "Puzzle Emissive Textures",
+  "description": "Displays emissive textures on blocks and entities",
+  "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.emissives.PuzzleEmissiveTextures"
+    ]
+  },
+  "custom": {
+    "modmenu": {
+      "parent": "puzzle"
+    }
+  },
+
+  "mixins": [
+    "puzzle-emissives.mixins.json"
+  ],
+
+  "depends": {
+    "fabric": "*"
+  }
+}

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

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

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,8 @@ 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 ("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,42 @@
+package net.puzzlemc.gui;
+
+import net.coderbot.iris.Iris;
+import net.coderbot.iris.config.IrisConfig;
+import net.coderbot.iris.gui.screen.ShaderPackScreen;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+
+import java.io.IOException;
+
+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(Iris.getIrisConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
+                IrisConfig irisConfig = Iris.getIrisConfig();
+                irisConfig.setShadersEnabled(!irisConfig.areShadersEnabled());
+                try {
+                    Iris.getIrisConfig().save();
+                } catch (IOException e) {
+                    Iris.logger.error("Error saving configuration file!");
+                    Iris.logger.catching(e);
+                }
+
+                try {
+                    Iris.reload();
+                } catch (IOException e) {
+                    Iris.logger.error("Error reloading shader pack while applying changes!");
+                    Iris.logger.catching(e);
+                }
+            }));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
+                MinecraftClient client = MinecraftClient.getInstance();
+                ShaderPackScreen shaderPackPage = new ShaderPackScreen(client.currentScreen);
+                client.setScreen(shaderPackPage);
+            }));
+        }
+    }
+}

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;
@@ -43,10 +47,14 @@ public class PuzzleClient implements ClientModInitializer {
                 PuzzleSplashScreen.resetColors();
                 MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture());
             }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Disable splash screen logo blending "), (button) -> button.setMessage(PuzzleConfig.disableSplashScreenBlend ? YES : NO), (button) -> {
+                PuzzleConfig.disableSplashScreenBlend = !PuzzleConfig.disableSplashScreenBlend;
+                PuzzleConfig.write(id);
+            }));
         }
-        if (FabricLoader.getInstance().isModLoaded("puzzle-randomentities")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Random Entity Textures"), (button) -> button.setMessage(PuzzleConfig.randomEntityTextures ? YES : NO), (button) -> {
-                PuzzleConfig.randomEntityTextures = !PuzzleConfig.randomEntityTextures;
+        if (FabricLoader.getInstance().isModLoaded("puzzle-emissives")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive Textures"), (button) -> button.setMessage(PuzzleConfig.emissiveTextures ? YES : NO), (button) -> {
+                PuzzleConfig.emissiveTextures = !PuzzleConfig.emissiveTextures;
                 PuzzleConfig.write(id);
             }));
         }
@@ -75,17 +83,10 @@ public class PuzzleClient implements ClientModInitializer {
                 MinecraftClient.getInstance().worldRenderer.reload();
             }));
         }
-
-        if (FabricLoader.getInstance().isModLoaded("lambdynlights")) {
-            DynamicLightsConfig ldlConfig = LambDynLights.get().config;
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
+        if (FabricLoader.getInstance().isModLoaded("iris")) {
+            IrisCompat.init();
         }
+
         if (FabricLoader.getInstance().isModLoaded("continuity")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
             ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
@@ -100,17 +101,21 @@ public class PuzzleClient implements ClientModInitializer {
                 contConfig.save();
             }));
         }
-
-        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass")) {
-            LBGConfig lbgConfig = LambdaBetterGrass.get().config;
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
-        }
     }
-    public static boolean citInitialized = false;
-    public static void initCITResewn() { // CITResewn is initialized after Puzzle, so we can't access it in our ClientModInitializer
-        if (!citInitialized && FabricLoader.getInstance().isModLoaded("citresewn") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) {
+    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")) {
+            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") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
             CITResewnConfig citConfig = CITResewnConfig.INSTANCE();
             PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
@@ -139,8 +144,31 @@ public class PuzzleClient implements ClientModInitializer {
                 catch (NumberFormatException ignored) {}
                 citConfig.write();
             }));
-            citInitialized = true;
         }
+        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass")) {
+            LBGConfig lbgConfig = LambdaBetterGrass.get().config;
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
+        }
+        if (FabricLoader.getInstance().isModLoaded("cem") && FabricLoader.getInstance().isModLoaded("completeconfig")) {
+            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/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

@@ -16,7 +16,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) {

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")) {
-            this.addDrawableChild(IrisButton.getButton(this.width / 2 - 155, this.height / 6 + 96 - 6, 150, 20, this, client));
-        }
+//        if (FabricLoader.getInstance().isModLoaded("iris")) {
+//            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/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,7 +1,7 @@
 archivesBaseName = "puzzle-models"
 
-minecraft {
-    accessWidener =  file("src/main/resources/puzzle-models.accesswidener")
+loom {
+    accessWidenerPath =  file("src/main/resources/puzzle-models.accesswidener")
 }
 
 dependencies {

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/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java

@@ -2,6 +2,7 @@ package net.puzzlemc.splashscreen;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.texture.NativeImageBackedTexture;
+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 +11,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;
@@ -72,15 +72,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;
@@ -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

@@ -14,3 +14,4 @@ include 'puzzle-models'
 include 'puzzle-blocks'
 //include 'puzzle-randomentities'
 include 'puzzle-gui'
+include 'puzzle-emissives'

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

@@ -9,9 +9,5 @@
 	"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.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info"
 }