fix: broken optifine chunkcache remappings

Author: FalsePattern

src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/cc/of/ChunkCacheOF_NonShaderMixin.java

@@ -33,8 +33,7 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-@Mixin(targets = "ChunkCacheOF",
-       remap = false)
+@Mixin(targets = "ChunkCacheOF")
 public abstract class ChunkCacheOF_NonShaderMixin extends ChunkCache {
     public ChunkCacheOF_NonShaderMixin(World p_i1964_1_,
                                        int p_i1964_2_,
@@ -52,28 +51,20 @@ public ChunkCacheOF_NonShaderMixin(World p_i1964_1_,
               at = @At(value = "INVOKE",
                        target = "LConfig;isDynamicLights()Z",
                        remap = false),
-              require = 2)
+              expect = 0,
+              require = 0)
     private boolean ftDynamicLights() {
         return DynamicLightsDrivers.frontend.enabled();
     }
 
     @Dynamic
     @Redirect(method = "getLightBrightnessForSkyBlocks",
               at = @At(value = "INVOKE",
-                       target = "LDynamicLights;getCombinedLight(IIII)I"),
-              expect = 0,
-              require = 0)
-    private int ftCombinedLightsDev(int x, int y, int z, int combinedLight) {
-        return DynamicLightsDrivers.frontend.getCombinedLight(x, y, z, combinedLight);
-    }
-
-    @Dynamic
-    @Redirect(method = "func_72802_i",
-              at = @At(value = "INVOKE",
-                       target = "LDynamicLights;getCombinedLight(IIII)I"),
+                       target = "LDynamicLights;getCombinedLight(IIII)I",
+                       remap = false),
               expect = 0,
               require = 0)
-    private int ftCombinedLightsObf(int x, int y, int z, int combinedLight) {
+    private int ftCombinedLights(int x, int y, int z, int combinedLight) {
         return DynamicLightsDrivers.frontend.getCombinedLight(x, y, z, combinedLight);
     }
 
@@ -83,39 +74,16 @@ private int ftCombinedLightsObf(int x, int y, int z, int combinedLight) {
                        target = "Lnet/minecraft/world/IBlockAccess;getLightBrightnessForSkyBlocks(IIII)I"),
               expect = 0,
               require = 0)
-    private int brightnessFromSuperDev(IBlockAccess instance, int x, int y, int z, int lightValue) {
-        return super.getLightBrightnessForSkyBlocks(x, y, z, lightValue);
-    }
-
-    @Dynamic
-    @Redirect(method = "func_72802_i",
-              at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/IBlockAccess;getLightBrightnessForSkyBlocks(IIII)I"),
-              expect = 0,
-              require = 0)
-    private int brightnessFromSuperObf(IBlockAccess instance, int x, int y, int z, int lightValue) {
+    private int brightnessFromSuper(IBlockAccess instance, int x, int y, int z, int lightValue) {
         return super.getLightBrightnessForSkyBlocks(x, y, z, lightValue);
     }
 
-    @Dynamic
     @Redirect(method = "getBlock",
               at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/IBlockAccess;getBlock(III)Lnet/minecraft/block/Block;",
-                       remap = true),
-              expect = 0,
-              require = 0)
-    private Block blockFromSuperDev(IBlockAccess instance, int x, int y, int z) {
-        return super.getBlock(x, y, z);
-    }
-
-    @Dynamic
-    @Redirect(method = "func_147439_a",
-              at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/IBlockAccess;getBlock(III)Lnet/minecraft/block/Block;",
-                       remap = true),
+                       target = "Lnet/minecraft/world/IBlockAccess;getBlock(III)Lnet/minecraft/block/Block;"),
               expect = 0,
               require = 0)
-    private Block blockFromSuperObf(IBlockAccess instance, int x, int y, int z) {
+    private Block blockFromSuper(IBlockAccess instance, int x, int y, int z) {
         return super.getBlock(x, y, z);
     }
 }

src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/cc/of/ChunkCacheOF_ShaderMixin.java

@@ -23,7 +23,6 @@
 package com.falsepattern.falsetweaks.mixin.mixins.client.cc.of;
 
 import com.falsepattern.falsetweaks.modules.dynlights.DynamicLightsDrivers;
-import org.spongepowered.asm.mixin.Dynamic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -33,8 +32,7 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-@Mixin(targets = "ChunkCacheOF",
-       remap = false)
+@Mixin(targets = "ChunkCacheOF")
 public abstract class ChunkCacheOF_ShaderMixin extends ChunkCache {
     public ChunkCacheOF_ShaderMixin(World p_i1964_1_,
                                     int p_i1964_2_,
@@ -50,6 +48,7 @@ public ChunkCacheOF_ShaderMixin(World p_i1964_1_,
     @Redirect(method = "getLightBrightnessForSkyBlocksRaw",
               at = @At(value = "INVOKE",
                        target = "LConfig;isDynamicLights()Z"),
+              remap = false,
               expect = 0,
               require = 0)
     private boolean ftDynamicLights() {
@@ -68,31 +67,19 @@ private int ftCombinedLights(int x, int y, int z, int combinedLight) {
 
     @Redirect(method = "getLightBrightnessForSkyBlocksRaw",
               at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/IBlockAccess;getLightBrightnessForSkyBlocks(IIII)I",
-                       remap = true),
+                       target = "Lnet/minecraft/world/IBlockAccess;getLightBrightnessForSkyBlocks(IIII)I"),
               expect = 0,
               require = 0)
     private int brightnessFromSuper(IBlockAccess instance, int x, int y, int z, int lightValue) {
         return super.getLightBrightnessForSkyBlocks(x, y, z, lightValue);
     }
 
-    @Dynamic
     @Redirect(method = "getBlock",
               at = @At(value = "INVOKE",
                        target = "Lnet/minecraft/world/IBlockAccess;getBlock(III)Lnet/minecraft/block/Block;"),
               expect = 0,
               require = 0)
-    private Block blockFromSuperDev(IBlockAccess instance, int x, int y, int z) {
-        return super.getBlock(x, y, z);
-    }
-
-    @Dynamic
-    @Redirect(method = "func_147439_a",
-              at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/IBlockAccess;getBlock(III)Lnet/minecraft/block/Block;"),
-              expect = 0,
-              require = 0)
-    private Block blockFromSuperObf(IBlockAccess instance, int x, int y, int z) {
+    private Block blockFromSuper(IBlockAccess instance, int x, int y, int z) {
         return super.getBlock(x, y, z);
     }
 }