icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.20.5-pre1

Browse Source
This commit is contained in:
gnembon committed 2024-04-10 22:17:14 +02:00
1 parent 31c99898ed
commit a5d232db0d
3 files changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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