From db14a2e87a95e6fbebf6fae4c55cea7ad38a95bf Mon Sep 17 00:00:00 2001 From: tibs Date: Sun, 5 Feb 2023 16:18:15 -0500 Subject: [PATCH] Support Sodium 0.4.9, update deps --- gradle/libs.versions.toml | 10 +++++----- .../mixin/sodium/SodiumBlockRendererMixin.java | 7 +++---- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 923b8cd..5430e70 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] minecraft = "1.19.3" -quilt_mappings = "1.19.3+build.1" -fabric_loader = "0.14.11" +quilt_mappings = "1.19.3+build.23" +fabric_loader = "0.14.14" -fabric_api = "0.68.1+1.19.3" -sodium = "mc1.19.3-0.4.5" +fabric_api = "0.73.2+1.19.3" +sodium = "mc1.19.3-0.4.9" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } @@ -15,6 +15,6 @@ fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fab sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" } [plugins] -fabric_loom = { id = "fabric-loom", version = "1.0.+" } +fabric_loom = { id = "fabric-loom", version = "1.1.+" } loom_quiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.8.+" } grgit = { id = "org.ajoberstar.grgit", version = "5.+" } diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/SodiumBlockRendererMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/SodiumBlockRendererMixin.java index 5cbf95b..9d45b0f 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/SodiumBlockRendererMixin.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/sodium/SodiumBlockRendererMixin.java @@ -4,7 +4,7 @@ import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView; import me.jellysquid.mods.sodium.client.model.quad.blender.ColorBlender; import me.jellysquid.mods.sodium.client.model.quad.blender.ColorSampler; import me.jellysquid.mods.sodium.client.model.quad.blender.FlatColorBlender; -import me.jellysquid.mods.sodium.client.render.pipeline.BlockRenderer; +import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer; import me.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockRenderView; @@ -14,13 +14,12 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(BlockRenderer.class) public class SodiumBlockRendererMixin { - @Redirect(method = "renderQuad", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/model/quad/blender/ColorBlender;getColors(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/util/math/BlockPos;Lme/jellysquid/mods/sodium/client/model/quad/ModelQuadView;Lme/jellysquid/mods/sodium/client/model/quad/blender/ColorSampler;Ljava/lang/Object;)[I")) + @Redirect(method = "renderQuadList", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/model/quad/blender/ColorBlender;getColors(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/util/math/BlockPos;Lme/jellysquid/mods/sodium/client/model/quad/ModelQuadView;Lme/jellysquid/mods/sodium/client/model/quad/blender/ColorSampler;Ljava/lang/Object;)[I")) private int[] cauldron_dyeing$redirectGetColors(ColorBlender instance, BlockRenderView world, BlockPos pos, ModelQuadView quad, ColorSampler sampler, T state) { var blockEntity = world.getBlockEntity(pos); if (blockEntity instanceof WaterCauldronBlockEntity) { - var flatBiomeColorBlender = new FlatColorBlender(); - return flatBiomeColorBlender.getColors(world, pos, quad, sampler, state); + return new FlatColorBlender().getColors(world, pos, quad, sampler, state); } return instance.getColors(world, pos, quad, sampler, state); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9764151..3d11930 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,6 +29,6 @@ "fabric-object-builder-api-v1": ">=0.1" }, "breaks": { - "sodium": "<0.4.1" + "sodium": "<0.4.9" } }