fix ChunkCacheOF mixin mappings

Author: FalsePattern

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

@@ -44,7 +44,8 @@ public ChunkCacheOF_NonShaderMixin(World p_i1964_1_, int p_i1964_2_, int p_i1964
     @Dynamic
     @Redirect(method = "getLightBrightnessForSkyBlocks",
               at = @At(value = "INVOKE",
-                       target = "LConfig;isDynamicLights()Z"),
+                       target = "LConfig;isDynamicLights()Z",
+                       remap = false),
               require = 2)
     private boolean ftDynamicLights() {
         return DynamicLightsDrivers.frontend.enabled();
@@ -54,29 +55,61 @@ private boolean ftDynamicLights() {
     @Redirect(method = "getLightBrightnessForSkyBlocks",
               at = @At(value = "INVOKE",
                        target = "LDynamicLights;getCombinedLight(IIII)I"),
-              require = 2)
-    private int ftCombinedLights(int x, int y, int z, int combinedLight) {
+              expect = 0,
+              require = 0)
+    private int ftCombinedLightsDev(int x, int y, int z, int combinedLight) {
+        return DynamicLightsDrivers.frontend.forWorldMesh().getCombinedLight(x, y, z, combinedLight);
+    }
+
+    @Dynamic
+    @Redirect(method = "func_72802_i",
+              at = @At(value = "INVOKE",
+                       target = "LDynamicLights;getCombinedLight(IIII)I"),
+              expect = 0,
+              require = 0)
+    private int ftCombinedLightsObf(int x, int y, int z, int combinedLight) {
         return DynamicLightsDrivers.frontend.forWorldMesh().getCombinedLight(x, y, z, combinedLight);
     }
 
     @Dynamic
     @Redirect(method = "getLightBrightnessForSkyBlocks",
               at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/IBlockAccess;getLightBrightnessForSkyBlocks(IIII)I",
-                       remap = true),
-              require = 2)
-    private int brightnessFromSuper(IBlockAccess instance, int x, int y, int z, int lightValue) {
+                       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) {
         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),
-              remap = true,
-              require = 2)
-    private Block blockFromSuper(IBlockAccess instance, int x, int y, int z) {
+              expect = 0,
+              require = 0)
+    private Block blockFromSuperObf(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

@@ -44,15 +44,18 @@ public ChunkCacheOF_ShaderMixin(World p_i1964_1_, int p_i1964_2_, int p_i1964_3_
     @Redirect(method = "getLightBrightnessForSkyBlocksRaw",
               at = @At(value = "INVOKE",
                        target = "LConfig;isDynamicLights()Z"),
-              require = 1)
+              expect = 0,
+              require = 0)
     private boolean ftDynamicLights() {
         return DynamicLightsDrivers.frontend.enabled();
     }
 
     @Redirect(method = "getLightBrightnessForSkyBlocksRaw",
               at = @At(value = "INVOKE",
                        target = "LDynamicLights;getCombinedLight(IIII)I"),
-              require = 1)
+              remap = false,
+              expect = 0,
+              require = 0)
     private int ftCombinedLights(int x, int y, int z, int combinedLight) {
         return DynamicLightsDrivers.frontend.forWorldMesh().getCombinedLight(x, y, z, combinedLight);
     }
@@ -61,19 +64,29 @@ private int ftCombinedLights(int x, int y, int z, int combinedLight) {
               at = @At(value = "INVOKE",
                        target = "Lnet/minecraft/world/IBlockAccess;getLightBrightnessForSkyBlocks(IIII)I",
                        remap = true),
-              require = 1)
+              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;",
-                       remap = true),
-              remap = true,
-              require = 3)
-    private Block blockFromSuper(IBlockAccess instance, int x, int y, int z) {
+                       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) {
         return super.getBlock(x, y, z);
     }
 }