diff --git a/versions/24w34a/build.gradle.kts b/versions/24w34a/build.gradle.kts index d1fd89d..6076ad8 100644 --- a/versions/24w34a/build.gradle.kts +++ b/versions/24w34a/build.gradle.kts @@ -34,7 +34,7 @@ mache { dependencies { codebook("1.0.10") remapper(art("1.0.14")) - decompiler(vineflower("1.11.0-20240522.034251-27")) + decompiler(vineflower("1.11.0-20240824.182200-44")) parchment("1.20.6", "BLEEDING-SNAPSHOT") } diff --git a/versions/24w34a/patches/net/minecraft/advancements/critereon/MinMaxBounds.java.patch b/versions/24w34a/patches/net/minecraft/advancements/critereon/MinMaxBounds.java.patch index eca8439..e5d3262 100644 --- a/versions/24w34a/patches/net/minecraft/advancements/critereon/MinMaxBounds.java.patch +++ b/versions/24w34a/patches/net/minecraft/advancements/critereon/MinMaxBounds.java.patch @@ -1,7 +1,7 @@ --- a/net/minecraft/advancements/critereon/MinMaxBounds.java +++ b/net/minecraft/advancements/critereon/MinMaxBounds.java @@ -119,7 +_,7 @@ - public static record Doubles(@Override Optional min, @Override Optional max, Optional minSq, Optional maxSq) + public record Doubles(@Override Optional min, @Override Optional max, Optional minSq, Optional maxSq) implements MinMaxBounds { public static final MinMaxBounds.Doubles ANY = new MinMaxBounds.Doubles(Optional.empty(), Optional.empty()); - public static final Codec CODEC = MinMaxBounds.createCodec(Codec.DOUBLE, MinMaxBounds.Doubles::new); @@ -10,7 +10,7 @@ private Doubles(Optional min, Optional max) { this(min, max, squareOpt(min), squareOpt(max)); @@ -175,7 +_,7 @@ - public static record Ints(@Override Optional min, @Override Optional max, Optional minSq, Optional maxSq) + public record Ints(@Override Optional min, @Override Optional max, Optional minSq, Optional maxSq) implements MinMaxBounds { public static final MinMaxBounds.Ints ANY = new MinMaxBounds.Ints(Optional.empty(), Optional.empty()); - public static final Codec CODEC = MinMaxBounds.createCodec(Codec.INT, MinMaxBounds.Ints::new); diff --git a/versions/24w34a/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch b/versions/24w34a/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch index 3bb8913..96697d5 100644 --- a/versions/24w34a/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch +++ b/versions/24w34a/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/core/registries/BuiltInRegistries.java +++ b/net/minecraft/core/registries/BuiltInRegistries.java -@@ -313,7 +_,7 @@ +@@ -317,7 +_,7 @@ Bootstrap.checkBootstrapCalled(() -> "registry " + key); ResourceLocation resourceLocation = key.location(); LOADERS.put(resourceLocation, () -> bootstrap.run(registry)); diff --git a/versions/24w34a/patches/net/minecraft/nbt/NbtUtils.java.patch b/versions/24w34a/patches/net/minecraft/nbt/NbtUtils.java.patch index 4e62d18..cde80e5 100644 --- a/versions/24w34a/patches/net/minecraft/nbt/NbtUtils.java.patch +++ b/versions/24w34a/patches/net/minecraft/nbt/NbtUtils.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/nbt/NbtUtils.java +++ b/net/minecraft/nbt/NbtUtils.java -@@ -310,7 +_,7 @@ +@@ -306,7 +_,7 @@ indent(indentLevel + 1, stringBuilder); } @@ -9,7 +9,7 @@ String stringx = Strings.repeat(" ", ix); for (int i2 = 0; i2 < list.size(); i2++) { -@@ -337,7 +_,7 @@ +@@ -333,7 +_,7 @@ case 11: IntArrayTag intArrayTag = (IntArrayTag)tag; int[] asIntArray = intArrayTag.getAsIntArray(); diff --git a/versions/24w34a/patches/net/minecraft/resources/RegistryDataLoader.java.patch b/versions/24w34a/patches/net/minecraft/resources/RegistryDataLoader.java.patch new file mode 100644 index 0000000..4becd29 --- /dev/null +++ b/versions/24w34a/patches/net/minecraft/resources/RegistryDataLoader.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/resources/RegistryDataLoader.java ++++ b/net/minecraft/resources/RegistryDataLoader.java +@@ -73,7 +_,7 @@ + + public class RegistryDataLoader { + private static final Logger LOGGER = LogUtils.getLogger(); +- private static final Comparator> ERROR_KEY_COMPARATOR = Comparator.comparing(ResourceKey::registry).thenComparing(ResourceKey::location); ++ private static final Comparator> ERROR_KEY_COMPARATOR = Comparator., ResourceLocation>comparing(ResourceKey::registry).thenComparing(ResourceKey::location); + private static final RegistrationInfo NETWORK_REGISTRATION_INFO = new RegistrationInfo(Optional.empty(), Lifecycle.experimental()); + private static final Function, RegistrationInfo> REGISTRATION_INFO_CACHE = Util.memoize(optional -> { + Lifecycle lifecycle = optional.map(KnownPack::isVanilla).map(_boolean -> Lifecycle.stable()).orElse(Lifecycle.experimental()); diff --git a/versions/24w34a/patches/net/minecraft/util/ExtraCodecs.java.patch b/versions/24w34a/patches/net/minecraft/util/ExtraCodecs.java.patch index 2016e22..34b5b35 100644 --- a/versions/24w34a/patches/net/minecraft/util/ExtraCodecs.java.patch +++ b/versions/24w34a/patches/net/minecraft/util/ExtraCodecs.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/util/ExtraCodecs.java +++ b/net/minecraft/util/ExtraCodecs.java -@@ -218,7 +_,7 @@ +@@ -221,7 +_,7 @@ P object1 = list1.get(1); return factory.apply(object, object1); }), object -> ImmutableList.of(minGetter.apply((I)object), maxGetter.apply((I)object))); diff --git a/versions/24w34a/patches/net/minecraft/util/datafix/DataFixers.java.patch b/versions/24w34a/patches/net/minecraft/util/datafix/DataFixers.java.patch index ad54710..57605ae 100644 --- a/versions/24w34a/patches/net/minecraft/util/datafix/DataFixers.java.patch +++ b/versions/24w34a/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 -@@ -1086,7 +_,7 @@ +@@ -1090,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"); -@@ -1123,7 +_,7 @@ +@@ -1127,7 +_,7 @@ Schema schema162 = builder.addSchema(3087, SAME_NAMESPACED); builder.addFixer( new EntityVariantFix( diff --git a/versions/24w34a/patches/net/minecraft/world/entity/Entity.java.patch b/versions/24w34a/patches/net/minecraft/world/entity/Entity.java.patch deleted file mode 100644 index a2060ec..0000000 --- a/versions/24w34a/patches/net/minecraft/world/entity/Entity.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/world/entity/Entity.java -+++ b/net/minecraft/world/entity/Entity.java -@@ -474,7 +_,7 @@ - - this.firstTick = false; - if (!this.level().isClientSide && this instanceof Leashable) { -- Leashable.tickLeash((Entity)((Leashable)this)); -+ Leashable.tickLeash((Entity & Leashable) this); - } - - this.level().getProfiler().pop(); diff --git a/versions/24w34a/patches/net/minecraft/world/entity/Leashable.java.patch b/versions/24w34a/patches/net/minecraft/world/entity/Leashable.java.patch index 214d658..d27df2b 100644 --- a/versions/24w34a/patches/net/minecraft/world/entity/Leashable.java.patch +++ b/versions/24w34a/patches/net/minecraft/world/entity/Leashable.java.patch @@ -1,14 +1,5 @@ --- a/net/minecraft/world/entity/Leashable.java +++ b/net/minecraft/world/entity/Leashable.java -@@ -41,7 +_,7 @@ - - default void setDelayedLeashHolderId(int i) { - this.setLeashData(new Leashable.LeashData(i)); -- dropLeash((Entity)this, false, false); -+ dropLeash((Entity & Leashable) this, false, false); - } - - @Nullable @@ -50,7 +_,7 @@ return new Leashable.LeashData(Either.left(compoundTag.getCompound("leash").getUUID("UUID"))); } else { @@ -18,39 +9,3 @@ if (either != null) { return new Leashable.LeashData(either); } -@@ -102,7 +_,7 @@ - } - - default void dropLeash(boolean flag, boolean flag1) { -- dropLeash((Entity)this, flag, flag1); -+ dropLeash((Entity & Leashable) this, flag, flag1); - } - - private static void dropLeash(E entity, boolean flag, boolean flag1) { -@@ -161,7 +_,7 @@ - } - - default void elasticRangeLeashBehaviour(Entity entity, float f) { -- legacyElasticRangeLeashBehaviour((Entity)this, entity, f); -+ legacyElasticRangeLeashBehaviour((Entity & Leashable)this, entity, f); - } - - private static void legacyElasticRangeLeashBehaviour(E entity, Entity entity1, float f) { -@@ -174,7 +_,7 @@ - } - - default void setLeashedTo(Entity entity, boolean flag) { -- setLeashedTo((Entity)this, entity, flag); -+ setLeashedTo((Entity & Leashable) this, entity, flag); - } - - private static void setLeashedTo(E entity, Entity entity1, boolean flag) { -@@ -197,7 +_,7 @@ - - @Nullable - default Entity getLeashHolder() { -- return getLeashHolder((Entity)this); -+ return getLeashHolder((Entity & Leashable) this); - } - - @Nullable