Apply more API-implementing patches

patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch

@@ -64,19 +64,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    itemstack1 = itemstack1.copy();
 +                }
 +                // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
-                 if (!itemstack1.isEmpty() && ItemStack.isSameItemSameTags(stack, itemstack1)) {
-                     int l = itemstack1.getCount() + stack.getCount();
- 
-                     if (l <= stack.getMaxStackSize()) {
+                 if (!itemstack1.isEmpty() && ItemStack.isSameItemSameComponents(stack, itemstack1)) {
+                     l = itemstack1.getCount() + stack.getCount();
+                     int i1 = slot.getMaxStackSize(itemstack1);
+@@ -0,0 +0,0 @@ public abstract class AbstractContainerMenu {
+                     if (l <= i1) {
                          stack.setCount(0);
                          itemstack1.setCount(l);
 +                        if (!isCheck) { // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
                          slot.setChanged();
 +                        } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
                          flag1 = true;
-                     } else if (itemstack1.getCount() < stack.getMaxStackSize()) {
-                         stack.shrink(stack.getMaxStackSize() - itemstack1.getCount());
-                         itemstack1.setCount(stack.getMaxStackSize());
+                     } else if (itemstack1.getCount() < i1) {
+                         stack.shrink(i1 - itemstack1.getCount());
+                         itemstack1.setCount(i1);
 +                        if (!isCheck) { // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
                          slot.setChanged();
 +                        } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
@@ -93,25 +94,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                }
 +                // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
                  if (itemstack1.isEmpty() && slot.mayPlace(stack)) {
-                     if (stack.getCount() > slot.getMaxStackSize()) {
-+                        // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
-+                        if (isCheck) {
-+                            stack.shrink(slot.getMaxStackSize());
-+                        } else {
-+                        // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
-                         slot.setByPlayer(stack.split(slot.getMaxStackSize()));
-+                        } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
-                     } else {
-+                        // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
-+                        if (isCheck) {
-+                            stack.shrink(stack.getCount());
-+                        } else {
-+                        // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
-                         slot.setByPlayer(stack.split(stack.getCount()));
-+                        } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
-                     }
- 
-+                    if (!isCheck) { // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
+                     l = slot.getMaxStackSize(stack);
++                    // Paper start - Add PlayerTradeEvent and PlayerPurchaseEvent
++                    if (isCheck) {
++                        stack.shrink(Math.min(stack.getCount(), l));
++                    } else {
++                    // Paper end - Add PlayerTradeEvent and PlayerPurchaseEvent
+                     slot.setByPlayer(stack.split(Math.min(stack.getCount(), l)));
                      slot.setChanged();
 +                    } // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
                      flag1 = true;

patches/server/Conduit-API.patch

@@ -12,21 +12,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
 @@ -0,0 +0,0 @@ public class ConduitBlockEntity extends BlockEntity {
- 
-     private static void applyEffects(Level world, BlockPos pos, List<BlockPos> activatingBlocks) {
-         int i = activatingBlocks.size();
+     public static int getRange(List<BlockPos> list) {
+         // CraftBukkit end
+         int i = list.size();
 -        int j = i / 7 * 16;
 +        int j = i / 7 * 16; // Paper - Conduit API; diff on change
-         int k = pos.getX();
-         int l = pos.getY();
-         int i1 = pos.getZ();
+         // CraftBukkit start
+         return j;
+     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
 @@ -0,0 +0,0 @@ public class CraftConduit extends CraftBlockEntityState<ConduitBlockEntity> impl
-     public CraftConduit copy() {
-         return new CraftConduit(this);
+         AABB bounds = ConduitBlockEntity.getDestroyRangeAABB(this.getPosition());
+         return new BoundingBox(bounds.minX, bounds.minY, bounds.minZ, bounds.maxX, bounds.maxY, bounds.maxZ);
      }
 +
 +    // Paper start - Conduit API

patches/server/Deprecate-ItemStack-setType.patch

@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {
      static boolean hasItemMeta(net.minecraft.world.item.ItemStack item) {
-         return !(item == null || item.getTag() == null || item.getTag().isEmpty());
+         return !(item == null || item.getComponentsPatch().isEmpty());
      }
 +    // Paper start - with type
 +    @Override

patches/server/Expanded-Hopper-API.patch

@@ -12,8 +12,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -0,0 +0,0 @@ public class CraftHopper extends CraftLootable<HopperBlockEntity> implements Hop
-     public CraftHopper copy() {
-         return new CraftHopper(this);
+     public CraftHopper copy(Location location) {
+         return new CraftHopper(this, location);
      }
 +
 +    // Paper start - Expanded Hopper API