From 35db886c5aae6d117db0d19cd31bb552597ffaa7 Mon Sep 17 00:00:00 2001 From: tibs <37983572+TibiNonEst@users.noreply.github.com> Date: Sat, 15 Jan 2022 14:55:58 -0500 Subject: [PATCH] Update sodium version to 0.4.0-alpha6 + housekeeping --- gradle.properties | 4 ++-- .../mods/cauldron_dyeing/CauldronDyeing.java | 6 +----- .../mixin/CauldronBehaviorMixin.java | 1 - .../mixin/sodium/SodiumBlockRendererMixin.java | 16 ++++++++-------- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 17a4ca3..465959e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G minecraft_version=1.18.1 yarn_mappings=1.18.1+build.18 loader_version=0.12.12 -fabric_version=0.45.0+1.18 +fabric_version=0.46.0+1.18 # Mod Properties mod_version=1.0.0 @@ -14,4 +14,4 @@ maven_group=me.tibinonest.mods archives_base_name=cauldron-dying # Dependencies -sodium_version=mc1.18-0.4.0-alpha5 +sodium_version=mc1.18.1-0.4.0-alpha6 diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java index 7cbe19c..a157b4c 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/CauldronDyeing.java @@ -15,11 +15,7 @@ import net.minecraft.util.registry.Registry; public class CauldronDyeing implements ModInitializer { public static final String MOD_ID = "cauldron_dyeing"; - public static BlockEntityType WATER_CAULDRON_BLOCK_ENTITY; - - static { - WATER_CAULDRON_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(WaterCauldronBlockEntity::new, Blocks.WATER_CAULDRON).build(); - } + public static BlockEntityType WATER_CAULDRON_BLOCK_ENTITY = FabricBlockEntityTypeBuilder.create(WaterCauldronBlockEntity::new, Blocks.WATER_CAULDRON).build(); @Override public void onInitialize() { diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java index 7ab9ca2..01661dd 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java @@ -20,7 +20,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.tools.obfuscation.SuppressedBy; import java.util.Map; 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 3adda4d..b13e28e 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 @@ -1,9 +1,9 @@ package me.tibinonest.mods.cauldron_dyeing.mixin.sodium; -import me.jellysquid.mods.sodium.client.model.quad.ModelQuadColorProvider; import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView; -import me.jellysquid.mods.sodium.client.model.quad.blender.BiomeColorBlender; -import me.jellysquid.mods.sodium.client.model.quad.blender.FlatBiomeColorBlender; +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.tibinonest.mods.cauldron_dyeing.block.WaterCauldronBlockEntity; import net.minecraft.util.math.BlockPos; @@ -14,15 +14,15 @@ 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/BiomeColorBlender;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/ModelQuadColorProvider;Ljava/lang/Object;)[I")) - private int[] redirectGetColors(BiomeColorBlender instance, BlockRenderView world, BlockPos pos, ModelQuadView quad, ModelQuadColorProvider handler, T fluidState) { + @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")) + private int[] 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 FlatBiomeColorBlender(); - return flatBiomeColorBlender.getColors(world, pos, quad, handler, fluidState); + var flatBiomeColorBlender = new FlatColorBlender(); + return flatBiomeColorBlender.getColors(world, pos, quad, sampler, state); } - return instance.getColors(world, pos, quad, handler, fluidState); + return instance.getColors(world, pos, quad, sampler, state); } }