No longer overrides render

dima-dencep · Jan 20, 2024 · f48be4b · f48be4b
1 parent 314fae3
commit f48be4b
Show file tree

Hide file tree

Showing 16 changed files with 434 additions and 131 deletions.
diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/ConfigExpectPlatform.java b/common/src/main/java/com/github/dimadencep/mods/rrls/ConfigExpectPlatform.java
@@ -71,4 +71,9 @@ public static float animationSpeed() {
     public static AprilFool aprilFool() {
         throw new AssertionError();
     }
+
+    @ExpectPlatform
+    public static boolean skipForgeOverlay() {
+        throw new AssertionError();
+    }
 }
diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/accessor/SplashAccessor.java b/common/src/main/java/com/github/dimadencep/mods/rrls/accessor/SplashAccessor.java
@@ -28,15 +28,6 @@ public interface SplashAccessor {
     default void rrls$render(DrawContext context, boolean isGame) {
     }
 
-    default void rrls$reload() {
-    }
-
-    default void rrls$endhook() {
-    }
-
-    default void rrls$progress(float progress) {
-    }
-
     default AttachType rrls$filterAttachType(Screen screen, boolean reloading) {
         if (!ConfigExpectPlatform.hideType().canHide(reloading))
             return AttachType.DEFAULT;

diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/SplashOverlayMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/SplashOverlayMixin.java
@@ -11,14 +11,15 @@
 package com.github.dimadencep.mods.rrls.mixins;
 
 import com.github.dimadencep.mods.rrls.ConfigExpectPlatform;
+import com.github.dimadencep.mods.rrls.utils.DummyDrawContext;
+import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Overlay;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.SplashOverlay;
 import net.minecraft.resource.ResourceReload;
-import net.minecraft.util.Util;
 import net.minecraft.util.math.ColorHelper;
-import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -40,23 +41,10 @@ public abstract class SplashOverlayMixin extends Overlay {
     @Unique
     public AttachType rrls$attach = AttachType.DEFAULT;
     @Shadow
-    @Final
-    private ResourceReload reload;
-    @Shadow
-    private float progress;
-    @Shadow
-    private long reloadCompleteTime;
-    @Shadow
-    @Final
-    private Consumer<Optional<Throwable>> exceptionHandler;
+    public float progress;
     @Shadow
     @Final
     private MinecraftClient client;
-    @Shadow
-    @Final
-    private boolean reloading;
-    @Shadow
-    private long reloadStartTime;
 
     @Shadow
     protected abstract void renderProgressBar(DrawContext drawContext, int minX, int minY, int maxX, int maxY, float opacity);
@@ -115,54 +103,26 @@ public abstract class SplashOverlayMixin extends Overlay {
         }
     }
 
-    @Override
-    public void rrls$reload() {
-        long l = Util.getMeasuringTimeMs();
-        if (this.reloading && this.reloadStartTime == -1L) {
-            this.reloadStartTime = l;
-        }
-        float f = this.reloadCompleteTime > -1L ? (float) (l - this.reloadCompleteTime) / 1000.0f : -1.0f;
-
-        float t = this.reload.getProgress();
-        this.progress = MathHelper.clamp(this.progress * 0.95f + t * 0.050000012f, 0.0f, 1.0f);
-        rrls$progress(this.progress);
-
-        if (f >= 2.0f) {
-            this.client.setOverlay(null);
-
-            rrls$endhook();
-        }
-
-        if (this.reloadCompleteTime == -1L && this.reload.isComplete()) {
-            try {
-                this.reload.throwException();
-                this.exceptionHandler.accept(Optional.empty());
-            } catch (Throwable throwable) {
-                this.exceptionHandler.accept(Optional.of(throwable));
-            }
-
-            this.reloadCompleteTime = Util.getMeasuringTimeMs();
-
-            if (ConfigExpectPlatform.reInitScreen() && this.client.currentScreen != null) {
-                this.client.currentScreen.init(this.client, this.client.getWindow().getScaledWidth(), this.client.getWindow().getScaledHeight());
-            }
-        }
-    }
-
     @Inject(
             method = "render",
             at = @At(
                     value = "HEAD"
-            ),
-            cancellable = true
+            )
     )
     public void rrls$render(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (rrls$attach != AttachType.DEFAULT)
+        if (rrls$attach != AttachType.DEFAULT) // Update attach (Optifine ❤️)
             this.rrls$attach = rrls$filterAttachType(client.currentScreen, this.rrls$attach != AttachType.WAIT);
+    }
 
-        if (this.rrls$attach == AttachType.HIDE) {
-            ci.cancel();
-        }
+    @WrapWithCondition(
+            method = "render",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/gui/screen/Screen;render(Lnet/minecraft/client/gui/DrawContext;IIF)V"
+            )
+    )
+    public boolean rrls$screenrender(Screen instance, DrawContext context, int mouseX, int mouseY, float delta) {
+        return !(context instanceof DummyDrawContext);
     }
 
     @Unique

diff --git a/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/GameRendererMixin.java b/common/src/main/java/com/github/dimadencep/mods/rrls/mixins/compat/GameRendererMixin.java
@@ -0,0 +1,37 @@
+package com.github.dimadencep.mods.rrls.mixins.compat;
+
+import com.github.dimadencep.mods.rrls.accessor.SplashAccessor;
+import com.github.dimadencep.mods.rrls.utils.DummyDrawContext;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Overlay;
+import net.minecraft.client.render.GameRenderer;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(GameRenderer.class)
+public class GameRendererMixin {
+
+    @Shadow
+    @Final
+    MinecraftClient client;
+
+    @ModifyExpressionValue(
+            method = "render",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/MinecraftClient;getOverlay()Lnet/minecraft/client/gui/screen/Overlay;",
+                    ordinal = 0
+            )
+    )
+    public Overlay rrls$fixOverlayRendering(Overlay original) { // TODO @Local(name = "i", ordinal = 0, index = 7) int mouseX, @Local(name = "j", ordinal = 1, index = 8) int mouseY
+        if (original == null || original.rrls$getAttachType() != SplashAccessor.AttachType.HIDE)
+            return original;
+
+        original.render(DummyDrawContext.INSTANCE, 0, 0, client.getLastFrameDuration());
+
+        return null;
+    }
+}
diff --git a/...mods/rrls/mixins/compat/SplashUseFix.java → ...rls/mixins/compat/KeyboardMouseMixin.java b/...mods/rrls/mixins/compat/SplashUseFix.java → ...rls/mixins/compat/KeyboardMouseMixin.java
@@ -15,17 +15,15 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.Mouse;
 import net.minecraft.client.gui.screen.Overlay;
-import net.minecraft.client.render.GameRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(value = {
-        GameRenderer.class,
         Keyboard.class,
         Mouse.class
 })
-public class SplashUseFix {
+public class KeyboardMouseMixin {
     @Redirect(
             method = "*",
             at = @At(