From 1577d06067b1a5c16992741d09f7de4083aeb80f Mon Sep 17 00:00:00 2001 From: tibs Date: Wed, 15 Mar 2023 09:14:56 -0400 Subject: [PATCH] Update to 1.19.4 --- gradle.properties | 6 +++--- gradle/libs.versions.toml | 12 ++++++------ .../block/WaterCauldronBlockEntity.java | 4 ++-- .../cauldron_dyeing/mixin/CauldronBehaviorMixin.java | 4 ++-- src/main/resources/fabric.mod.json | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1971b31..528f600 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ # Gradle Properties -org.gradle.jvmargs = -Xmx1G -org.gradle.parallel = true +org.gradle.jvmargs=-Xmx2G +org.gradle.parallel=true # Mod Properties -mod_version=1.0.8 +mod_version=1.0.9 maven_group=me.tibinonest.mods archives_base_name=cauldron-dyeing diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5430e70..2103c15 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.23" -fabric_loader = "0.14.14" +minecraft = "1.19.4" +quilt_mappings = "1.19.4+build.3" +fabric_loader = "0.14.17" -fabric_api = "0.73.2+1.19.3" -sodium = "mc1.19.3-0.4.9" +fabric_api = "0.75.3+1.19.4" +sodium = "mc1.19.4-0.4.10" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } @@ -17,4 +17,4 @@ sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" } [plugins] 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.+" } +grgit = { id = "org.ajoberstar.grgit", version = "5.0.+" } diff --git a/src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java b/src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java index 49d7017..3c3c478 100644 --- a/src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java +++ b/src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java @@ -5,7 +5,7 @@ import me.tibinonest.mods.cauldron_dyeing.CauldronDyeing; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.NbtCompound; -import net.minecraft.network.Packet; +import net.minecraft.network.packet.Packet; import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.server.world.ServerWorld; @@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Arrays; public class WaterCauldronBlockEntity extends BlockEntity { - private final int[] NULL_COLOR = new int[] {-1, -1, -1}; + private static final int[] NULL_COLOR = new int[] {-1, -1, -1}; private int[] color = NULL_COLOR; public WaterCauldronBlockEntity(BlockPos pos, BlockState state) { 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 78e570c..acca06f 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 @@ -26,7 +26,7 @@ import java.util.Map; @Mixin(CauldronBehavior.class) public interface CauldronBehaviorMixin { @SuppressWarnings("target") - @Inject(method = "m_ducbhfos(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/util/ActionResult;", at = @At("HEAD"), cancellable = true) + @Inject(method = "method_32209", at = @At("HEAD"), cancellable = true) private static void cauldron_dyeing$injectCleanDyeableItem(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable cir) { var blockEntity = world.getBlockEntity(pos); var item = stack.getItem(); @@ -43,7 +43,7 @@ public interface CauldronBehaviorMixin { } @SuppressWarnings("target") - @Inject(method = "m_xrdlazrh(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/util/ActionResult;", at = @At(value = "TAIL")) + @Inject(method = "method_32217", at = @At(value = "TAIL")) private static void cauldron_dyeing$injectFillWithWater(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable cir) { var blockEntity = world.getBlockEntity(pos); if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3d11930..c8142e3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,11 +24,11 @@ "cauldron-dyeing.mixins.json" ], "depends": { - "minecraft": ">=1.19.3", + "minecraft": ">=1.19.4", "fabricloader": ">=0.12.0", "fabric-object-builder-api-v1": ">=0.1" }, "breaks": { - "sodium": "<0.4.9" + "sodium": "<0.4.10" } }