update vf again and re-apply/rebuild patches

6 files changed, 15 insertions, 37 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index c804184df7..7092932203 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -69,7 +69,7 @@ repositories {
 dependencies {
     paramMappings("net.fabricmc:yarn:1.20.4+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
-    decompiler("org.vineflower:vineflower:1.11.0-20240406.040032-5")
+    decompiler("org.vineflower:vineflower:1.11.0-20240409.020013-9")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
     paperclip("io.papermc:paperclip:3.0.3")
 }
diff --git a/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch
index e4dfccf663..7253601c50 100644
--- a/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch
@@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java b/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java
-index 5978240beb47bc5678e9aebc8d56aeb30dd7223a..bf2c2dd82831f85defa8b5760608f20e7036ebf6 100644
+index 22dd4d2a53cc99bcc863f7ef75e2e7b711ceb2b6..9b9afc01c287528b911e13cabd95f41c0d822a48 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java
-@@ -1643,7 +1643,8 @@ public class VillagerTrades {
+@@ -1641,7 +1641,8 @@ public class VillagerTrades {
                  return null;
              } else {
                  ServerLevel serverLevel = (ServerLevel)entity.level();
diff --git a/patches/server/0980-Rewrite-chunk-system.patch b/patches/server/0980-Rewrite-chunk-system.patch
index f7beb82fae..c8e846021f 100644
--- a/patches/server/0980-Rewrite-chunk-system.patch
+++ b/patches/server/0980-Rewrite-chunk-system.patch
@@ -20517,7 +20517,7 @@ index eebaf98bc0fa4696af59b2a79563beb73501a554..645a1773237f2002c233ec1f3ff6f0ca
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 0eaecd48f763d60e3bfe684fae1700c2ced78cc2..e8f8e1f2128df81705a88cee4b9a7760fb123750 100644
+index 3b842297774472af5999438e883c1cd262f3c286..e8f8e1f2128df81705a88cee4b9a7760fb123750 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 @@ -30,45 +30,31 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
@@ -20556,7 +20556,7 @@ index 0eaecd48f763d60e3bfe684fae1700c2ced78cc2..e8f8e1f2128df81705a88cee4b9a7760
 -                    } catch (Exception var6) {
 -                        LOGGER.warn("Failed to parse chunk {} position info", pos, var6);
 -                    }
--    
+-
 -                    CompoundTag compoundTag = this.upgradeChunkTag(nbt.get());
 -                    ListTag listTag = compoundTag.getList("Entities", 10);
 -                    List<Entity> list = EntityType.loadEntitiesRecursive(listTag, this.level).collect(ImmutableList.toImmutableList());
diff --git a/patches/server/1003-Remove-streams-from-hot-code.patch b/patches/server/1003-Remove-streams-from-hot-code.patch
index 458d94198a..8e8133d2b2 100644
--- a/patches/server/1003-Remove-streams-from-hot-code.patch
+++ b/patches/server/1003-Remove-streams-from-hot-code.patch
@@ -186,7 +186,7 @@ index 28fd073ddad358e087e8c78985a97cad21be81b7..a5bd308d1b3ea5db185c06a287167d1d
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java
-index a530a214bd9c1eccb67e954a5fb9858dcc7719c5..ba549438664c8bfa736084b256663f9e7c5e26c6 100644
+index 14d3f57fa796776e372cfe722471cdf8d4166b44..7cd8e444cd33a0995eda56e3be931780c3f501d9 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java
 @@ -35,9 +35,10 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
@@ -201,7 +201,7 @@ index a530a214bd9c1eccb67e954a5fb9858dcc7719c5..ba549438664c8bfa736084b256663f9e
 +            return structure.terrainAdaptation() != TerrainAdjustment.NONE;
 +        })) { // Paper end - Perf: Remove streams from hot code
                      TerrainAdjustment terrainAdjustment = start.getStructure().terrainAdaptation();
-         
+ 
                      for (StructurePiece structurePiece : start.getPieces()) {
 @@ -65,8 +66,7 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
                              }
diff --git a/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
index 712f8d62d7..9c4e3867d5 100644
--- a/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
@@ -173,10 +173,10 @@ index 0000000000000000000000000000000000000000..57d0cd3ad6f972e986c72a57f1a6e360
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
-index e3b74a69699a79522b91a144206dc9fa7a977600..01be7f911c7b013f923f6a3099ca9d7eaabd2547 100644
+index 4ce9906e1f2b79df7c08d644684281ee59aa0c91..2630f54d499abbe52798f97c8ea14a8d0bd75e99 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
-@@ -42,11 +42,13 @@ public abstract class StateHolder<O, S> {
+@@ -40,11 +40,13 @@ public abstract class StateHolder<O, S> {
      private final ImmutableMap<Property<?>, Comparable<?>> values;
      private Table<Property<?>, Comparable<?>, S> neighbours;
      protected final MapCodec<S> propertiesCodec;
@@ -190,7 +190,7 @@ index e3b74a69699a79522b91a144206dc9fa7a977600..01be7f911c7b013f923f6a3099ca9d7e
      }
  
      public <T extends Comparable<T>> S cycle(Property<T> property) {
-@@ -87,11 +89,11 @@ public abstract class StateHolder<O, S> {
+@@ -85,11 +87,11 @@ public abstract class StateHolder<O, S> {
      }
  
      public <T extends Comparable<T>> boolean hasProperty(Property<T> property) {
@@ -204,7 +204,7 @@ index e3b74a69699a79522b91a144206dc9fa7a977600..01be7f911c7b013f923f6a3099ca9d7e
          if (comparable == null) {
              throw new IllegalArgumentException("Cannot get property " + property + " as it does not exist in " + this.owner);
          } else {
-@@ -100,24 +102,18 @@ public abstract class StateHolder<O, S> {
+@@ -98,24 +100,18 @@ public abstract class StateHolder<O, S> {
      }
  
      public <T extends Comparable<T>> Optional<T> getOptionalValue(Property<T> property) {
@@ -236,7 +236,7 @@ index e3b74a69699a79522b91a144206dc9fa7a977600..01be7f911c7b013f923f6a3099ca9d7e
      }
  
      public <T extends Comparable<T>, V extends T> S trySetValue(Property<T> property, V value) {
-@@ -150,7 +146,7 @@ public abstract class StateHolder<O, S> {
+@@ -148,7 +144,7 @@ public abstract class StateHolder<O, S> {
                  }
              }
  
diff --git a/patches/server/1018-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1018-Fix-entity-type-tags-suggestions-in-selectors.patch
index 9b422d15a5..b92cab2931 100644
--- a/patches/server/1018-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1018-Fix-entity-type-tags-suggestions-in-selectors.patch
@@ -118,7 +118,7 @@ index 3d897ec6920eff6176ddac9f0442a997b9ef14fd..abaf1ea340c69c8bee80e64567b44b5c
          this.level = MinMaxBounds.Ints.ANY;
          this.rotX = WrappedMinMaxBounds.ANY;
 diff --git a/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
-index 53f77dbd5be1297d56d25c12e07c3dd65d6c4cd3..2cf42c9d33ce545a48e0080b46758c1bc17fd665 100644
+index 0ed0679af07445f0ba241c791f15dcc2b6731b12..55a7a735745ee5f6d18c7888036831ac736efa61 100644
 --- a/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
 +++ b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
 @@ -75,6 +75,20 @@ public class EntitySelectorOptions {
@@ -142,30 +142,8 @@ index 53f77dbd5be1297d56d25c12e07c3dd65d6c4cd3..2cf42c9d33ce545a48e0080b46758c1b
  
      private static void register(String id, EntitySelectorOptions.Modifier handler, Predicate<EntitySelectorParser> condition, Component description) {
          OPTIONS.put(id, new EntitySelectorOptions.Option(handler, condition, description));
-@@ -176,7 +190,7 @@ public class EntitySelectorOptions {
-                     reader.setSuggestions(
-                         (builder, consumer) -> SharedSuggestionProvider.suggest(Arrays.asList("nearest", "furthest", "random", "arbitrary"), builder)
-                     );
--    
-+
-                     reader.setOrder(switch (string) {
-                         case "nearest" -> EntitySelectorParser.ORDER_NEAREST;
-                         case "furthest" -> EntitySelectorParser.ORDER_FURTHEST;
-@@ -280,7 +294,7 @@ public class EntitySelectorOptions {
-                                     BuiltInRegistries.ENTITY_TYPE.getTagNames().map(TagKey::location), builder, String.valueOf('#')
-                                 );
-                             }
--        
-+
-                             return builder.buildFuture();
-                         }
-                     );
-@@ -293,9 +307,15 @@ public class EntitySelectorOptions {
-                         if (bl) {
-                             reader.setTypeLimitedInversely();
-                         }
--    
-+
+@@ -296,6 +310,12 @@ public class EntitySelectorOptions {
+ 
                          if (reader.isTag()) {
                              TagKey<EntityType<?>> tagKey = TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.read(reader.getReader()));
 +                            // Paper start - tell clients to ask server for suggestions for EntityArguments; throw error if invalid entity tag (only on suggestions to keep cmd success behavior)