fix: Crash with optifine (again)

Author: FalsePattern

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

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

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

@@ -23,6 +23,7 @@
 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;
@@ -32,7 +33,8 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-@Mixin(targets = "ChunkCacheOF")
+@Mixin(targets = "ChunkCacheOF",
+       remap = false)
 public abstract class ChunkCacheOF_ShaderMixin extends ChunkCache {
     public ChunkCacheOF_ShaderMixin(World p_i1964_1_,
                                     int p_i1964_2_,
@@ -48,7 +50,6 @@ 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() {
@@ -58,7 +59,6 @@ private boolean ftDynamicLights() {
     @Redirect(method = "getLightBrightnessForSkyBlocksRaw",
               at = @At(value = "INVOKE",
                        target = "LDynamicLights;getCombinedLight(IIII)I"),
-              remap = false,
               expect = 0,
               require = 0)
     private int ftCombinedLights(int x, int y, int z, int combinedLight) {
@@ -67,16 +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"),
+                       target = "Lnet/minecraft/world/IBlockAccess;getLightBrightnessForSkyBlocks(IIII)I",
+                       remap = true),
               expect = 0,
               require = 0)
     private int brightnessFromSuper(IBlockAccess instance, int x, int y, int z, int lightValue) {
         return super.getLightBrightnessForSkyBlocks(x, y, z, lightValue);
     }
 
-    @Redirect(method = "getBlock",
+    @Dynamic
+    @Redirect(method = {"getBlock", "func_147439_a"},
               at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/IBlockAccess;getBlock(III)Lnet/minecraft/block/Block;"),
+                       target = "Lnet/minecraft/world/IBlockAccess;getBlock(III)Lnet/minecraft/block/Block;",
+                       remap = true),
               expect = 0,
               require = 0)
     private Block blockFromSuper(IBlockAccess instance, int x, int y, int z) {