1 files changed, 84 insertions, 0 deletions
diff --git a/patch-remap/mache-vineflower/net/minecraft/world/item/DyeItem.java.patch b/patch-remap/mache-vineflower/net/minecraft/world/item/DyeItem.java.patch
new file mode 100644
index 0000000000..7d57bbc525
--- /dev/null
+++ b/patch-remap/mache-vineflower/net/minecraft/world/item/DyeItem.java.patch
@@ -0,0 +1,84 @@
+--- a/net/minecraft/world/item/DyeItem.java
++++ b/net/minecraft/world/item/DyeItem.java
+@@ -4,35 +4,51 @@
+ import java.util.Map;
+ import net.minecraft.sounds.SoundEvents;
+ import net.minecraft.sounds.SoundSource;
+-import net.minecraft.world.InteractionHand;
++import net.minecraft.world.EnumHand;
+ import net.minecraft.world.InteractionResult;
++import net.minecraft.world.entity.Entity;
+ import net.minecraft.world.entity.LivingEntity;
+ import net.minecraft.world.entity.animal.Sheep;
+ import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.level.Level;
+ import net.minecraft.world.level.block.entity.SignBlockEntity;
+-import net.minecraft.world.level.block.entity.SignText;
++import org.bukkit.event.entity.SheepDyeWoolEvent; // CraftBukkit
+ 
+ public class DyeItem extends Item implements SignApplicator {
++
+     private static final Map<DyeColor, DyeItem> ITEM_BY_COLOR = Maps.newEnumMap(DyeColor.class);
+     private final DyeColor dyeColor;
+ 
+     public DyeItem(DyeColor dyeColor, Item.Properties properties) {
+         super(properties);
+         this.dyeColor = dyeColor;
+-        ITEM_BY_COLOR.put(dyeColor, this);
++        DyeItem.ITEM_BY_COLOR.put(dyeColor, this);
+     }
+ 
+     @Override
+-    public InteractionResult interactLivingEntity(ItemStack stack, Player player, LivingEntity target, InteractionHand hand) {
+-        if (target instanceof Sheep sheep && sheep.isAlive() && !sheep.isSheared() && sheep.getColor() != this.dyeColor) {
+-            sheep.level().playSound(player, sheep, SoundEvents.DYE_USE, SoundSource.PLAYERS, 1.0F, 1.0F);
+-            if (!player.level().isClientSide) {
+-                sheep.setColor(this.dyeColor);
+-                stack.shrink(1);
+-            }
++    public InteractionResult interactLivingEntity(ItemStack stack, Player player, LivingEntity target, EnumHand hand) {
++        if (target instanceof Sheep) {
++            Sheep entitysheep = (Sheep) target;
+ 
+-            return InteractionResult.sidedSuccess(player.level().isClientSide);
++            if (entitysheep.isAlive() && !entitysheep.isSheared() && entitysheep.getColor() != this.dyeColor) {
++                entitysheep.level().playSound(player, (Entity) entitysheep, SoundEvents.DYE_USE, SoundSource.PLAYERS, 1.0F, 1.0F);
++                if (!player.level().isClientSide) {
++                    // CraftBukkit start
++                    byte bColor = (byte) this.dyeColor.getId();
++                    SheepDyeWoolEvent event = new SheepDyeWoolEvent((org.bukkit.entity.Sheep) entitysheep.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData(bColor), (org.bukkit.entity.Player) player.getBukkitEntity());
++                    entitysheep.level().getCraftServer().getPluginManager().callEvent(event);
++
++                    if (event.isCancelled()) {
++                        return InteractionResult.PASS;
++                    }
++
++                    entitysheep.setColor(DyeColor.byId((byte) event.getColor().getWoolData()));
++                    // CraftBukkit end
++                    stack.shrink(1);
++                }
++
++                return InteractionResult.sidedSuccess(player.level().isClientSide);
++            }
+         }
+ 
+         return InteractionResult.PASS;
+@@ -43,13 +59,15 @@
+     }
+ 
+     public static DyeItem byColor(DyeColor color) {
+-        return ITEM_BY_COLOR.get(color);
++        return (DyeItem) DyeItem.ITEM_BY_COLOR.get(color);
+     }
+ 
+     @Override
+     public boolean tryApplyToSign(Level level, SignBlockEntity sign, boolean isFront, Player player) {
+-        if (sign.updateText(signText -> signText.setColor(this.getDyeColor()), isFront)) {
+-            level.playSound(null, sign.getBlockPos(), SoundEvents.DYE_USE, SoundSource.BLOCKS, 1.0F, 1.0F);
++        if (sign.updateText((signtext) -> {
++            return signtext.setColor(this.getDyeColor());
++        }, isFront)) {
++            level.playSound((Player) null, sign.getBlockPos(), SoundEvents.DYE_USE, SoundSource.BLOCKS, 1.0F, 1.0F);
+             return true;
+         } else {
+             return false;