Prevent mixin conflict

xCollateral · Sep 26, 2024 · 327d211 · 327d211
1 parent a036e46
commit 327d211
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/net/vulkanmod/mixin/render/target/RenderTargetMixin.java b/src/main/java/net/vulkanmod/mixin/render/target/RenderTargetMixin.java
@@ -18,6 +18,9 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 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(RenderTarget.class)
 public abstract class RenderTargetMixin implements ExtendedRenderTarget {
@@ -121,11 +124,8 @@ public void unbindWrite() {
         }
     }
 
-    /**
-     * @author
-     */
-    @Overwrite
-    private void _blitToScreen(int width, int height, boolean disableBlend) {
+    @Inject(method = "_blitToScreen", at = @At("HEAD"), cancellable = true)
+    private void _blitToScreen(int width, int height, boolean disableBlend, CallbackInfo ci) {
         if (needClear) {
             // If true it means target has not been used, thus we can skip blit
             return;
@@ -135,6 +135,8 @@ private void _blitToScreen(int width, int height, boolean disableBlend) {
         VTextureSelector.bindTexture(0, framebuffer.getColorAttachment());
 
         DrawUtil.blitToScreen();
+
+        ci.cancel();
     }
 
     @Override