From c81fcda172846fd2f7416e43b5e9b865c3b14a43 Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Tue, 23 Apr 2024 20:13:38 +0200 Subject: [PATCH] fix patches for 24w14potato, closes #29 --- .../critereon/MinMaxBounds.java.patch | 4 ++-- .../critereon/PlayerPredicate.java.patch | 18 +++++++++--------- .../arguments/ArgumentSignatures.java.patch | 2 +- .../component/DataComponentPatch.java.patch | 10 +++++----- .../DataComponentPredicate.java.patch | 11 +++++++++++ .../component/DataComponentType.java.patch | 2 +- .../registries/BuiltInRegistries.java.patch | 2 +- .../network/codec/StreamCodec.java.patch | 2 +- .../server/level/ServerLevel.java.patch | 2 +- .../ServerGamePacketListenerImpl.java.patch | 2 +- .../net/minecraft/util/ExtraCodecs.java.patch | 2 +- .../util/datafix/DataFixers.java.patch | 4 ++-- .../BlockPosFormatAndRenamesFix.java.patch | 16 ++++++++++++++++ .../net/minecraft/world/entity/Mob.java.patch | 2 +- .../world/entity/SpawnPlacements.java.patch | 2 +- .../world/entity/animal/Sheep.java.patch | 6 +++++- .../item/crafting/RecipeManager.java.patch | 2 +- .../minecraft/world/level/GameRules.java.patch | 2 +- .../block/PointedDripstoneBlock.java.patch | 11 +++++++++++ ...tItemBlockStatePropertyCondition.java.patch | 2 +- 20 files changed, 73 insertions(+), 31 deletions(-) create mode 100644 versions/24w14potato/patches/net/minecraft/core/component/DataComponentPredicate.java.patch create mode 100644 versions/24w14potato/patches/net/minecraft/util/datafix/fixes/BlockPosFormatAndRenamesFix.java.patch create mode 100644 versions/24w14potato/patches/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch diff --git a/versions/24w14potato/patches/net/minecraft/advancements/critereon/MinMaxBounds.java.patch b/versions/24w14potato/patches/net/minecraft/advancements/critereon/MinMaxBounds.java.patch index eca8439..027a87c 100644 --- a/versions/24w14potato/patches/net/minecraft/advancements/critereon/MinMaxBounds.java.patch +++ b/versions/24w14potato/patches/net/minecraft/advancements/critereon/MinMaxBounds.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/advancements/critereon/MinMaxBounds.java +++ b/net/minecraft/advancements/critereon/MinMaxBounds.java -@@ -119,7 +_,7 @@ +@@ -123,7 +_,7 @@ public static 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()); @@ -9,7 +9,7 @@ private Doubles(Optional min, Optional max) { this(min, max, squareOpt(min), squareOpt(max)); -@@ -175,7 +_,7 @@ +@@ -179,7 +_,7 @@ public static 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()); diff --git a/versions/24w14potato/patches/net/minecraft/advancements/critereon/PlayerPredicate.java.patch b/versions/24w14potato/patches/net/minecraft/advancements/critereon/PlayerPredicate.java.patch index 16a2d49..85ef9cc 100644 --- a/versions/24w14potato/patches/net/minecraft/advancements/critereon/PlayerPredicate.java.patch +++ b/versions/24w14potato/patches/net/minecraft/advancements/critereon/PlayerPredicate.java.patch @@ -1,16 +1,16 @@ --- a/net/minecraft/advancements/critereon/PlayerPredicate.java +++ b/net/minecraft/advancements/critereon/PlayerPredicate.java -@@ -236,11 +_,11 @@ - private static MapCodec> createTypedCodec(StatType statType) { - return RecordCodecBuilder.mapCodec( +@@ -239,11 +_,11 @@ + private static Codec> createTypedCodec(StatType type) { + return RecordCodecBuilder.create( instance -> instance.group( -- (App>, Holder>)statType.getRegistry() -+ statType.getRegistry() +- (App>, Holder>)type.getRegistry() ++ type.getRegistry() .holderByNameCodec() .fieldOf("stat") .forGetter(PlayerPredicate.StatMatcher::value), -- (App>, MinMaxBounds.Ints>)MinMaxBounds.Ints.CODEC -+ MinMaxBounds.Ints.CODEC - .optionalFieldOf("value", MinMaxBounds.Ints.ANY) +- (App>, MinMaxBounds.Ints>)ExtraCodecs.strictOptionalField( ++ ExtraCodecs.strictOptionalField( + MinMaxBounds.Ints.CODEC, "value", MinMaxBounds.Ints.ANY + ) .forGetter(PlayerPredicate.StatMatcher::range) - ) diff --git a/versions/24w14potato/patches/net/minecraft/commands/arguments/ArgumentSignatures.java.patch b/versions/24w14potato/patches/net/minecraft/commands/arguments/ArgumentSignatures.java.patch index ae848e7..21c5201 100644 --- a/versions/24w14potato/patches/net/minecraft/commands/arguments/ArgumentSignatures.java.patch +++ b/versions/24w14potato/patches/net/minecraft/commands/arguments/ArgumentSignatures.java.patch @@ -8,4 +8,4 @@ + this(buffer.readCollection(FriendlyByteBuf.>limitValue(ArrayList::new, 8), ArgumentSignatures.Entry::new)); } - public void write(FriendlyByteBuf buffer) { + @Nullable diff --git a/versions/24w14potato/patches/net/minecraft/core/component/DataComponentPatch.java.patch b/versions/24w14potato/patches/net/minecraft/core/component/DataComponentPatch.java.patch index 042adfd..6d6ffa0 100644 --- a/versions/24w14potato/patches/net/minecraft/core/component/DataComponentPatch.java.patch +++ b/versions/24w14potato/patches/net/minecraft/core/component/DataComponentPatch.java.patch @@ -1,11 +1,11 @@ --- a/net/minecraft/core/component/DataComponentPatch.java +++ b/net/minecraft/core/component/DataComponentPatch.java -@@ -19,7 +_,7 @@ +@@ -18,7 +_,7 @@ public final class DataComponentPatch { public static final DataComponentPatch EMPTY = new DataComponentPatch(Reference2ObjectMaps.emptyMap()); -- public static final Codec CODEC = Codec.dispatchedMap(DataComponentPatch.PatchKey.CODEC, DataComponentPatch.PatchKey::valueCodec) -+ public static final Codec CODEC = Codec.dispatchedMap(DataComponentPatch.PatchKey.CODEC, DataComponentPatch.PatchKey::valueCodec) +- public static final Codec CODEC = ExtraCodecs.unboundedDispatchMap( ++ public static final Codec CODEC = ExtraCodecs.unboundedDispatchMap( + DataComponentPatch.PatchKey.CODEC, DataComponentPatch.PatchKey::valueCodec + ) .xmap(map -> { - if (map.isEmpty()) { - return EMPTY; diff --git a/versions/24w14potato/patches/net/minecraft/core/component/DataComponentPredicate.java.patch b/versions/24w14potato/patches/net/minecraft/core/component/DataComponentPredicate.java.patch new file mode 100644 index 0000000..d6122e0 --- /dev/null +++ b/versions/24w14potato/patches/net/minecraft/core/component/DataComponentPredicate.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/core/component/DataComponentPredicate.java ++++ b/net/minecraft/core/component/DataComponentPredicate.java +@@ -13,7 +_,7 @@ + import net.minecraft.util.ExtraCodecs; + + public final class DataComponentPredicate implements Predicate { +- public static final Codec CODEC = ExtraCodecs.unboundedDispatchMap(DataComponentType.CODEC, DataComponentType::codecOrThrow) ++ public static final Codec CODEC = ExtraCodecs., Object>unboundedDispatchMap(DataComponentType.CODEC, DataComponentType::codecOrThrow) + .xmap( + map -> new DataComponentPredicate(map.entrySet().stream().map(TypedDataComponent::fromEntryUnchecked).collect(Collectors.toList())), + dataComponentPredicate -> dataComponentPredicate.expectedComponents diff --git a/versions/24w14potato/patches/net/minecraft/core/component/DataComponentType.java.patch b/versions/24w14potato/patches/net/minecraft/core/component/DataComponentType.java.patch index c018ffc..4f9aaff 100644 --- a/versions/24w14potato/patches/net/minecraft/core/component/DataComponentType.java.patch +++ b/versions/24w14potato/patches/net/minecraft/core/component/DataComponentType.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/core/component/DataComponentType.java +++ b/net/minecraft/core/component/DataComponentType.java -@@ -93,7 +_,7 @@ +@@ -86,7 +_,7 @@ @Override public String toString() { diff --git a/versions/24w14potato/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch b/versions/24w14potato/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch index 2ce45c9..97961b7 100644 --- a/versions/24w14potato/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch +++ b/versions/24w14potato/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 -@@ -297,7 +_,7 @@ +@@ -298,7 +_,7 @@ Bootstrap.checkBootstrapCalled(() -> "registry " + resourceKey); ResourceLocation resourceLocation = resourceKey.location(); LOADERS.put(resourceLocation, () -> registryBootstrap.run(writableRegistry)); diff --git a/versions/24w14potato/patches/net/minecraft/network/codec/StreamCodec.java.patch b/versions/24w14potato/patches/net/minecraft/network/codec/StreamCodec.java.patch index c2a9a62..f7d408e 100644 --- a/versions/24w14potato/patches/net/minecraft/network/codec/StreamCodec.java.patch +++ b/versions/24w14potato/patches/net/minecraft/network/codec/StreamCodec.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/network/codec/StreamCodec.java +++ b/net/minecraft/network/codec/StreamCodec.java -@@ -298,7 +_,7 @@ +@@ -342,7 +_,7 @@ } default StreamCodec cast() { diff --git a/versions/24w14potato/patches/net/minecraft/server/level/ServerLevel.java.patch b/versions/24w14potato/patches/net/minecraft/server/level/ServerLevel.java.patch index 054395d..7f5007d 100644 --- a/versions/24w14potato/patches/net/minecraft/server/level/ServerLevel.java.patch +++ b/versions/24w14potato/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 -@@ -1569,7 +_,7 @@ +@@ -1614,7 +_,7 @@ return map.object2IntEntrySet() .stream() diff --git a/versions/24w14potato/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/versions/24w14potato/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index 5faf695..5a44f99 100644 --- a/versions/24w14potato/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/versions/24w14potato/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -783,7 +_,7 @@ +@@ -782,7 +_,7 @@ if (item.is(Items.WRITABLE_BOOK)) { ItemStack itemStack = item.transmuteCopy(Items.WRITTEN_BOOK, 1); itemStack.remove(DataComponents.WRITABLE_BOOK_CONTENT); diff --git a/versions/24w14potato/patches/net/minecraft/util/ExtraCodecs.java.patch b/versions/24w14potato/patches/net/minecraft/util/ExtraCodecs.java.patch index 367ac8f..daed2a7 100644 --- a/versions/24w14potato/patches/net/minecraft/util/ExtraCodecs.java.patch +++ b/versions/24w14potato/patches/net/minecraft/util/ExtraCodecs.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/util/ExtraCodecs.java +++ b/net/minecraft/util/ExtraCodecs.java -@@ -208,7 +_,7 @@ +@@ -241,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/24w14potato/patches/net/minecraft/util/datafix/DataFixers.java.patch b/versions/24w14potato/patches/net/minecraft/util/datafix/DataFixers.java.patch index e311002..b99a75b 100644 --- a/versions/24w14potato/patches/net/minecraft/util/datafix/DataFixers.java.patch +++ b/versions/24w14potato/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 -@@ -1067,7 +_,7 @@ +@@ -1064,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"); -@@ -1104,7 +_,7 @@ +@@ -1101,7 +_,7 @@ Schema schema162 = builder.addSchema(3087, SAME_NAMESPACED); builder.addFixer( new EntityVariantFix( diff --git a/versions/24w14potato/patches/net/minecraft/util/datafix/fixes/BlockPosFormatAndRenamesFix.java.patch b/versions/24w14potato/patches/net/minecraft/util/datafix/fixes/BlockPosFormatAndRenamesFix.java.patch new file mode 100644 index 0000000..f9e7ff3 --- /dev/null +++ b/versions/24w14potato/patches/net/minecraft/util/datafix/fixes/BlockPosFormatAndRenamesFix.java.patch @@ -0,0 +1,16 @@ +--- a/net/minecraft/util/datafix/fixes/BlockPosFormatAndRenamesFix.java ++++ b/net/minecraft/util/datafix/fixes/BlockPosFormatAndRenamesFix.java +@@ -36,11 +_,11 @@ + + private Dynamic fixMapSavedData(Dynamic dynamic) { + return dynamic.update("frames", dynamic1 -> dynamic1.createList(dynamic1.asStream().map(dynamic2 -> { +- dynamic2 = ExtraDataFixUtils.renameAndFixField((Dynamic)dynamic2, "Pos", "pos", ExtraDataFixUtils::fixBlockPos); ++ dynamic2 = ExtraDataFixUtils.renameAndFixField(dynamic2, "Pos", "pos", ExtraDataFixUtils::fixBlockPos); + dynamic2 = ExtraDataFixUtils.renameField(dynamic2, "Rotation", "rotation"); + return ExtraDataFixUtils.renameField(dynamic2, "EntityId", "entity_id"); + }))).update("banners", dynamic1 -> dynamic1.createList(dynamic1.asStream().map(dynamic2 -> { +- dynamic2 = ExtraDataFixUtils.renameField((Dynamic)dynamic2, "Pos", "pos"); ++ dynamic2 = ExtraDataFixUtils.renameField(dynamic2, "Pos", "pos"); + dynamic2 = ExtraDataFixUtils.renameField(dynamic2, "Color", "color"); + return ExtraDataFixUtils.renameField(dynamic2, "Name", "name"); + }))); diff --git a/versions/24w14potato/patches/net/minecraft/world/entity/Mob.java.patch b/versions/24w14potato/patches/net/minecraft/world/entity/Mob.java.patch index 426d315..cc6826f 100644 --- a/versions/24w14potato/patches/net/minecraft/world/entity/Mob.java.patch +++ b/versions/24w14potato/patches/net/minecraft/world/entity/Mob.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -492,7 +_,7 @@ +@@ -489,7 +_,7 @@ if (compound.contains("leash", 10)) { this.delayedLeashInfo = Either.left(compound.getCompound("leash").getUUID("UUID")); } else if (compound.contains("leash", 11)) { diff --git a/versions/24w14potato/patches/net/minecraft/world/entity/SpawnPlacements.java.patch b/versions/24w14potato/patches/net/minecraft/world/entity/SpawnPlacements.java.patch index 498a954..568bbf3 100644 --- a/versions/24w14potato/patches/net/minecraft/world/entity/SpawnPlacements.java.patch +++ b/versions/24w14potato/patches/net/minecraft/world/entity/SpawnPlacements.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/SpawnPlacements.java +++ b/net/minecraft/world/entity/SpawnPlacements.java -@@ -73,7 +_,7 @@ +@@ -74,7 +_,7 @@ EntityType entityType, ServerLevelAccessor serverLevel, MobSpawnType spawnType, BlockPos pos, RandomSource random ) { SpawnPlacements.Data data = DATA_BY_TYPE.get(entityType); diff --git a/versions/24w14potato/patches/net/minecraft/world/entity/animal/Sheep.java.patch b/versions/24w14potato/patches/net/minecraft/world/entity/animal/Sheep.java.patch index fcc48e8..0b43a61 100644 --- a/versions/24w14potato/patches/net/minecraft/world/entity/animal/Sheep.java.patch +++ b/versions/24w14potato/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 -@@ -81,7 +_,7 @@ +@@ -84,10 +_,10 @@ map.put(DyeColor.RED, Blocks.RED_WOOL); map.put(DyeColor.BLACK, Blocks.BLACK_WOOL); }); @@ -8,4 +8,8 @@ + private static final Map COLORARRAY_BY_COLOR = Maps.newEnumMap( Arrays.stream(DyeColor.values()).collect(Collectors.toMap(color -> (DyeColor)color, Sheep::createSheepColor)) ); +- private static final Map COLORARRAY_BY_POTATO = Maps.newEnumMap( ++ private static final Map COLORARRAY_BY_POTATO = Maps.newEnumMap( + Arrays.stream(DyeColor.values()).collect(Collectors.toMap(dyeColor -> (DyeColor)dyeColor, Sheep::createSheepColorPotato)) + ); private int eatAnimationTick; diff --git a/versions/24w14potato/patches/net/minecraft/world/item/crafting/RecipeManager.java.patch b/versions/24w14potato/patches/net/minecraft/world/item/crafting/RecipeManager.java.patch index d288974..044a3fa 100644 --- a/versions/24w14potato/patches/net/minecraft/world/item/crafting/RecipeManager.java.patch +++ b/versions/24w14potato/patches/net/minecraft/world/item/crafting/RecipeManager.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/item/crafting/RecipeManager.java +++ b/net/minecraft/world/item/crafting/RecipeManager.java -@@ -114,7 +_,7 @@ +@@ -115,7 +_,7 @@ } private > Map> byType(RecipeType recipeType) { diff --git a/versions/24w14potato/patches/net/minecraft/world/level/GameRules.java.patch b/versions/24w14potato/patches/net/minecraft/world/level/GameRules.java.patch index 64f96e7..0e954ae 100644 --- a/versions/24w14potato/patches/net/minecraft/world/level/GameRules.java.patch +++ b/versions/24w14potato/patches/net/minecraft/world/level/GameRules.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/GameRules.java +++ b/net/minecraft/world/level/GameRules.java -@@ -250,8 +_,8 @@ +@@ -256,8 +_,8 @@ } private static > void callVisitorCap(GameRules.GameRuleTypeVisitor visitor, GameRules.Key key, GameRules.Type type) { diff --git a/versions/24w14potato/patches/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch b/versions/24w14potato/patches/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch new file mode 100644 index 0000000..bb53c76 --- /dev/null +++ b/versions/24w14potato/patches/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/block/PointedDripstoneBlock.java ++++ b/net/minecraft/world/level/block/PointedDripstoneBlock.java +@@ -583,7 +_,7 @@ + @Nullable + public static BlockPos findStalactiteTipAboveCauldron(Block block, Level level, BlockPos blockPos) { + if (block instanceof PointedDripstoneBlock pointedDripstoneBlock) { +- BiPredicate biPredicate = (blockPos1, blockState) -> canDripThrough(level, blockPos1, blockState); ++ BiPredicate biPredicate = (blockPos1, blockState) -> canDripThrough(level, blockPos1, blockState); + return findBlockVertical(level, blockPos, Direction.UP.getAxisDirection(), biPredicate, pointedDripstoneBlock::canDrip, 11).orElse(null); + } else { + return null; diff --git a/versions/24w14potato/patches/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java.patch b/versions/24w14potato/patches/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java.patch index b9a97f0..19b5719 100644 --- a/versions/24w14potato/patches/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java.patch +++ b/versions/24w14potato/patches/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java +++ b/net/minecraft/world/level/storage/loot/predicates/LootItemBlockStatePropertyCondition.java -@@ -27,7 +_,7 @@ +@@ -31,7 +_,7 @@ private static DataResult validate(LootItemBlockStatePropertyCondition condition) { return condition.properties() .flatMap(statePropertiesPredicate -> statePropertiesPredicate.checkState(condition.block().value().getStateDefinition()))