Fix black panorama

Author: dima-dencep

common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/compat/CubeMapMixin.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 - 2025 dima_dencep.
+ *
+ * Licensed under the Open Software License, Version 3.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *     https://spdx.org/licenses/OSL-3.0.txt
+ */
+
+package org.redlance.dima_dencep.mods.rrls.mixins.compat;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.client.renderer.CubeMap;
+import net.minecraft.client.renderer.texture.AbstractTexture;
+import net.minecraft.client.renderer.texture.ReloadableTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.resources.ResourceLocation;
+import org.redlance.dima_dencep.mods.rrls.utils.OverlayHelper;
+import org.redlance.dima_dencep.mods.rrls.utils.TextureUtils;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(CubeMap.class)
+public class CubeMapMixin {
+    @WrapOperation(
+            method = "registerTextures",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/renderer/texture/TextureManager;register(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/texture/AbstractTexture;)V"
+            )
+    )
+    public void rrls$earlyRegister(TextureManager instance, ResourceLocation path, AbstractTexture texture, Operation<Void> original) {
+        original.call(instance, path, texture);
+
+        if (OverlayHelper.isCurrentRenderingState() && texture instanceof ReloadableTexture reloadableTexture) {
+            TextureUtils.reloadTexture(instance.resourceManager, path, reloadableTexture);
+        }
+    }
+}

common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/workaround/TextureManagerMixin.java

@@ -12,15 +12,13 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import net.minecraft.client.renderer.texture.ReloadableTexture;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManager;
-import org.redlance.dima_dencep.mods.rrls.Rrls;
 import org.redlance.dima_dencep.mods.rrls.utils.OverlayHelper;
+import org.redlance.dima_dencep.mods.rrls.utils.TextureUtils;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -43,12 +41,7 @@ public abstract class TextureManagerMixin {
         original.call(instance, path, texture);
 
         if (OverlayHelper.isCurrentRenderingState() && texture instanceof ReloadableTexture reloadableTexture) {
-            TextureManager.PendingReload reload = TextureManager.scheduleLoad(
-                    this.resourceManager, path, reloadableTexture, Util.backgroundExecutor()
-            );
-            Rrls.LOGGER.info("Reloading texture '{}'!", path);
-            reload.newContents().thenAcceptAsync(textureContents -> reload.texture()
-                    .apply(textureContents), Minecraft.getInstance());
+            TextureUtils.reloadTexture(this.resourceManager, path, reloadableTexture);
         }
     }
 }

common/src/main/java/org/redlance/dima_dencep/mods/rrls/utils/TextureUtils.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2023 - 2025 dima_dencep.
+ *
+ * Licensed under the Open Software License, Version 3.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *     https://spdx.org/licenses/OSL-3.0.txt
+ */
+
+package org.redlance.dima_dencep.mods.rrls.utils;
+
+import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.ReloadableTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.ResourceManager;
+import org.redlance.dima_dencep.mods.rrls.Rrls;
+
+public class TextureUtils {
+    public static void reloadTexture(ResourceManager manager, ResourceLocation rl, ReloadableTexture texture) {
+        TextureManager.PendingReload reload = TextureManager.scheduleLoad(manager, rl, texture, Util.backgroundExecutor());
+        Rrls.LOGGER.info("Reloading texture '{}'!", rl);
+
+        reload.newContents().thenAcceptAsync(textureContents -> reload.texture()
+                .apply(textureContents),Minecraft.getInstance());
+    }
+}

common/src/main/resources/rrls.accesswidener

@@ -40,3 +40,4 @@ accessible class net/minecraft/client/renderer/ShaderManager$CompilationCache
 accessible method net/minecraft/client/renderer/texture/TextureManager scheduleLoad (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/texture/ReloadableTexture;Ljava/util/concurrent/Executor;)Lnet/minecraft/client/renderer/texture/TextureManager$PendingReload;
 accessible class net/minecraft/client/renderer/texture/TextureManager$PendingReload
 accessible method net/minecraft/client/Minecraft buildInitialScreens (Lnet/minecraft/client/Minecraft$GameLoadCookie;)Ljava/lang/Runnable;
+accessible field net/minecraft/client/renderer/texture/TextureManager resourceManager Lnet/minecraft/server/packs/resources/ResourceManager;

common/src/main/resources/rrls.mixins.json

@@ -8,16 +8,17 @@
     "LoadingOverlayMixin",
     "MinecraftClientMixin",
     "TitleScreenMixin",
+    "compat.CubeMapMixin",
     "compat.OverlayMixin",
     "compat.RendererKeyboardMouseMixin",
     "compat.ServerPackManagerMixin",
-    "workaround.textures.AbstractTextureMixin",
     "workaround.CompilationCacheMixin",
     "workaround.EntityRenderDispatcherMixin",
     "workaround.GlCommandEncoderMixin",
     "workaround.GuiGraphicsMixin",
     "workaround.ReloadableResourceManagerMixin",
-    "workaround.TextureManagerMixin"
+    "workaround.TextureManagerMixin",
+    "workaround.textures.AbstractTextureMixin"
   ],
   "injectors": {
     "defaultRequire": 1