Fix blockModelNoOffset doesn't work with Sodium 0.4.9+

Signed-off-by: Hendrix-Shen <[email protected]>

Author: Hendrix-Shen

src/main/java/com/plusls/ommc/mixin/feature/blockModelNoOffset/sodium/MixinBlockRenderer.java

@@ -1,6 +1,7 @@
 package com.plusls.ommc.mixin.feature.blockModelNoOffset.sodium;
 
 import com.plusls.ommc.feature.blockModelNoOffset.BlockModelNoOffsetUtil;
+import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
@@ -13,11 +14,9 @@
 import top.hendrixshen.magiclib.dependency.api.annotation.Dependencies;
 import top.hendrixshen.magiclib.dependency.api.annotation.Dependency;
 
-@Dependencies(and = @Dependency(value = "sodium", versionPredicate = "<0.5"))
-@Pseudo
-@Mixin(targets = "me.jellysquid.mods.sodium.client.render.pipeline.BlockRenderer", remap = false)
+@Dependencies(and = @Dependency(value = "sodium", versionPredicate = ">0.4.8"))
+@Mixin(value = BlockRenderer.class, remap = false)
 public class MixinBlockRenderer {
-    @Dynamic
     @Redirect(method = "renderModel",
             at = @At(value = "INVOKE",
                     target = "Lnet/minecraft/world/level/block/state/BlockState;getOffset(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/Vec3;",

src/main/java/com/plusls/ommc/mixin/feature/blockModelNoOffset/sodium/MixinBlockRendererLegacy.java

@@ -0,0 +1,28 @@
+package com.plusls.ommc.mixin.feature.blockModelNoOffset.sodium;
+
+import com.plusls.ommc.feature.blockModelNoOffset.BlockModelNoOffsetUtil;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
+import org.spongepowered.asm.mixin.Dynamic;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import top.hendrixshen.magiclib.dependency.api.annotation.Dependencies;
+import top.hendrixshen.magiclib.dependency.api.annotation.Dependency;
+
+@Dependencies(and = @Dependency(value = "sodium", versionPredicate = "<0.4.9>"))
+@Pseudo
+@Mixin(targets = "me.jellysquid.mods.sodium.client.render.pipeline.BlockRenderer", remap = false)
+public class MixinBlockRendererLegacy {
+    @Dynamic
+    @Redirect(method = "renderModel",
+            at = @At(value = "INVOKE",
+                    target = "Lnet/minecraft/world/level/block/state/BlockState;getOffset(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/Vec3;",
+                    ordinal = 0, remap = true))
+    private Vec3 blockModelNoOffset(BlockState blockState, BlockGetter world, BlockPos pos) {
+        return BlockModelNoOffsetUtil.blockModelNoOffset(blockState, world, pos);
+    }
+}

src/main/resources/ommc.mixins.json

@@ -51,5 +51,8 @@
   ],
   "injectors": {
     "defaultRequire": 1
-  }
+  },
+  "mixins": [
+    "feature.blockModelNoOffset.sodium.MixinBlockRendererLegacy"
+  ]
 }

versions/1.19.2/src/main/java/com/plusls/ommc/mixin/feature/blockModelNoOffset/sodium/MixinBlockRenderer.java

@@ -0,0 +1,8 @@
+package com.plusls.ommc.mixin.feature.blockModelNoOffset.sodium;
+
+import org.spongepowered.asm.mixin.Mixin;
+import top.hendrixshen.magiclib.compat.preprocess.api.DummyClass;
+
+@Mixin(DummyClass.class)
+public class MixinBlockRenderer {
+}