Skip to content

Commit 821e47f

Browse files
ApexModderApexModder
authored
[1.21.4] Tear out ExistingFileHelper (#1799)
1 parent 069ab04 commit 821e47f

File tree

48 files changed

+259
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+259
-689
lines changed

‎patches/net/minecraft/client/data/Main.java.patch

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
--- a/net/minecraft/client/data/Main.java
22
+++ b/net/minecraft/client/data/Main.java
3-
@@ -30,16 +_,33 @@
3+
@@ -30,16 +_,31 @@
44
OptionSpec<Void> optionspec1 = optionparser.accepts("client", "Include client generators");
55
OptionSpec<Void> optionspec2 = optionparser.accepts("all", "Include all generators");
66
OptionSpec<String> optionspec3 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
77
+ OptionSpec<String> existing = optionparser.accepts("existing", "Existing resource packs that generated resources can reference").withRequiredArg();
8-
+ OptionSpec<String> existingMod = optionparser.accepts("existing-mod", "Existing mods that generated resources can reference the resource packs of").withRequiredArg();
9-
+ OptionSpec<java.io.File> gameDir = optionparser.accepts("gameDir").withRequiredArg().ofType(java.io.File.class).defaultsTo(new java.io.File(".")).required(); //Need by modlauncher, so lets just eat it
8+
+ optionparser.accepts("gameDir").withRequiredArg().ofType(java.io.File.class).defaultsTo(new java.io.File(".")).required(); //Need by modlauncher, so lets just eat it
109
+ OptionSpec<String> mod = optionparser.accepts("mod", "A modid to dump").withRequiredArg().withValuesSeparatedBy(",");
1110
+ OptionSpec<Void> flat = optionparser.accepts("flat", "Do not append modid prefix to output directory when generating for multiple mods");
1211
+ OptionSpec<String> assetIndex = optionparser.accepts("assetIndex").withRequiredArg();
@@ -21,7 +20,6 @@
2120
- ClientBootstrap.bootstrap();
2221
- DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
2322
+ java.util.Collection<Path> existingPacks = optionset.valuesOf(existing).stream().map(Paths::get).toList();
24-
+ java.util.Set<String> existingMods = new java.util.HashSet<>(optionset.valuesOf(existingMod));
2523
+ java.util.Set<String> mods = new java.util.HashSet<>(optionset.valuesOf(mod));
2624
+ boolean isFlat = mods.isEmpty() || optionset.has(flat);
2725
+ boolean validate = optionset.has(validateSpec);
@@ -30,7 +28,7 @@
3028
addClientProviders(datagenerator, flag1);
3129
- datagenerator.run();
3230
+ }
33-
+ net.neoforged.neoforge.data.loading.DatagenModLoader.begin(mods, path, java.util.List.of(), existingPacks, existingMods, false, false, validate, isFlat, optionset.valueOf(assetIndex), optionset.valueOf(assetsDir), () -> {
31+
+ net.neoforged.neoforge.data.loading.DatagenModLoader.begin(mods, path, java.util.List.of(), existingPacks, false, false, validate, isFlat, optionset.valueOf(assetIndex), optionset.valueOf(assetsDir), () -> {
3432
+ ClientBootstrap.bootstrap();
3533
+ net.neoforged.neoforge.client.ClientHooks.registerSpriteSourceTypes();
3634
+ net.neoforged.neoforge.client.entity.animation.json.AnimationTypeManager.init();

‎patches/net/minecraft/data/Main.java.patch

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/data/Main.java
22
+++ b/net/minecraft/data/Main.java
3-
@@ -73,21 +_,34 @@
3+
@@ -73,21 +_,32 @@
44
OptionSpec<Void> optionspec1 = optionparser.accepts("server", "Include server generators");
55
OptionSpec<Void> optionspec2 = optionparser.accepts("dev", "Include development tools");
66
OptionSpec<Void> optionspec3 = optionparser.accepts("reports", "Include data reports");
@@ -10,7 +10,6 @@
1010
OptionSpec<String> optionspec5 = optionparser.accepts("output", "Output folder").withRequiredArg().defaultsTo("generated");
1111
OptionSpec<String> optionspec6 = optionparser.accepts("input", "Input folder").withRequiredArg();
1212
+ OptionSpec<String> existing = optionparser.accepts("existing", "Existing resource packs that generated resources can reference").withRequiredArg();
13-
+ OptionSpec<String> existingMod = optionparser.accepts("existing-mod", "Existing mods that generated resources can reference the resource packs of").withRequiredArg();
1413
+ OptionSpec<java.io.File> gameDir = optionparser.accepts("gameDir").withRequiredArg().ofType(java.io.File.class).defaultsTo(new java.io.File(".")).required(); //Need by modlauncher, so lets just eat it
1514
+ OptionSpec<String> mod = optionparser.accepts("mod", "A modid to dump").withRequiredArg().withValuesSeparatedBy(",");
1615
+ OptionSpec<Void> flat = optionparser.accepts("flat", "Do not append modid prefix to output directory when generating for multiple mods");
@@ -24,17 +23,16 @@
2423
boolean flag3 = flag || optionset.has(optionspec3);
2524
Collection<Path> collection = optionset.valuesOf(optionspec6).stream().map(p_129659_ -> Paths.get(p_129659_)).toList();
2625
- DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true);
27-
+ Collection<Path> existingPacks = optionset.valuesOf(existing).stream().map(Paths::get).toList();
28-
+ java.util.Set<String> existingMods = new java.util.HashSet<>(optionset.valuesOf(existingMod));
2926
+ java.util.Set<String> mods = new java.util.HashSet<>(optionset.valuesOf(mod));
3027
+ boolean isFlat = mods.isEmpty() || optionset.has(flat);
3128
+ boolean validate = optionset.has(validateSpec);
3229
+ DataGenerator datagenerator = new DataGenerator(isFlat ? path : path.resolve("minecraft"), SharedConstants.getCurrentVersion(), true);
30+
+ java.util.Collection<Path> existingPacks = optionset.valuesOf(existing).stream().map(Paths::get).toList();
3331
+ if (mods.contains("minecraft") || mods.isEmpty()) {
3432
addServerProviders(datagenerator, collection, flag1, flag2, flag3);
3533
- datagenerator.run();
3634
+ }
37-
+ net.neoforged.neoforge.data.loading.DatagenModLoader.begin(mods, path, collection, existingPacks, existingMods, flag2, flag3, validate, isFlat, null, null, () -> {},
35+
+ net.neoforged.neoforge.data.loading.DatagenModLoader.begin(mods, path, collection, existingPacks, flag2, flag3, validate, isFlat, null, null, () -> {},
3836
+ net.neoforged.neoforge.data.event.GatherDataEvent.Server::new, datagenerator);
3937
} else {
4038
optionparser.printHelpOn(System.out);

‎patches/net/minecraft/data/advancements/AdvancementProvider.java.patch

-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
--- a/net/minecraft/data/advancements/AdvancementProvider.java
22
+++ b/net/minecraft/data/advancements/AdvancementProvider.java
3-
@@ -16,6 +_,11 @@
4-
import net.minecraft.data.PackOutput;
5-
import net.minecraft.resources.ResourceLocation;
6-
7-
+/**
8-
+ * @deprecated NeoForge: Use {@link net.neoforged.neoforge.common.data.AdvancementProvider} instead,
9-
+ * provides ease of access for the {@link net.neoforged.neoforge.common.data.ExistingFileHelper} in the generator
10-
+ */
11-
+@Deprecated
12-
public class AdvancementProvider implements DataProvider {
13-
private final PackOutput.PathProvider pathProvider;
14-
private final List<AdvancementSubProvider> subProviders;
153
@@ -37,7 +_,7 @@
164
throw new IllegalStateException("Duplicate advancement " + p_339356_.id());
175
} else {

‎patches/net/minecraft/data/tags/BannerPatternTagsProvider.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import net.minecraft.world.level.block.entity.BannerPatterns;
55

66
public class BannerPatternTagsProvider extends TagsProvider<BannerPattern> {
7-
+ /** @deprecated Forge: Use the {@linkplain #BannerPatternTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #BannerPatternTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public BannerPatternTagsProvider(PackOutput p_256451_, CompletableFuture<HolderLookup.Provider> p_256420_) {
1010
super(p_256451_, Registries.BANNER_PATTERN, p_256420_);
1111
+ }
12-
+ public BannerPatternTagsProvider(PackOutput p_256451_, CompletableFuture<HolderLookup.Provider> p_256420_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
13-
+ super(p_256451_, Registries.BANNER_PATTERN, p_256420_, modId, existingFileHelper);
12+
+ public BannerPatternTagsProvider(PackOutput p_256451_, CompletableFuture<HolderLookup.Provider> p_256420_, String modId) {
13+
+ super(p_256451_, Registries.BANNER_PATTERN, p_256420_, modId);
1414
}
1515

1616
@Override

‎patches/net/minecraft/data/tags/BiomeTagsProvider.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import net.minecraft.world.level.biome.MultiNoiseBiomeSourceParameterList;
55

66
public class BiomeTagsProvider extends TagsProvider<Biome> {
7-
+ /** @deprecated Forge: Use the {@linkplain #BiomeTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #BiomeTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public BiomeTagsProvider(PackOutput p_255800_, CompletableFuture<HolderLookup.Provider> p_256205_) {
1010
super(p_255800_, Registries.BIOME, p_256205_);
1111
+ }
12-
+ public BiomeTagsProvider(PackOutput p_255800_, CompletableFuture<HolderLookup.Provider> p_256205_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
13-
+ super(p_255800_, Registries.BIOME, p_256205_, modId, existingFileHelper);
12+
+ public BiomeTagsProvider(PackOutput p_255800_, CompletableFuture<HolderLookup.Provider> p_256205_, String modId) {
13+
+ super(p_255800_, Registries.BIOME, p_256205_, modId);
1414
}
1515

1616
@Override

‎patches/net/minecraft/data/tags/CatVariantTagsProvider.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import net.minecraft.world.entity.animal.CatVariant;
55

66
public class CatVariantTagsProvider extends TagsProvider<CatVariant> {
7-
+ /** @deprecated Forge: Use the {@linkplain #CatVariantTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #CatVariantTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public CatVariantTagsProvider(PackOutput p_256547_, CompletableFuture<HolderLookup.Provider> p_256090_) {
1010
super(p_256547_, Registries.CAT_VARIANT, p_256090_);
1111
+ }
12-
+ public CatVariantTagsProvider(PackOutput p_256547_, CompletableFuture<HolderLookup.Provider> p_256090_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
13-
+ super(p_256547_, Registries.CAT_VARIANT, p_256090_, modId, existingFileHelper);
12+
+ public CatVariantTagsProvider(PackOutput p_256547_, CompletableFuture<HolderLookup.Provider> p_256090_, String modId) {
13+
+ super(p_256547_, Registries.CAT_VARIANT, p_256090_, modId);
1414
}
1515

1616
@Override

‎patches/net/minecraft/data/tags/DamageTypeTagsProvider.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import net.minecraft.world.damagesource.DamageTypes;
55

66
public class DamageTypeTagsProvider extends TagsProvider<DamageType> {
7-
+ /** @deprecated Forge: Use the {@linkplain #DamageTypeTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #DamageTypeTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public DamageTypeTagsProvider(PackOutput p_270719_, CompletableFuture<HolderLookup.Provider> p_270256_) {
1010
super(p_270719_, Registries.DAMAGE_TYPE, p_270256_);
1111
+ }
12-
+ public DamageTypeTagsProvider(PackOutput p_270719_, CompletableFuture<HolderLookup.Provider> p_270256_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
13-
+ super(p_270719_, Registries.DAMAGE_TYPE, p_270256_, modId, existingFileHelper);
12+
+ public DamageTypeTagsProvider(PackOutput p_270719_, CompletableFuture<HolderLookup.Provider> p_270256_, String modId) {
13+
+ super(p_270719_, Registries.DAMAGE_TYPE, p_270256_, modId);
1414
}
1515

1616
@Override

‎patches/net/minecraft/data/tags/EnchantmentTagsProvider.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import net.minecraft.world.item.enchantment.Enchantment;
55

66
public abstract class EnchantmentTagsProvider extends TagsProvider<Enchantment> {
7-
+ /** @deprecated Forge: Use the {@linkplain #EnchantmentTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #EnchantmentTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
public EnchantmentTagsProvider(PackOutput p_341044_, CompletableFuture<HolderLookup.Provider> p_341146_) {
99
super(p_341044_, Registries.ENCHANTMENT, p_341146_);
1010
+ }
11-
+ public EnchantmentTagsProvider(PackOutput p_341044_, CompletableFuture<HolderLookup.Provider> p_341146_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
12-
+ super(p_341044_, Registries.ENCHANTMENT, p_341146_, modId, existingFileHelper);
11+
+ public EnchantmentTagsProvider(PackOutput p_341044_, CompletableFuture<HolderLookup.Provider> p_341146_, String modId) {
12+
+ super(p_341044_, Registries.ENCHANTMENT, p_341146_, modId);
1313
}
1414

1515
protected void tooltipOrder(HolderLookup.Provider p_341105_, ResourceKey<Enchantment>... p_345255_) {

‎patches/net/minecraft/data/tags/EntityTypeTagsProvider.java.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import net.minecraft.world.entity.EntityType;
55

66
public class EntityTypeTagsProvider extends IntrinsicHolderTagsProvider<EntityType<?>> {
7-
+ /** @deprecated Forge: Use the {@linkplain #EntityTypeTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #EntityTypeTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public EntityTypeTagsProvider(PackOutput p_256095_, CompletableFuture<HolderLookup.Provider> p_256572_) {
1010
- super(p_256095_, Registries.ENTITY_TYPE, p_256572_, p_256665_ -> p_256665_.builtInRegistryHolder().key());
11-
+ this(p_256095_, p_256572_, "vanilla", null);
11+
+ this(p_256095_, p_256572_, "vanilla");
1212
+ }
13-
+ public EntityTypeTagsProvider(PackOutput p_256095_, CompletableFuture<HolderLookup.Provider> p_256572_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
14-
+ super(p_256095_, Registries.ENTITY_TYPE, p_256572_, p_256665_ -> p_256665_.builtInRegistryHolder().key(), modId, existingFileHelper);
13+
+ public EntityTypeTagsProvider(PackOutput p_256095_, CompletableFuture<HolderLookup.Provider> p_256572_, String modId) {
14+
+ super(p_256095_, Registries.ENTITY_TYPE, p_256572_, p_256665_ -> p_256665_.builtInRegistryHolder().key(), modId);
1515
}
1616

1717
@Override

‎patches/net/minecraft/data/tags/FlatLevelGeneratorPresetTagsProvider.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorPresets;
55

66
public class FlatLevelGeneratorPresetTagsProvider extends TagsProvider<FlatLevelGeneratorPreset> {
7-
+ /** @deprecated Forge: Use the {@linkplain #FlatLevelGeneratorPresetTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #FlatLevelGeneratorPresetTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public FlatLevelGeneratorPresetTagsProvider(PackOutput p_256604_, CompletableFuture<HolderLookup.Provider> p_255962_) {
1010
super(p_256604_, Registries.FLAT_LEVEL_GENERATOR_PRESET, p_255962_);
1111
+ }
12-
+ public FlatLevelGeneratorPresetTagsProvider(PackOutput p_256604_, CompletableFuture<HolderLookup.Provider> p_255962_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
13-
+ super(p_256604_, Registries.FLAT_LEVEL_GENERATOR_PRESET, p_255962_, modId, existingFileHelper);
12+
+ public FlatLevelGeneratorPresetTagsProvider(PackOutput p_256604_, CompletableFuture<HolderLookup.Provider> p_255962_, String modId) {
13+
+ super(p_256604_, Registries.FLAT_LEVEL_GENERATOR_PRESET, p_255962_, modId);
1414
}
1515

1616
@Override

‎patches/net/minecraft/data/tags/FluidTagsProvider.java.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import net.minecraft.world.level.material.Fluids;
55

66
public class FluidTagsProvider extends IntrinsicHolderTagsProvider<Fluid> {
7-
+ /** @deprecated Forge: Use the {@linkplain #FluidTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #FluidTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public FluidTagsProvider(PackOutput p_255941_, CompletableFuture<HolderLookup.Provider> p_256600_) {
1010
- super(p_255941_, Registries.FLUID, p_256600_, p_256474_ -> p_256474_.builtInRegistryHolder().key());
11-
+ this(p_255941_, p_256600_, "vanilla", null);
11+
+ this(p_255941_, p_256600_, "vanilla");
1212
+ }
13-
+ public FluidTagsProvider(PackOutput p_255941_, CompletableFuture<HolderLookup.Provider> p_256600_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
14-
+ super(p_255941_, Registries.FLUID, p_256600_, p_256474_ -> p_256474_.builtInRegistryHolder().key(), modId, existingFileHelper);
13+
+ public FluidTagsProvider(PackOutput p_255941_, CompletableFuture<HolderLookup.Provider> p_256600_, String modId) {
14+
+ super(p_255941_, Registries.FLUID, p_256600_, p_256474_ -> p_256474_.builtInRegistryHolder().key(), modId);
1515
}
1616

1717
@Override

‎patches/net/minecraft/data/tags/GameEventTagsProvider.java.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
GameEvent.UNEQUIP.key()
55
);
66

7-
+ /** @deprecated Neo: Use the {@linkplain #GameEventTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Neo: Use the {@linkplain #GameEventTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public GameEventTagsProvider(PackOutput p_256060_, CompletableFuture<HolderLookup.Provider> p_255621_) {
1010
- super(p_256060_, Registries.GAME_EVENT, p_255621_);
11-
+ this(p_256060_, p_255621_, "vanilla", null);
11+
+ this(p_256060_, p_255621_, "vanilla");
1212
+ }
1313
+
14-
+ public GameEventTagsProvider(PackOutput p_256060_, CompletableFuture<HolderLookup.Provider> p_255621_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
15-
+ super(p_256060_, Registries.GAME_EVENT, p_255621_, modId, existingFileHelper);
14+
+ public GameEventTagsProvider(PackOutput p_256060_, CompletableFuture<HolderLookup.Provider> p_255621_, String modId) {
15+
+ super(p_256060_, Registries.GAME_EVENT, p_255621_, modId);
1616
}
1717

1818
@Override

‎patches/net/minecraft/data/tags/InstrumentTagsProvider.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import net.minecraft.world.item.Instruments;
55

66
public class InstrumentTagsProvider extends TagsProvider<Instrument> {
7-
+ /** @deprecated Forge: Use the {@linkplain #InstrumentTagsProvider(PackOutput, CompletableFuture, String, net.neoforged.neoforge.common.data.ExistingFileHelper) mod id variant} */
7+
+ /** @deprecated Forge: Use the {@linkplain #InstrumentTagsProvider(PackOutput, CompletableFuture, String) mod id variant} */
88
+ @Deprecated
99
public InstrumentTagsProvider(PackOutput p_256418_, CompletableFuture<HolderLookup.Provider> p_256038_) {
1010
super(p_256418_, Registries.INSTRUMENT, p_256038_);
1111
+ }
12-
+ public InstrumentTagsProvider(PackOutput p_256418_, CompletableFuture<HolderLookup.Provider> p_256038_, String modId, @org.jetbrains.annotations.Nullable net.neoforged.neoforge.common.data.ExistingFileHelper existingFileHelper) {
13-
+ super(p_256418_, Registries.INSTRUMENT, p_256038_, modId, existingFileHelper);
12+
+ public InstrumentTagsProvider(PackOutput p_256418_, CompletableFuture<HolderLookup.Provider> p_256038_, String modId) {
13+
+ super(p_256418_, Registries.INSTRUMENT, p_256038_, modId);
1414
}
1515

1616
@Override

0 commit comments

Comments
 (0)