diff --git a/patches/minecraft/net/minecraft/data/TagsProvider.java.patch b/patches/minecraft/net/minecraft/data/TagsProvider.java.patch index 98e115745b..3276a6cf6c 100644 --- a/patches/minecraft/net/minecraft/data/TagsProvider.java.patch +++ b/patches/minecraft/net/minecraft/data/TagsProvider.java.patch @@ -1,10 +1,11 @@ --- a/net/minecraft/data/TagsProvider.java +++ b/net/minecraft/data/TagsProvider.java -@@ -28,10 +28,20 @@ +@@ -28,10 +28,28 @@ protected final DataGenerator field_200433_a; protected final Registry field_200435_c; protected final Map field_200434_b = Maps.newLinkedHashMap(); + protected final String modId; ++ protected final String folder; + protected final net.minecraftforge.common.data.ExistingFileHelper existingFileHelper; + private final net.minecraftforge.common.data.ExistingFileHelper.IResourceType resourceType; @@ -13,15 +14,22 @@ + this(p_i49827_1_, p_i49827_2_, "vanilla", null); + } + protected TagsProvider(DataGenerator p_i49827_1_, Registry p_i49827_2_, String modId, @javax.annotation.Nullable net.minecraftforge.common.data.ExistingFileHelper existingFileHelper) { ++ this(p_i49827_1_, p_i49827_2_, modId, existingFileHelper, null); ++ } ++ protected TagsProvider(DataGenerator p_i49827_1_, Registry p_i49827_2_, String modId, @javax.annotation.Nullable net.minecraftforge.common.data.ExistingFileHelper existingFileHelper, @javax.annotation.Nullable String folder) { this.field_200433_a = p_i49827_1_; this.field_200435_c = p_i49827_2_; + this.modId = modId; + this.existingFileHelper = existingFileHelper; -+ this.resourceType = new net.minecraftforge.common.data.ExistingFileHelper.ResourceType(net.minecraft.resources.ResourcePackType.SERVER_DATA, ".json", "tags/" + getTagFolder()); ++ if (folder == null) {//TODO - 1.17: Remove getTagFolder as a method, and inline the default implementation here ++ folder = getTagFolder(); ++ } ++ this.folder = folder; ++ this.resourceType = new net.minecraftforge.common.data.ExistingFileHelper.ResourceType(net.minecraft.resources.ResourcePackType.SERVER_DATA, ".json", "tags/" + this.folder); } protected abstract void func_200432_c(); -@@ -47,12 +57,14 @@ +@@ -47,12 +65,14 @@ return this.field_200435_c.func_241873_b(p_240527_1_).orElse((T)null); }; this.field_200434_b.forEach((p_240524_4_, p_240524_5_) -> { @@ -37,7 +45,7 @@ try { String s = field_200437_e.toJson((JsonElement)jsonobject); -@@ -74,20 +86,36 @@ +@@ -74,20 +94,36 @@ }); } @@ -76,7 +84,7 @@ private final ITag.Builder field_240528_a_; private final Registry field_240529_b_; private final String field_240530_c_; -@@ -115,5 +143,18 @@ +@@ -115,5 +151,18 @@ }); return this; } diff --git a/src/main/java/net/minecraftforge/common/data/ForgeRegistryTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeRegistryTagsProvider.java index d3a3fe24f6..093e796ea0 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeRegistryTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeRegistryTagsProvider.java @@ -56,13 +56,15 @@ public abstract class ForgeRegistryTagsProvider return GameData.getWrapper(forgeRegistry.getRegistryKey(), Lifecycle.experimental(), "default"); } - private final String folder; + private static > String getTagFolder(IForgeRegistry registryIn) + { + String tagFolder = ((ForgeRegistry) registryIn).getTagFolder(); + return tagFolder == null ? vanillaTypes.get(registryIn) : tagFolder; + } public ForgeRegistryTagsProvider(DataGenerator generatorIn, IForgeRegistry registryIn, String modId, @Nullable ExistingFileHelper existingFileHelper) { - super(generatorIn, wrapRegistry(registryIn), modId, existingFileHelper); - String tagFolder = ((ForgeRegistry) registryIn).getTagFolder(); - folder = tagFolder == null ? vanillaTypes.get(registryIn) : tagFolder; + super(generatorIn, wrapRegistry(registryIn), modId, existingFileHelper, getTagFolder(registryIn)); } @Override @@ -70,10 +72,4 @@ public abstract class ForgeRegistryTagsProvider { return generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/" + folder + "/" + id.getPath() + ".json"); } - - @Override - protected String getTagFolder() - { - return folder; - } } diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index 88f2ab5d5e..42050c82da 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -30,6 +30,7 @@ net/minecraft/data/EntityTypeTagsProvider.(Lnet/minecraft/data/DataGenerat net/minecraft/data/FluidTagsProvider.(Lnet/minecraft/data/DataGenerator;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_i49156_1_,modId,existingFileHelper net/minecraft/data/ItemTagsProvider.(Lnet/minecraft/data/DataGenerator;Lnet/minecraft/data/BlockTagsProvider;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_i232552_1_,p_i232552_2_,modId,existingFileHelper net/minecraft/data/TagsProvider.(Lnet/minecraft/data/DataGenerator;Lnet/minecraft/util/registry/Registry;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;)V=|p_i49827_1_,p_i49827_2_,modId,existingFileHelper +net/minecraft/data/TagsProvider.(Lnet/minecraft/data/DataGenerator;Lnet/minecraft/util/registry/Registry;Ljava/lang/String;Lnet/minecraftforge/common/data/ExistingFileHelper;Ljava/lang/String;)V=|p_i49827_1_,p_i49827_2_,modId,existingFileHelper,folder net/minecraft/entity/Entity.changeDimension(Lnet/minecraft/world/server/ServerWorld;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;=|p_241206_1_,teleporter net/minecraft/entity/EntityType.(Lnet/minecraft/entity/EntityType$IFactory;Lnet/minecraft/entity/EntityClassification;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/entity/EntitySize;IILjava/util/function/Predicate;Ljava/util/function/ToIntFunction;Ljava/util/function/ToIntFunction;Ljava/util/function/BiFunction;)V=|p_i231489_1_,p_i231489_2_,p_i231489_3_,p_i231489_4_,p_i231489_5_,p_i231489_6_,p_i231489_7_,p_i231489_8_,p_i231489_9_,p_i231489_10_,velocityUpdateSupplier,trackingRangeSupplier,updateIntervalSupplier,customClientFactory net/minecraft/entity/item/EnderPearlEntity.changeDimension(Lnet/minecraft/world/server/ServerWorld;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;=|p_241206_1_,teleporter