Fix hopper transfer merge conflicts

patches/api/0001-API-for-configurable-hopper-transfer-rates.patch

@@ -5,21 +5,20 @@ Subject: [PATCH] API for configurable hopper transfer rates
 
 
 diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 7ade312f180b7e30871d3a3240c76325cc369c26..663e1774ac98dabe2d80ef1693f74f8b1f16bf2b 100644
+index 61ea33c1f2dbb546a66f945a01feae437b1381e0..ee7f2b5dff0de861568748efb477ced5a7b0bd71 100644
 --- a/src/main/java/org/bukkit/block/Hopper.java
 +++ b/src/main/java/org/bukkit/block/Hopper.java
-@@ -6,4 +6,29 @@ import org.bukkit.loot.Lootable;
- /**
-  * Represents a captured state of a hopper.
-  */
--public interface Hopper extends Container, LootableBlockInventory { } // Paper
-+public interface Hopper extends Container, LootableBlockInventory {
+@@ -21,5 +21,30 @@ public interface Hopper extends Container, LootableBlockInventory { // Paper
+      */
+     int getTransferCooldown();
+     // Paper end - Expanded Hopper API
 +
 +    // Cheetah start - API for configurable hopper transfer rates
 +    /**
 +     * Returns the current transfer multiplier for this hopper
 +     * Default value: 1.0
 +     * If set to 2.0, twice as many items will be transferred per time unit
++     *
 +     * @return transfer multiplier for this hopper
 +     */
 +    float getTransferMultiplier();
@@ -38,4 +37,5 @@ index 7ade312f180b7e30871d3a3240c76325cc369c26..663e1774ac98dabe2d80ef1693f74f8b
 +        this.setTransferMultiplier(0F);
 +    }
 +    // Cheetah end
-+}
+ }
+

patches/server/0001-Build-changes.patch

@@ -42,10 +42,10 @@ index 241808d8619e17c0681f79acbbc98af5bf52dd89..4f6f102055a60eba5025b7254b07bd08
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d06185566b447c432d4dc2e3ba04d121bcdbc71b..d301288bb62e7075a1da326081765603afcc8d5d 100644
+index 93b661e9cb7743aeff7da3972942cb73049a5e4c..1ff04feafe0309922ba6b4f15e0f5f6df476ff74 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1865,7 +1865,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {

patches/server/0003-configurable-hopper-transfer-multiplier.patch

@@ -20,12 +20,12 @@ index a05acf709735b40ca86f978508c63a86065fd405..9da6c1a71b86818c5a8ab231c58bce22
 +    // Cheetah end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 757edf74751dc7183454656fda9cecc4eb601e4c..7faff429db9f71b2a7ceed4130aa502f0a4eb06f 100644
+index cdb739df2a285032d25d84f4464f202a7a3fa578..0988726a2fc7ad8305a13ee989e5cb02b365e60f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -51,6 +51,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
      private NonNullList<ItemStack> items;
-     private int cooldownTime;
+     public int cooldownTime;
      private long tickedGameTime;
 +    private float hopperTransferMultiplier = 1.0F; // Cheetah - Configurable hopper transfer multiplier
 
@@ -37,14 +37,14 @@ index 757edf74751dc7183454656fda9cecc4eb601e4c..7faff429db9f71b2a7ceed4130aa502f
 
 +    // Cheetah start - Configurable hopper transfer multiplier
 +    public float getHopperTransferMultiplier() {
-+        return hopperTransferMultiplier;
++        return this.hopperTransferMultiplier;
 +    }
 +
-+    public void setHopperTransferMultiplier( float hopperTransferMultiplier ) {
++    public void setHopperTransferMultiplier(float hopperTransferMultiplier) {
 +        this.hopperTransferMultiplier = hopperTransferMultiplier;
 +    }
 +    // Cheetah end
-+
++    
      public HopperBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.HOPPER, pos, state);
          this.items = NonNullList.withSize(5, ItemStack.EMPTY);
@@ -53,8 +53,8 @@ index 757edf74751dc7183454656fda9cecc4eb601e4c..7faff429db9f71b2a7ceed4130aa502f
 
          this.cooldownTime = nbt.getInt("TransferCooldown");
 +        // Cheetah start - Configurable hopper transfer multiplier
-+        if(nbt.contains("TransferMultiplier")) {
-+            this.hopperTransferMultiplier = nbt.getFloat( "TransferMultiplier");
++        if (nbt.contains("TransferMultiplier")) {
++            this.hopperTransferMultiplier = nbt.getFloat("TransferMultiplier");
 +        }
 +        // Cheetah end
      }
@@ -64,8 +64,8 @@ index 757edf74751dc7183454656fda9cecc4eb601e4c..7faff429db9f71b2a7ceed4130aa502f
          }
 
          nbt.putInt("TransferCooldown", this.cooldownTime);
-+        // Cheetah start
-+        if(this.hopperTransferMultiplier != 1.0F) {
++        // Cheetah start - Configurable hopper transfer multiplier
++        if (this.hopperTransferMultiplier != 1.0F) {
 +            nbt.putFloat("TransferMultiplier", this.hopperTransferMultiplier);
 +        }
 +        // Cheetah end
@@ -91,13 +91,13 @@ index 757edf74751dc7183454656fda9cecc4eb601e4c..7faff429db9f71b2a7ceed4130aa502f
          movedItem.setCount(movedItemCount);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index d446f18df647484e2f05ab642b73e914b06fdfed..abde33bbe48b15210422520a65924fdff3662a6b 100644
+index af5f27fb5ebad1e05da2b7d1a0710a2ef9c6ebbe..ab45b82e9ee7581297b6f774edb0c3ad56c19fb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-@@ -34,4 +34,19 @@ public class CraftHopper extends CraftLootable<HopperBlockEntity> implements Hop
-     public CraftHopper copy() {
-         return new CraftHopper(this);
+@@ -47,4 +47,19 @@ public class CraftHopper extends CraftLootable<HopperBlockEntity> implements Hop
+         return getSnapshot().cooldownTime;
      }
+     // Paper end - Expanded Hopper API
 +
 +    // Cheetah start - Configurable hopper transfer multiplier
 +    @Override
@@ -107,7 +107,7 @@ index d446f18df647484e2f05ab642b73e914b06fdfed..abde33bbe48b15210422520a65924fdf
 +
 +    @Override
 +    public void setTransferMultiplier(float transferMultiplier) {
-+        if(transferMultiplier < 0) {
++        if (transferMultiplier < 0) {
 +            throw new IllegalArgumentException("transferMultiplier cannot be negative for hopper at " + getLocation());
 +        }
 +        this.getTileEntity().setHopperTransferMultiplier(transferMultiplier);

patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch

@@ -21,7 +21,7 @@ index 156809090f1f83ad68e7e2477a3cfddac5757a8e..831344a472dd07bfabba7246d81c9a79
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4c2e8129481384a143384d327e14320023735b1a..bcca0847bb034d74d2ab35a9c8f89ba5b7158696 100644
+index cb3e9672f375a1a660757a05362729ddb5ca7504..ba5bb8f5407a2fd3aa5d8775d4ee33509de05b97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -15,6 +15,7 @@ import java.util.Map;
@@ -32,7 +32,7 @@ index 4c2e8129481384a143384d327e14320023735b1a..bcca0847bb034d74d2ab35a9c8f89ba5
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
-@@ -1457,7 +1458,10 @@ public class CraftEventFactory {
+@@ -1455,7 +1456,10 @@ public class CraftEventFactory {
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
 
          if (projectile.getShooter() instanceof Player && collided instanceof Player) {
@@ -44,7 +44,7 @@ index 4c2e8129481384a143384d327e14320023735b1a..bcca0847bb034d74d2ab35a9c8f89ba5
                  event.setCancelled(true);
                  return event;
              }
-@@ -1468,6 +1472,15 @@ public class CraftEventFactory {
+@@ -1466,6 +1470,15 @@ public class CraftEventFactory {
      }
      // Paper end
 

patches/server/0014-added-option-to-disable-elytra-in-end-cities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable elytra in end cities
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index b53b6cc4463675096b061b3b65f14a4695c742e2..3e397cd366ddea5ae1cc8ab61694753f3e8a4d40 100644
+index f2e30d8743a97c0541808dc5c03300c0d881b843..a27d74dddbbaae59a800d167e8cbaad54e84af0d 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -333,6 +333,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -334,6 +334,7 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean useDimensionTypeForCustomSpawners = false;
          public boolean strictAdvancementDimensionCheck = false;
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;