feat:some block patches

Author: wdog5

nms-patches/net/minecraft/world/level/block/BlockWaterLily.patch

@@ -0,0 +1,49 @@
+package org.teneted.neotenet.mixin.world.level.block;
+
+import com.llamalad7.mixinextras.sugar.Cancellable;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.CaveVines;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.player.PlayerHarvestBlockEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import javax.annotation.Nullable;
+import java.util.Collections;
+
+@Mixin(CaveVines.class)
+public interface MixinCaveVines {
+
+    @Redirect(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;popResource(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V"))
+    private static void neotenet$callPlayerHarvestBlockEvent(Level level, BlockPos blockPos, ItemStack itemStack, @Local(argsOnly = true) @Nullable Entity entity, @Local(argsOnly = true) BlockState iblockdata, @Cancellable CallbackInfoReturnable<InteractionResult> cir) {
+        // CraftBukkit start
+        if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockPos, (BlockState) iblockdata.setValue(CaveVines.BERRIES, false))) {
+            cir.setReturnValue(InteractionResult.SUCCESS);
+        }
+
+        if (entity instanceof Player) {
+            PlayerHarvestBlockEvent event = CraftEventFactory.callPlayerHarvestBlockEvent(level, blockPos, (Player) entity, net.minecraft.world.InteractionHand.MAIN_HAND, Collections.singletonList(new ItemStack(Items.GLOW_BERRIES, 1)));
+            if (event.isCancelled()) {
+                cir.setReturnValue(InteractionResult.SUCCESS); // We need to return a success either way, because making it PASS or FAIL will result in a bug where cancelling while harvesting w/ block in hand places block
+            }
+            for (org.bukkit.inventory.ItemStack bukkitStack : event.getItemsHarvested()) {
+                Block.popResource(level, blockPos, CraftItemStack.asNMSCopy(bukkitStack));
+            }
+        } else {
+            Block.popResource(level, blockPos, new ItemStack(Items.GLOW_BERRIES, 1));
+        }
+        // CraftBukkit end
+    }
+}

nms-patches/net/minecraft/world/level/block/BlockWitherRose.patch

@@ -0,0 +1,20 @@
+package org.teneted.neotenet.mixin.world.level.block;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.ChangeOverTimeBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ChangeOverTimeBlock.class)
+public interface MixinChangeOverTimeBlock {
+
+    @Redirect(method = "lambda$changeOverTime$0",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;setBlockAndUpdate(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z"))
+    private static boolean neotenet$handleBlockFormEvent(ServerLevel instance, BlockPos blockPos, BlockState blockState) {
+        return CraftEventFactory.handleBlockFormEvent(instance, blockPos, blockState);
+    }
+}

nms-patches/net/minecraft/world/level/block/BlockWitherSkull.patch

@@ -0,0 +1,45 @@
+package org.teneted.neotenet.mixin.world.level.block;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.boss.wither.WitherBoss;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.CarvedPumpkinBlock;
+import net.minecraft.world.level.block.WitherSkullBlock;
+import net.minecraft.world.level.block.entity.SkullBlockEntity;
+import net.minecraft.world.level.block.state.pattern.BlockPattern;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(WitherSkullBlock.class)
+public class MixinWitherSkullBlock {
+
+    @Inject(method = "checkSpawn(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/SkullBlockEntity;)V", at = @At("HEAD"), cancellable = true)
+    private static void neotenet$capture(Level p_58256_, BlockPos p_58257_, SkullBlockEntity p_58258_, CallbackInfo ci) {
+        if (p_58256_.captureBlockStates) ci.cancel(); return; // CraftBukkit
+    }
+
+    @Inject(method = "checkSpawn(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/SkullBlockEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getEntitiesOfClass(Ljava/lang/Class;Lnet/minecraft/world/phys/AABB;)Ljava/util/List;"), cancellable = true)
+    private static void neotenet$pushReason(Level p_58256_, BlockPos p_58257_, SkullBlockEntity p_58258_, CallbackInfo ci, @Local BlockPattern.BlockPatternMatch blockpattern$blockpatternmatch, @Local WitherBoss witherboss) {
+        // CraftBukkit start
+        if (!p_58256_.addFreshEntity(witherboss, CreatureSpawnEvent.SpawnReason.BUILD_WITHER)) {
+            ci.cancel();
+            return;
+        }
+        CarvedPumpkinBlock.clearPatternBlocks(p_58256_, blockpattern$blockpatternmatch); // CraftBukkit - from above
+        // CraftBukkit end
+    }
+
+    @Redirect(method = "checkSpawn(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/SkullBlockEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/CarvedPumpkinBlock;clearPatternBlocks(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;)V"))
+    private static void neotenet$moveDown(Level level, BlockPattern.BlockPatternMatch blockPatternMatch) {}
+
+    @Redirect(method = "checkSpawn(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/SkullBlockEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addFreshEntity(Lnet/minecraft/world/entity/Entity;)Z"))
+    private static boolean neotenet$moveUp(Level instance, Entity entity) {
+        return false;
+    }
+}