From ee46af66e52999d187e3b59e8ed3a471e0e4ad54 Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Wed, 1 Jun 2022 01:36:44 +0800 Subject: [PATCH] Add pack-type-specific format versions in pack metadata. Fixes #8563 (#8612) --- mdk/src/main/resources/pack.mcmeta | 4 ++- .../net/minecraft/client/Minecraft.java.patch | 6 ++-- .../pack/PackMetadataSection.java.patch | 32 +++++++++++++++++++ .../PackMetadataSectionSerializer.java.patch | 11 +++++++ .../repository/PackCompatibility.java.patch | 11 +++++++ .../net/minecraftforge/common/ForgeHooks.java | 18 +++++++++++ .../resources/META-INF/accesstransformer.cfg | 1 + src/main/resources/forge.exc | 1 + src/main/resources/pack.mcmeta | 4 ++- src/test/resources/pack.mcmeta | 4 ++- .../test_nested_resource_pack/pack.mcmeta | 4 ++- 11 files changed, 90 insertions(+), 6 deletions(-) create mode 100644 patches/minecraft/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java.patch create mode 100644 patches/minecraft/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java.patch create mode 100644 patches/minecraft/net/minecraft/server/packs/repository/PackCompatibility.java.patch diff --git a/mdk/src/main/resources/pack.mcmeta b/mdk/src/main/resources/pack.mcmeta index f335b9f733..6f2f48b7e4 100644 --- a/mdk/src/main/resources/pack.mcmeta +++ b/mdk/src/main/resources/pack.mcmeta @@ -1,6 +1,8 @@ { "pack": { "description": "examplemod resources", - "pack_format": 9 + "pack_format": 9, + "forge:resource_pack_format": 8, + "forge:data_pack_format": 9 } } diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index fcdf96ee4e..7172b87a9a 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -501,15 +501,17 @@ } } -@@ -2713,7 +_,7 @@ +@@ -2713,8 +_,8 @@ return this.f_90993_; } - private static Pack m_167933_(String p_167934_, Component p_167935_, boolean p_167936_, Supplier p_167937_, PackMetadataSection p_167938_, Pack.Position p_167939_, PackSource p_167940_) { +- int i = p_167938_.m_10374_(); + private static Pack createClientPackAdapter(String p_167934_, Component p_167935_, boolean p_167936_, Supplier p_167937_, PackMetadataSection p_167938_, Pack.Position p_167939_, PackSource p_167940_, boolean hidden) { - int i = p_167938_.m_10374_(); ++ int i = p_167938_.getPackFormat(PackType.CLIENT_RESOURCES); Supplier supplier = p_167937_; if (i <= 3) { + supplier = m_91330_(p_167937_); @@ -2724,7 +_,7 @@ supplier = m_91352_(supplier); } diff --git a/patches/minecraft/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java.patch b/patches/minecraft/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java.patch new file mode 100644 index 0000000000..ef0387fef8 --- /dev/null +++ b/patches/minecraft/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java.patch @@ -0,0 +1,32 @@ +--- a/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java ++++ b/net/minecraft/server/packs/metadata/pack/PackMetadataSection.java +@@ -6,17 +_,29 @@ + public static final PackMetadataSectionSerializer f_10366_ = new PackMetadataSectionSerializer(); + private final Component f_10367_; + private final int f_10368_; ++ private final java.util.Map packTypeVersions; + + public PackMetadataSection(Component p_10371_, int p_10372_) { + this.f_10367_ = p_10371_; + this.f_10368_ = p_10372_; ++ this.packTypeVersions = java.util.Map.of(); ++ } ++ public PackMetadataSection(Component p_10371_, int p_10372_, java.util.Map packTypeVersions) { ++ this.f_10367_ = p_10371_; ++ this.f_10368_ = p_10372_; ++ this.packTypeVersions = packTypeVersions; + } + + public Component m_10373_() { + return this.f_10367_; + } + ++ /** @deprecated Forge: Use {@link #getPackFormat(net.minecraft.server.packs.PackType)} instead.*/ ++ @Deprecated + public int m_10374_() { + return this.f_10368_; ++ } ++ public int getPackFormat(net.minecraft.server.packs.PackType packType) { ++ return packTypeVersions.getOrDefault(packType, this.f_10368_); + } + } diff --git a/patches/minecraft/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java.patch b/patches/minecraft/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java.patch new file mode 100644 index 0000000000..c7c1e72dc1 --- /dev/null +++ b/patches/minecraft/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java ++++ b/net/minecraft/server/packs/metadata/pack/PackMetadataSectionSerializer.java +@@ -13,7 +_,7 @@ + throw new JsonParseException("Invalid/missing description!"); + } else { + int i = GsonHelper.m_13927_(p_10380_, "pack_format"); +- return new PackMetadataSection(component, i); ++ return new PackMetadataSection(component, i, net.minecraftforge.common.ForgeHooks.readTypedPackFormats(p_10380_)); + } + } + diff --git a/patches/minecraft/net/minecraft/server/packs/repository/PackCompatibility.java.patch b/patches/minecraft/net/minecraft/server/packs/repository/PackCompatibility.java.patch new file mode 100644 index 0000000000..cbb3caf97e --- /dev/null +++ b/patches/minecraft/net/minecraft/server/packs/repository/PackCompatibility.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/server/packs/repository/PackCompatibility.java ++++ b/net/minecraft/server/packs/repository/PackCompatibility.java +@@ -34,7 +_,7 @@ + } + + public static PackCompatibility m_143885_(PackMetadataSection p_143886_, PackType p_143887_) { +- return m_143882_(p_143886_.m_10374_(), p_143887_); ++ return m_143882_(p_143886_.getPackFormat(p_143887_), p_143887_); + } + + public Component m_10492_() { diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 565742e45d..ab5c476348 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -13,6 +13,7 @@ import java.util.Deque; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Objects; @@ -47,6 +48,7 @@ import it.unimi.dsi.fastutil.longs.LongSet; import net.minecraft.ResourceLocationException; import net.minecraft.advancements.Advancement; import net.minecraft.core.*; +import net.minecraft.server.packs.PackType; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.util.datafix.fixes.StructuresBecomeConfiguredFix; @@ -1510,4 +1512,20 @@ public class ForgeHooks @Nullable ResourceLocation biomeLocation = ResourceLocation.tryParse(biome); return biomeLocation != null && !biomeLocation.getNamespace().equals(ResourceLocation.DEFAULT_NAMESPACE); } + + public static Map readTypedPackFormats(JsonObject json) + { + ImmutableMap.Builder map = ImmutableMap.builder(); + + for (PackType packType : PackType.values()) + { + String key = "forge:" + packType.bridgeType.name().toLowerCase(Locale.ROOT) + "_pack_format"; + if (json.has(key)) + { + map.put(packType, GsonHelper.getAsInt(json, key)); + } + } + + return map.buildOrThrow(); + } } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 753a4b9df8..1d509578b6 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -273,6 +273,7 @@ public net.minecraft.server.level.ServerPlayer m_143399_(Lnet/minecraft/world/in public net.minecraft.server.level.ServerPlayer m_9217_()V # nextContainerCounter public net.minecraft.server.network.ServerLoginPacketListenerImpl f_10021_ # gameProfile public net.minecraft.server.packs.AbstractPackResources f_10203_ # file +public net.minecraft.server.packs.PackType f_143750_ # bridgeType public net.minecraft.server.packs.resources.FallbackResourceManager f_10599_ # fallbacks public net.minecraft.tags.Tag$BuilderEntry (Lnet/minecraft/tags/Tag$Entry;Ljava/lang/String;)V # constructor public net.minecraft.tags.Tag$ElementEntry diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index b2a0cfb08c..817f827c38 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -33,6 +33,7 @@ net/minecraft/server/level/ServerLevel.removePlayer(Lnet/minecraft/server/level/ net/minecraft/server/level/ServerPlayer.changeDimension(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/world/entity/Entity;=|p_9180_,teleporter net/minecraft/server/level/ServerPlayerGameMode.removeBlock(Lnet/minecraft/core/BlockPos;Z)Z=|p_180235_1_,canHarvest net/minecraft/server/level/Ticket.(Lnet/minecraft/server/level/TicketType;ILjava/lang/Object;Z)V=|p_9425_,p_9426_,p_9427_,forceTicks +net/minecraft/server/packs/metadata/pack/PackMetadataSection.(Lnet/minecraft/network/chat/Component;ILjava/util/Map;)V=|p_10371_,p_10372_,packTypeVersions net/minecraft/server/packs/repository/Pack.(Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/server/packs/repository/PackCompatibility;Lnet/minecraft/server/packs/repository/Pack$Position;ZLnet/minecraft/server/packs/repository/PackSource;Z)V=|p_10420_,p_10421_,p_10422_,p_10423_,p_10424_,p_10425_,p_10426_,p_10427_,p_10428_,hidden net/minecraft/world/entity/Entity.changeDimension(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/world/entity/Entity;=|p_20118_,teleporter net/minecraft/world/entity/EntityType.(Lnet/minecraft/world/entity/EntityType$EntityFactory;Lnet/minecraft/world/entity/MobCategory;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/world/entity/EntityDimensions;IILjava/util/function/Predicate;Ljava/util/function/ToIntFunction;Ljava/util/function/ToIntFunction;Ljava/util/function/BiFunction;)V=|p_20574_,p_20575_,p_20576_,p_20577_,p_20578_,p_20579_,p_20580_,p_20581_,p_20582_,p_20583_,velocityUpdateSupplier,trackingRangeSupplier,updateIntervalSupplier,customClientFactory diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 0bb8888406..3f0f28e031 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,8 @@ { "pack": { "pack_format": 8, - "description": "Forge resource pack" + "description": "Forge resource pack", + "forge:resource_pack_format": 8, + "forge:data_pack_format": 9 } } diff --git a/src/test/resources/pack.mcmeta b/src/test/resources/pack.mcmeta index d7d0769ba3..21b561edf1 100644 --- a/src/test/resources/pack.mcmeta +++ b/src/test/resources/pack.mcmeta @@ -1,6 +1,8 @@ { "pack": { "pack_format": 8, - "description": "Forge tests resource pack" + "description": "Forge tests resource pack", + "forge:resource_pack_format": 8, + "forge:data_pack_format": 9 } } diff --git a/src/test/resources/test_nested_resource_pack/pack.mcmeta b/src/test/resources/test_nested_resource_pack/pack.mcmeta index c4ce141db9..9f0961d076 100644 --- a/src/test/resources/test_nested_resource_pack/pack.mcmeta +++ b/src/test/resources/test_nested_resource_pack/pack.mcmeta @@ -1,6 +1,8 @@ { "pack": { "pack_format": 8, - "description": "Nested resource pack" + "description": "Nested resource pack", + "forge:resource_pack_format": 8, + "forge:data_pack_format": 9 } }