Remove Moonrise utils to MCUtils, remove duplicated/unused utils

1 files changed, 45 insertions, 0 deletions

diff --git a/patches/server/0701-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0701-fix-powder-snow-cauldrons-not-turning-to-water.patch
new file mode 100644
index 0000000000..f277b93aa1
--- /dev/null
+++ b/patches/server/0701-fix-powder-snow-cauldrons-not-turning-to-water.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 30 Dec 2021 14:02:13 -0800
+Subject: [PATCH] fix powder snow cauldrons not turning to water
+
+Powder snow cauldrons should turn to water when
+extinguishing an entity
+
+diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
+index b222ac8e5b966c515be2aca86083f5640853cd29..fa5366961861370c2366e6f0ff026a6d65128316 100644
+--- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
+@@ -70,7 +70,7 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
+         if (!world.isClientSide && entity.isOnFire() && this.isEntityInsideContent(state, pos, entity)) {
+             // CraftBukkit start
+             if (entity.mayInteract(world, pos)) {
+-                if (!LayeredCauldronBlock.lowerFillLevel(state, world, pos, entity, CauldronLevelChangeEvent.ChangeReason.EXTINGUISH)) {
++                if (!this.handleEntityOnFireInsideWithEvent(state, world, pos, entity)) { // Paper - fix powdered snow cauldron extinguishing entities
+                     return;
+                 }
+             }
+@@ -80,6 +80,7 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
+ 
+     }
+ 
++    @io.papermc.paper.annotation.DoNotUse @Deprecated // Paper - fix powdered snow cauldron extinguishing entities; use #handleEntityOnFireInsideWithEvent
+     private void handleEntityOnFireInside(BlockState state, Level world, BlockPos pos) {
+         if (this.precipitationType == Biome.Precipitation.SNOW) {
+             LayeredCauldronBlock.lowerFillLevel((BlockState) Blocks.WATER_CAULDRON.defaultBlockState().setValue(LayeredCauldronBlock.LEVEL, (Integer) state.getValue(LayeredCauldronBlock.LEVEL)), world, pos);
+@@ -88,6 +89,15 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
+         }
+ 
+     }
++    // Paper start - fix powdered snow cauldron extinguishing entities
++    protected boolean handleEntityOnFireInsideWithEvent(BlockState state, Level world, BlockPos pos, Entity entity) {
++        if (this.precipitationType == Biome.Precipitation.SNOW) {
++            return LayeredCauldronBlock.lowerFillLevel((BlockState) Blocks.WATER_CAULDRON.defaultBlockState().setValue(LayeredCauldronBlock.LEVEL, (Integer) state.getValue(LayeredCauldronBlock.LEVEL)), world, pos, entity, CauldronLevelChangeEvent.ChangeReason.EXTINGUISH);
++        } else {
++            return LayeredCauldronBlock.lowerFillLevel(state, world, pos, entity, CauldronLevelChangeEvent.ChangeReason.EXTINGUISH);
++        }
++    }
++    // Paper end - fix powdered snow cauldron extinguishing entities
+ 
+     public static void lowerFillLevel(BlockState state, Level world, BlockPos pos) {
+         // CraftBukkit start