tibs/cauldron-dyeing
1
0
Fork 0
mirror of https://github.com/TibiNonEst/cauldron-dyeing.git synced 2024-11-24 03:27:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

Update to 1.19.4

Browse source
This commit is contained in:
tibs 2023-03-15 09:14:56 -04:00
parent a847ba5615
commit 1577d06067
Signed by untrusted user who does not match committer: tibs
GPG key ID: 047833989F50F88F
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gradle.properties
View file

@ -1,9 +1,9 @@
# Gradle Properties # Gradle Properties
org.gradle.jvmargs = -Xmx1G org.gradle.jvmargs=-Xmx2G
org.gradle.parallel = true org.gradle.parallel=true
# Mod Properties # Mod Properties
mod_version=1.0.8 mod_version=1.0.9
maven_group=me.tibinonest.mods maven_group=me.tibinonest.mods
archives_base_name=cauldron-dyeing archives_base_name=cauldron-dyeing

12
gradle/libs.versions.toml
View file

@ -1,10 +1,10 @@
[versions] [versions]
minecraft = "1.19.3" minecraft = "1.19.4"
quilt_mappings = "1.19.3+build.23" quilt_mappings = "1.19.4+build.3"
fabric_loader = "0.14.14" fabric_loader = "0.14.17"
fabric_api = "0.73.2+1.19.3" fabric_api = "0.75.3+1.19.4"
sodium = "mc1.19.3-0.4.9" sodium = "mc1.19.4-0.4.10"
[libraries] [libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@ -17,4 +17,4 @@ sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
[plugins] [plugins]
fabric_loom = { id = "fabric-loom", version = "1.1.+" } fabric_loom = { id = "fabric-loom", version = "1.1.+" }
loom_quiltflower = { id = "io.github.juuxel.loom-quiltflower", version = "1.8.+" } 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.+" }

4
src/main/java/me/tibinonest/mods/cauldron_dyeing/block/WaterCauldronBlockEntity.java
View file

@ -5,7 +5,7 @@ import me.tibinonest.mods.cauldron_dyeing.CauldronDyeing;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.nbt.NbtCompound; 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.listener.ClientPlayPacketListener;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.Arrays; import java.util.Arrays;
public class WaterCauldronBlockEntity extends BlockEntity { 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; private int[] color = NULL_COLOR;
public WaterCauldronBlockEntity(BlockPos pos, BlockState state) { public WaterCauldronBlockEntity(BlockPos pos, BlockState state) {

4
src/main/java/me/tibinonest/mods/cauldron_dyeing/mixin/CauldronBehaviorMixin.java
View file

@ -26,7 +26,7 @@ import java.util.Map;
@Mixin(CauldronBehavior.class) @Mixin(CauldronBehavior.class)
public interface CauldronBehaviorMixin { public interface CauldronBehaviorMixin {
@SuppressWarnings("target") @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<ActionResult> cir) { private static void cauldron_dyeing$injectCleanDyeableItem(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable<ActionResult> cir) {
var blockEntity = world.getBlockEntity(pos); var blockEntity = world.getBlockEntity(pos);
var item = stack.getItem(); var item = stack.getItem();
@ -43,7 +43,7 @@ public interface CauldronBehaviorMixin {
} }
@SuppressWarnings("target") @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<ActionResult> cir) { private static void cauldron_dyeing$injectFillWithWater(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack stack, CallbackInfoReturnable<ActionResult> cir) {
var blockEntity = world.getBlockEntity(pos); var blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) { if (blockEntity instanceof WaterCauldronBlockEntity waterCauldron) {

4
src/main/resources/fabric.mod.json
View file

@ -24,11 +24,11 @@
"cauldron-dyeing.mixins.json" "cauldron-dyeing.mixins.json"
], ],
"depends": { "depends": {
"minecraft": ">=1.19.3", "minecraft": ">=1.19.4",
"fabricloader": ">=0.12.0", "fabricloader": ">=0.12.0",
"fabric-object-builder-api-v1": ">=0.1" "fabric-object-builder-api-v1": ">=0.1"
}, },
"breaks": { "breaks": {
"sodium": "<0.4.9" "sodium": "<0.4.10"
} }
} }