diff --git a/gradle.properties b/gradle.properties index 008343f..ab56402 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21-R0.1-SNAPSHOT mcVersion=1.21 -paperRef=4e6a2a13a3e1f6fa1067a7821d2f018339395533 +paperRef=4d7cef34181162e301365ada2d0a3e98b4a7cc88 org.gradle.caching=false org.gradle.parallel=true diff --git a/patches/server/0026-Improve-container-checking-with-a-bitset.patch b/patches/server/0026-Improve-container-checking-with-a-bitset.patch index 1a26619..0539648 100644 --- a/patches/server/0026-Improve-container-checking-with-a-bitset.patch +++ b/patches/server/0026-Improve-container-checking-with-a-bitset.patch @@ -415,7 +415,7 @@ index b88aa184cd06a0485146f58a5b61a56a50911209..bf7ec7196d02553bc26caf87213fa241 @Override 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 53f9d28bf3c6aafd4fdd6c12e0285500fe7350ce..415ad627084c35b4c022cff3ce782e2265a78759 100644 +index cab403efd471bb61835224eea4e99570d34dcaaa..5611217970bca6d4cc5feb10fb62fa13640b49d7 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 @@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @@ -488,7 +488,7 @@ index 53f9d28bf3c6aafd4fdd6c12e0285500fe7350ce..415ad627084c35b4c022cff3ce782e22 if (!item.isEmpty()) { foundItem = true; ItemStack origItemStack = item; -@@ -725,7 +751,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -733,7 +759,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) { boolean flag = false; @@ -497,7 +497,7 @@ index 53f9d28bf3c6aafd4fdd6c12e0285500fe7350ce..415ad627084c35b4c022cff3ce782e22 if (itemstack1.isEmpty()) { // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem -@@ -913,7 +939,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -921,7 +947,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @Override protected void setItems(NonNullList inventory) { diff --git a/patches/server/0041-Reduce-hopper-item-checks.patch b/patches/server/0041-Reduce-hopper-item-checks.patch index 74a74a0..cb282f2 100644 --- a/patches/server/0041-Reduce-hopper-item-checks.patch +++ b/patches/server/0041-Reduce-hopper-item-checks.patch @@ -120,7 +120,7 @@ index 5f042e294db605827000123252b0df646968f897..e1cc15f28fe8da23b74ff4504c5b2da2 double getLevelY(); 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 415ad627084c35b4c022cff3ce782e2265a78759..a7c7065d3b2016f6e2720e8cd8a0f47ddf7c30e6 100644 +index 5611217970bca6d4cc5feb10fb62fa13640b49d7..2f844d611634d2013dbc8550fb76b765d83388d0 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 @@ -11,6 +11,7 @@ import net.minecraft.core.NonNullList; @@ -139,7 +139,7 @@ index 415ad627084c35b4c022cff3ce782e2265a78759..a7c7065d3b2016f6e2720e8cd8a0f47d import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.HopperMenu; import net.minecraft.world.item.ItemStack; -@@ -590,7 +592,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -594,7 +596,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen } else { boolean flag = hopper.isGridAligned() && iblockdata.isCollisionShapeFullBlock(world, blockposition) && !iblockdata.is(BlockTags.DOES_NOT_BLOCK_HOPPERS); @@ -148,7 +148,7 @@ index 415ad627084c35b4c022cff3ce782e2265a78759..a7c7065d3b2016f6e2720e8cd8a0f47d Iterator iterator = HopperBlockEntity.getItemsAtAndAbove(world, hopper).iterator(); while (iterator.hasNext()) { -@@ -900,6 +902,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -908,6 +910,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen return first.getCount() < first.getMaxStackSize() && ItemStack.isSameItemSameComponents(first, second); // Paper - Perf: Optimize Hoppers; used to return true for full itemstacks?! }