Update to 24w35a

Resolves #46

versions/24w35a/build.gradle.kts

@@ -34,8 +34,8 @@ mache {
 dependencies {
     codebook("1.0.10")
     remapper(art("1.0.14"))
-    decompiler(vineflower("1.11.0-20240824.182200-44"))
-    parchment("1.20.6", "BLEEDING-SNAPSHOT")
+    decompiler(vineflower("1.11.0-20240829.184116-48"))
+    parchment("1.21", "2024.07.28")
 }
 
 dependencies {

versions/24w35a/patches/net/minecraft/core/Registry.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/core/Registry.java
 +++ b/net/minecraft/core/Registry.java
-@@ -151,7 +_,7 @@
-     Optional<HolderSet.Named<T>> getTag(TagKey<T> key);
+@@ -140,7 +_,7 @@
+     Holder<T> wrapAsHolder(T value);
 
      default Iterable<Holder<T>> getTagOrEmpty(TagKey<T> key) {
--        return DataFixUtils.orElse(this.getTag(key), List.<T>of());
-+        return DataFixUtils.orElse(this.getTag(key), List.of());
+-        return DataFixUtils.orElse(this.get(key), List.<T>of());
++        return DataFixUtils.orElse(this.get(key), List.of());
      }
 
      default Optional<Holder<T>> getRandomElementOf(TagKey<T> key, RandomSource random) {

versions/24w35a/patches/net/minecraft/core/RegistrySetBuilder.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/core/RegistrySetBuilder.java
 +++ b/net/minecraft/core/RegistrySetBuilder.java
-@@ -419,13 +_,13 @@
+@@ -417,13 +_,13 @@
 
          <T> Holder.Reference<T> getOrCreate(ResourceKey<T> key) {
              return (Holder.Reference<T>)this.holders

versions/24w35a/patches/net/minecraft/data/info/RegistryDumpReport.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/data/info/RegistryDumpReport.java
 +++ b/net/minecraft/data/info/RegistryDumpReport.java
-@@ -34,7 +_,7 @@
+@@ -36,7 +_,7 @@
              jsonObject.addProperty("default", defaultKey.toString());
          }
 
 -        int id = BuiltInRegistries.REGISTRY.getId(registry);
 +        int id = ((Registry) BuiltInRegistries.REGISTRY).getId(registry);
          jsonObject.addProperty("protocol_id", id);
          JsonObject jsonObject1 = new JsonObject();
-         registry.holders().forEach(holder -> {
+         registry.listElements().forEach(holder -> {

versions/24w35a/patches/net/minecraft/resources/RegistryDataLoader.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/resources/RegistryDataLoader.java
 +++ b/net/minecraft/resources/RegistryDataLoader.java
-@@ -73,7 +_,7 @@
+@@ -74,7 +_,7 @@
 
  public class RegistryDataLoader {
      private static final Logger LOGGER = LogUtils.getLogger();

versions/24w35a/patches/net/minecraft/server/MinecraftServer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -874,7 +_,7 @@
+@@ -873,7 +_,7 @@
      }
 
      @Override

versions/24w35a/patches/net/minecraft/server/dedicated/Settings.java.patch

@@ -2,10 +2,10 @@
 +++ b/net/minecraft/server/dedicated/Settings.java
 @@ -119,7 +_,7 @@
          String stringRaw = this.getStringRaw(key);
-         V object = MoreObjects.firstNonNull(stringRaw != null ? mapper.apply(stringRaw) : null, value);
-         this.properties.put(key, toString.apply(object));
--        return new Settings.MutableValue<>(key, object, toString);
-+        return new Settings<T>.MutableValue<>(key, object, toString);
+         V object = MoreObjects.firstNonNull(stringRaw != null ? serializer.apply(stringRaw) : null, defaultValue);
+         this.properties.put(key, deserializer.apply(object));
+-        return new Settings.MutableValue<>(key, object, deserializer);
++        return new Settings<T>.MutableValue<>(key, object, deserializer);
      }
 
-     protected <V> V get(String key, Function<String, V> mapper, UnaryOperator<V> unaryOperator, Function<V, String> toString, V value) {
+     protected <V> V get(String key, Function<String, V> serializer, UnaryOperator<V> modifier, Function<V, String> deserializer, V defaultValue) {

versions/24w35a/patches/net/minecraft/server/level/ServerLevel.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1576,7 +_,7 @@
+@@ -1578,7 +_,7 @@
 
              return map.object2IntEntrySet()
                  .stream()

versions/24w35a/patches/net/minecraft/util/datafix/DataFixers.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/DataFixers.java
 +++ b/net/minecraft/util/datafix/DataFixers.java
-@@ -1090,7 +_,7 @@
+@@ -1091,7 +_,7 @@
          Schema schema161 = builder.addSchema(3086, SAME_NAMESPACED);
          builder.addFixer(
              new EntityVariantFix(
@@ -9,7 +9,7 @@
                      map5.defaultReturnValue("minecraft:tabby");
                      map5.put(0, "minecraft:tabby");
                      map5.put(1, "minecraft:black");
-@@ -1127,7 +_,7 @@
+@@ -1128,7 +_,7 @@
          Schema schema162 = builder.addSchema(3087, SAME_NAMESPACED);
          builder.addFixer(
              new EntityVariantFix(

versions/24w35a/patches/net/minecraft/util/datafix/fixes/ChunkHeightAndBiomeFix.java.patch

@@ -2,11 +2,11 @@
 +++ b/net/minecraft/util/datafix/fixes/ChunkHeightAndBiomeFix.java
 @@ -220,7 +_,8 @@
          } else if (ints != null && ints.length == 1024) {
-             for (int i1 = 0; i1 < 16; i1++) {
-                 int i2 = i1 - i;
--                dynamics[i2] = makeBiomeContainer(dynamic, i4 -> getOldBiome(ints, i1 * 64 + i4));
-+                final int f_i = i1;
-+                dynamics[i2] = makeBiomeContainer(dynamic, i4 -> getOldBiome(ints, f_i * 64 + i4));
+             for (int i = 0; i < 16; i++) {
+                 int i1 = i - lowestY;
+-                dynamics[i1] = makeBiomeContainer(data, i3 -> getOldBiome(ints, i * 64 + i3));
++                final int f_i = i;
++                dynamics[i1] = makeBiomeContainer(data, i3 -> getOldBiome(ints, f_i * 64 + i3));
              }
 
              if (overworld) {

versions/24w35a/patches/net/minecraft/util/datafix/fixes/ChunkProtoTickListFix.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/util/datafix/fixes/ChunkProtoTickListFix.java
 +++ b/net/minecraft/util/datafix/fixes/ChunkProtoTickListFix.java
 @@ -181,7 +_,7 @@
-         int i3 = i >>> 8 & 15;
-         String string = function.apply(supplier != null ? supplier.get().get(i1, i2, i3) : null);
-         return dynamic.createMap(
+         int i2 = index >>> 8 & 15;
+         String string = idGetter.apply(palette != null ? palette.get().get(i, i1, i2) : null);
+         return data.createMap(
 -            ImmutableMap.builder()
 +            ImmutableMap.<Dynamic<?>, Dynamic<?>>builder()
-                 .put(dynamic.createString("i"), dynamic.createString(string))
-                 .put(dynamic.createString("x"), dynamic.createInt(x * 16 + i1))
-                 .put(dynamic.createString("y"), dynamic.createInt(y * 16 + i2))
+                 .put(data.createString("i"), data.createString(string))
+                 .put(data.createString("x"), data.createInt(x * 16 + i))
+                 .put(data.createString("y"), data.createInt(y * 16 + i1))

versions/24w35a/patches/net/minecraft/util/datafix/fixes/LeavesFix.java.patch

@@ -1,7 +1,7 @@
 --- a/net/minecraft/util/datafix/fixes/LeavesFix.java
 +++ b/net/minecraft/util/datafix/fixes/LeavesFix.java
 @@ -353,7 +_,7 @@
-                 : typed.update(DSL.remainderFinder(), dynamic -> dynamic.set("BlockStates", dynamic.createLongList(Arrays.stream(this.storage.getRaw()))))
+                 : data.update(DSL.remainderFinder(), dynamic -> dynamic.set("BlockStates", dynamic.createLongList(Arrays.stream(this.storage.getRaw()))))
                      .set(
                          this.paletteFinder,
 -                        this.palette.stream().map(dynamic -> Pair.of(References.BLOCK_STATE.typeName(), dynamic)).collect(Collectors.toList())

versions/24w35a/patches/net/minecraft/world/entity/Leashable.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/entity/Leashable.java
 +++ b/net/minecraft/world/entity/Leashable.java
 @@ -50,7 +_,7 @@
-             return new Leashable.LeashData(Either.left(compoundTag.getCompound("leash").getUUID("UUID")));
+             return new Leashable.LeashData(Either.left(tag.getCompound("leash").getUUID("UUID")));
          } else {
-             if (compoundTag.contains("leash", 11)) {
--                Either<UUID, BlockPos> either = NbtUtils.readBlockPos(compoundTag, "leash").map(Either::right).orElse(null);
-+                Either<UUID, BlockPos> either = NbtUtils.readBlockPos(compoundTag, "leash").<Either<UUID, BlockPos>>map(Either::right).orElse(null);
+             if (tag.contains("leash", 11)) {
+-                Either<UUID, BlockPos> either = NbtUtils.readBlockPos(tag, "leash").map(Either::right).orElse(null);
++                Either<UUID, BlockPos> either = NbtUtils.readBlockPos(tag, "leash").<Either<UUID, BlockPos>>map(Either::right).orElse(null);
                  if (either != null) {
                      return new Leashable.LeashData(either);
                  }

versions/24w35a/patches/net/minecraft/world/entity/animal/Sheep.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/Sheep.java
 +++ b/net/minecraft/world/entity/animal/Sheep.java
-@@ -58,7 +_,7 @@
+@@ -56,7 +_,7 @@
  public class Sheep extends Animal implements Shearable {
      private static final int EAT_ANIMATION_TICKS = 40;
      private static final EntityDataAccessor<Byte> DATA_WOOL_ID = SynchedEntityData.defineId(Sheep.class, EntityDataSerializers.BYTE);

versions/24w35a/patches/net/minecraft/world/item/EitherHolder.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/EitherHolder.java
 +++ b/net/minecraft/world/item/EitherHolder.java
-@@ -38,7 +_,7 @@
+@@ -36,7 +_,7 @@
      }
 
      public Either<Holder<T>, ResourceKey<T>> asEither() {

versions/24w35a/patches/net/minecraft/world/item/crafting/RecipeManager.java.patch

@@ -8,4 +8,4 @@
 +        return (Collection)this.byType.get(type);
      }
 
-     public <I extends RecipeInput, T extends Recipe<I>> NonNullList<ItemStack> getRemainingItemsFor(RecipeType<T> recipeType, I recipeInput, Level level) {
+     public <I extends RecipeInput, T extends Recipe<I>> NonNullList<ItemStack> getRemainingItemsFor(RecipeType<T> recipeType, I input, Level lvel) {

versions/24w35a/patches/net/minecraft/world/item/enchantment/ConditionalEffect.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/item/enchantment/ConditionalEffect.java
 +++ b/net/minecraft/world/item/enchantment/ConditionalEffect.java
 @@ -19,7 +_,7 @@
-                     ValidationContext validationContext = new ValidationContext(collector, lootContextParamSet);
-                     lootItemCondition.validate(validationContext);
+                     ValidationContext validationContext = new ValidationContext(collector, params);
+                     condition.validate(validationContext);
                      return collector.getReport()
 -                        .map(string -> DataResult.error(() -> "Validation error in enchantment effect condition: " + string))
 +                        .map(string -> DataResult.<LootItemCondition>error(() -> "Validation error in enchantment effect condition: " + string))
-                         .orElseGet(() -> DataResult.success(lootItemCondition));
+                         .orElseGet(() -> DataResult.success(condition));
                  }
              );