Update patches to handle vineflower decompiler (#10406)

* Update patches to handle vineflower decompiler

* update patches again to handle inlined simple lambdas

* update vf again and re-apply/rebuild patches

* update patches after removal of verify-merges flag

* fix compile issue

* remove maven local

* fix some issues

* address more issues

* fix collision patch

* use paperweight release

* more fixes

* update fineflower and fix patches again

* add missing comment descriptor

---------

Co-authored-by: Jason Penilla <[email protected]>

1 files changed, 5 insertions, 5 deletions

diff --git a/patches/server/0903-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0903-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 6701e32f16..930a90563b 100644
--- a/patches/server/0903-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0903-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
@@ -7,11 +7,11 @@ The lists are only supposed to contain ticks for the 1 radius
 neighbours of the chunk.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java b/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java
-index 8943081f270d5328b4f333b7bc1ae1a449d1788c..a5b90222cfad5b282f3f2db4dd5d1b201761fb72 100644
+index ae52f9a04221efed322bc3dc76ac0d56738ffba7..25c1abaeb916781f810d580a4d388d4d3adad75a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java
-@@ -99,6 +99,25 @@ public class UpgradeData {
- 
+@@ -100,6 +100,25 @@ public class UpgradeData {
+         }
      }
  
 +    // Paper start - filter out relocated neighbour ticks
@@ -36,7 +36,7 @@ index 8943081f270d5328b4f333b7bc1ae1a449d1788c..a5b90222cfad5b282f3f2db4dd5d1b20
      public void upgrade(LevelChunk chunk) {
          this.upgradeInside(chunk);
  
-@@ -106,6 +125,11 @@ public class UpgradeData {
+@@ -107,6 +126,11 @@ public class UpgradeData {
              upgradeSides(chunk, direction8);
          }
  
@@ -46,5 +46,5 @@ index 8943081f270d5328b4f333b7bc1ae1a449d1788c..a5b90222cfad5b282f3f2db4dd5d1b20
 +        // Paper end - filter out relocated neighbour ticks
 +
          Level level = chunk.getLevel();
-         this.neighborBlockTicks.forEach((tick) -> {
+         this.neighborBlockTicks.forEach(tick -> {
              Block block = tick.type() == Blocks.AIR ? level.getBlockState(tick.pos()).getBlock() : tick.type();