From 902308faca05f0a8e7e8750cf5698cef549e7f23 Mon Sep 17 00:00:00 2001 From: MineGame159 Date: Sun, 25 Aug 2024 10:27:30 +0200 Subject: [PATCH] Fix Sodium compat outside of development environment --- build.gradle | 1 - gradle.properties | 3 --- .../meteorclient/mixin/sodium/SodiumBlockRendererMixin.java | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index d20cd70c33..1cc4d44e4c 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,6 @@ dependencies { modCompileOnly("maven.modrinth:lithium:${project.lithium_version}") { transitive = false } modCompileOnly("maven.modrinth:iris:${project.iris_version}") { transitive = false } //modCompileOnly("io.vram:canvas-fabric-mc119:1.0.+") { transitive = false } // TODO: 1.19.3 - modCompileOnly("maven.modrinth:indium:${project.indium_version}") { transitive = false } modCompileOnly("de.florianmichael:ViaFabricPlus:${project.viafabricplus_version}") { transitive = false } // Baritone (https://github.com/MeteorDevelopment/baritone) diff --git a/gradle.properties b/gradle.properties index 7c3f6857a2..d2ed0005b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,9 +25,6 @@ lithium_version=mc1.21.1-0.13.0 # Iris (https://github.com/IrisShaders/Iris) iris_version=1.7.3+1.21 -# Indium (https://github.com/comp500/Indium) -indium_version=1.0.35+mc1.21 - # Orbit (https://github.com/MeteorDevelopment/orbit) orbit_version=0.2.4 diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumBlockRendererMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumBlockRendererMixin.java index 9416e69d19..1baebece0d 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumBlockRendererMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumBlockRendererMixin.java @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(value = BlockRenderer.class, remap = false) +@Mixin(value = BlockRenderer.class) public abstract class SodiumBlockRendererMixin { @Inject(method = "renderModel", at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/model/color/ColorProviderRegistry;getColorProvider(Lnet/minecraft/block/Block;)Lnet/caffeinemc/mods/sodium/client/model/color/ColorProvider;", shift = At.Shift.AFTER), cancellable = true) private void onRenderModel(BakedModel model, BlockState state, BlockPos pos, BlockPos origin, CallbackInfo info) {