fix: get logo blending working again

Why tf does NeoForge change the MinecraftClient instance...

build.gradle

@@ -3,7 +3,7 @@ import groovy.json.JsonOutput
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }

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

@@ -21,10 +21,9 @@ public class PuzzleGui {
 
     public static void init() {
         MidnightLib.hiddenMods.add("puzzle");
-        MinecraftClient client = MinecraftClient.getInstance();
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("\uD83E\uDDE9 Puzzle")));
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
-            client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
+            MinecraftClient.getInstance().setScreen(PuzzleConfig.getScreen(MinecraftClient.getInstance().currentScreen, "puzzle"));
         }));
         PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("\uD83E\uDDE9 Puzzle")));
         PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {

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

@@ -1,10 +1,19 @@
 package net.puzzlemc.splashscreen;
 
+import com.mojang.blaze3d.pipeline.BlendFunction;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
+import com.mojang.blaze3d.platform.DepthTestFunction;
+import com.mojang.blaze3d.platform.DestFactor;
+import com.mojang.blaze3d.platform.SourceFactor;
 import eu.midnightdust.lib.util.MidnightColorUtil;
 import eu.midnightdust.lib.util.PlatformFunctions;
+import net.minecraft.client.gui.screen.SplashOverlay;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderPhase;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.client.texture.TextureContents;
 import net.minecraft.resource.*;
+import net.minecraft.util.TriState;
 import net.minecraft.util.Util;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.minecraft.client.MinecraftClient;
@@ -12,6 +21,7 @@ import net.minecraft.client.resource.metadata.TextureResourceMetadata;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.ResourceTexture;
 import net.minecraft.util.Identifier;
+import net.puzzlemc.splashscreen.mixin.RenderPipelinesAccessor;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,8 +43,9 @@ public class PuzzleSplashScreen {
     public static File CONFIG_PATH = new File(String.valueOf(PlatformFunctions.getConfigDirectory().resolve(".puzzle_cache")));
     public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
     public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png");
-    private static final MinecraftClient client = MinecraftClient.getInstance();
+    private static MinecraftClient client = MinecraftClient.getInstance();
     private static boolean keepBackground = false;
+    private static RenderLayer CUSTOM_LOGO_LAYER;
 
     public static void init() {
         if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
@@ -45,8 +56,41 @@ public class PuzzleSplashScreen {
                 }
             }
         }
+        buildRenderLayer();
     }
 
+    public static RenderLayer getCustomLogoRenderLayer() {
+        return CUSTOM_LOGO_LAYER;
+    }
+
+    public static void buildRenderLayer() {
+        if (PuzzleConfig.resourcepackSplashScreen) {
+            BlendFunction blendFunction = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE);
+            if (PuzzleConfig.disableBlend) blendFunction = null;
+            else if (PuzzleConfig.customBlendFunction.size() == 4) {
+                try {
+                    blendFunction = new BlendFunction(
+                            SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
+                            DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
+                            SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
+                            DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
+                } catch (Exception e) {
+                    LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
+                }
+            }
+
+            var CUSTOM_LOGO_PIPELINE_BUILDER = RenderPipeline.builder(RenderPipelinesAccessor.getPOSITION_TEX_COLOR_SNIPPET())
+                .withLocation("pipeline/mojang_logo_puzzle")
+                .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
+                .withDepthWrite(false);
+            CUSTOM_LOGO_PIPELINE_BUILDER = blendFunction != null ? CUSTOM_LOGO_PIPELINE_BUILDER.withBlend(blendFunction) : CUSTOM_LOGO_PIPELINE_BUILDER.withoutBlend();
+
+            CUSTOM_LOGO_LAYER = RenderLayer.of("mojang_logo_puzzle", 786432, CUSTOM_LOGO_PIPELINE_BUILDER.build(),
+                            RenderLayer.MultiPhaseParameters.builder()
+                            .texture(new RenderPhase.Texture(SplashOverlay.LOGO, TriState.DEFAULT, false))
+                            .build(false));
+        }
+    }
 
     public static class ReloadListener implements SynchronousResourceReloader {
         public static final ReloadListener INSTANCE = new ReloadListener();
@@ -55,6 +99,7 @@ public class PuzzleSplashScreen {
 
         @Override
         public void reload(ResourceManager manager) {
+            client = MinecraftClient.getInstance();
             if (PuzzleConfig.resourcepackSplashScreen) {
                 PuzzleSplashScreen.resetColors();
                 client.getTextureManager().registerTexture(LOGO, new LogoTexture(LOGO));
@@ -107,7 +152,7 @@ public class PuzzleSplashScreen {
                     try (InputStream stream = resource.getInputStream()) {
                         Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
                         InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
-                        client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
+                        client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(() -> "splash_screen_background", NativeImage.read(input)));
                         keepBackground = true;
                         PuzzleConfig.hasCustomSplashScreen = true;
                     } catch (Exception e) {
@@ -121,6 +166,7 @@ public class PuzzleSplashScreen {
                 }
                 keepBackground = false;
                 PuzzleConfig.write(MOD_ID);
+                buildRenderLayer();
             }
         }
     }

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

@@ -1,7 +1,7 @@
 package net.puzzlemc.splashscreen.mixin;
 
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Overlay;
@@ -26,9 +26,9 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.util.function.Function;
 import java.util.function.IntSupplier;
 
-import static net.puzzlemc.core.PuzzleCore.LOGGER;
 import static net.puzzlemc.splashscreen.PuzzleSplashScreen.BACKGROUND;
 
 @Mixin(value = SplashOverlay.class, priority = 2000)
@@ -52,7 +52,7 @@ public abstract class MixinSplashScreen extends Overlay {
             if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
                 try {
                     InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
-                    textureManager.registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
+                    textureManager.registerTexture(BACKGROUND, new NativeImageBackedTexture(() -> "splash_screen_background", NativeImage.read(input)));
                 } catch (IOException ignored) {}
             }
         }
@@ -62,23 +62,14 @@ public abstract class MixinSplashScreen extends Overlay {
     private int puzzle$modifyBackground(IntSupplier instance) { // Set the Progress Bar Frame Color to our configured value //
         return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24;
     }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/ColorHelper;getWhite(F)I", shift = At.Shift.AFTER))
-    private void puzzle$betterBlend(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (PuzzleConfig.resourcepackSplashScreen) {
-            if (PuzzleConfig.disableBlend) RenderSystem.disableBlend();
-            else if (PuzzleConfig.customBlendFunction.size() == 4) {
-                try {
-                    RenderSystem.blendFuncSeparate(
-                            GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
-                            GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
-                            GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
-                            GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
-                } catch (Exception e) {
-                    LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
-                }
-            }
-        }
+
+    @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIFFIIIIIII)V"))
+    private void puzzle$modifyRenderLayer(DrawContext instance, Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x, int y, float u, float v, int width, int height, int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color, Operation<Void> original) {
+        if (PuzzleConfig.resourcepackSplashScreen)
+            instance.drawTexture(id -> PuzzleSplashScreen.getCustomLogoRenderLayer(), sprite, x, y, u, v, width, height, regionWidth, regionHeight, textureWidth, textureHeight, color);
+        else instance.drawTexture(renderLayers, sprite, x, y, u, v, width, height, textureWidth, textureHeight, color);
     }
+
     @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;getScaledWindowWidth()I", ordinal = 2))
     private void puzzle$renderSplashBackground(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE) && PuzzleConfig.resourcepackSplashScreen) {
@@ -91,15 +82,11 @@ public abstract class MixinSplashScreen extends Overlay {
             if (f >= 1.0F) s = 1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F);
             else if (reloading) s = MathHelper.clamp(g, 0.0F, 1.0F);
             else s = 1.0F;
-            RenderSystem.enableBlend();
-            RenderSystem.blendEquation(32774);
-            RenderSystem.defaultBlendFunc();
             context.getMatrices().translate(0, 0, 1f);
             context.drawTexture(RenderLayer::getGuiTextured, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ColorHelper.getWhite(s));
-            RenderSystem.defaultBlendFunc();
-            RenderSystem.disableBlend();
         }
     }
+
     @Inject(method = "renderProgressBar", at = @At("HEAD"))
     private void puzzle$addProgressBarBackground(DrawContext context, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
         context.getMatrices().translate(0, 0, 1f);
@@ -107,7 +94,6 @@ public abstract class MixinSplashScreen extends Overlay {
         long l = Util.getMeasuringTimeMs();
         float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
         int m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F);
-        RenderSystem.disableBlend();
         context.fill(minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
     }
 

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

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

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

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

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

@@ -3,7 +3,8 @@
   "package": "net.puzzlemc.splashscreen.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "MixinSplashScreen"
+    "MixinSplashScreen",
+    "RenderPipelinesAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

gradle.properties

@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 
-minecraft_version=1.21.4
+minecraft_version=1.21.5
 supported_versions=
-yarn_mappings=1.21.4+build.1
+yarn_mappings=1.21.5+build.1
 enabled_platforms=fabric,neoforge
 
 # Mod Properties
-mod_version = 2.0.5
+mod_version = 2.1.0
 maven_group = net.puzzlemc
 archives_base_name = puzzle
 release_type=release
@@ -15,10 +15,10 @@ curseforge_id=563977
 modrinth_id=3IuO68q1
 
 # Modloaders
-fabric_loader_version=0.16.9
-fabric_api_version=0.110.5+1.21.4
+fabric_loader_version=0.16.10
+fabric_api_version=0.119.5+1.21.5
 
-neoforge_version=21.4.9-beta
+neoforge_version=21.5.3-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 # Libraries
@@ -39,8 +39,8 @@ toml4j_version = 0.7.2
 cit_resewn_version = 1.1.3+1.20
 complete_config_version = 2.3.0
 spruceui_version=5.0.0+1.20
-emf_version=2.2.3
-etf_version=6.2.2
+emf_version=2.4.1
+etf_version=6.2.10
 exordium_version=1.2.1-1.20.2
 # Required for LBG
 quilt_loader_version=0.19.0-beta.18

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -1,11 +1,12 @@
 package net.puzzlemc.neoforge;
 
+import net.minecraft.util.Identifier;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.puzzlemc.core.PuzzleCore;
 import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
@@ -23,8 +24,8 @@ public class PuzzleNeoForge {
     @EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
     public static class MidnightLibBusEvents {
         @SubscribeEvent
-        public static void onResourceReload(RegisterClientReloadListenersEvent event) {
-            event.registerReloadListener(PuzzleSplashScreen.ReloadListener.INSTANCE);
+        public static void onResourceReload(AddClientReloadListenersEvent event) {
+            event.addListener(Identifier.of(MOD_ID, "splash_screen"), PuzzleSplashScreen.ReloadListener.INSTANCE);
         }
     }
 }