diff --git a/gradle.properties b/gradle.properties index 6e7677cc..1e5bdc9f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=24w14a + minecraft_version=1.20.5-pre1 loader_version=0.15.9 jsr305_version=3.0.2 fabric_version=0.96.14+1.20.5 diff --git a/src/main/java/carpet/mixins/DispenserBlock_cactusMixin.java b/src/main/java/carpet/mixins/DispenserBlock_cactusMixin.java index f5f8be8e..12bd926b 100644 --- a/src/main/java/carpet/mixins/DispenserBlock_cactusMixin.java +++ b/src/main/java/carpet/mixins/DispenserBlock_cactusMixin.java @@ -5,6 +5,7 @@ import net.minecraft.core.dispenser.DispenseItemBehavior; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.DispenserBlock; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -15,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public abstract class DispenserBlock_cactusMixin { @Inject(method = "getDispenseMethod", at = @At("HEAD"), cancellable = true) - private void registerCarpetBehaviors(ItemStack stack, CallbackInfoReturnable cir) + private void registerCarpetBehaviors(Level level, ItemStack stack, CallbackInfoReturnable cir) { Item item = stack.getItem(); if (item == Items.CACTUS) diff --git a/src/main/java/carpet/script/value/ValueConversions.java b/src/main/java/carpet/script/value/ValueConversions.java index 59f61e8f..80b1c26a 100644 --- a/src/main/java/carpet/script/value/ValueConversions.java +++ b/src/main/java/carpet/script/value/ValueConversions.java @@ -14,8 +14,10 @@ import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; import net.minecraft.core.Vec3i; import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.core.particles.ParticleTypes; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtOps; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; @@ -122,7 +124,7 @@ public class ValueConversions public static Value of(ParticleOptions particle, RegistryAccess regs) { - String repr = particle.writeToString(regs); + String repr = ParticleTypes.CODEC.encodeStart(regs.createSerializationContext(NbtOps.INSTANCE), particle).toString(); return StringValue.of(repr.startsWith("minecraft:") ? repr.substring(10) : repr); }