Skip to content

Commit

Permalink
Add data provider for experiments DP
Browse files Browse the repository at this point in the history
  • Loading branch information
ApexModder committed Jun 25, 2024
1 parent f05f34c commit d979ddb
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"description": {
"translate": "pack.neoforge.experimental.description"
},
"pack_format": 48
"pack_format": 48,
"supported_formats": [
0,
2147483647
]
}
}
33 changes: 33 additions & 0 deletions src/main/java/net/neoforged/neoforge/common/NeoForgeMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package net.neoforged.neoforge.common;

import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Either;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
Expand Down Expand Up @@ -32,12 +33,15 @@
import net.minecraft.core.RegistryCodecs;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.DataProvider;
import net.minecraft.data.PackOutput;
import net.minecraft.data.metadata.PackMetadataGenerator;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.FeatureFlagsMetadataSection;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
import net.minecraft.server.packs.repository.Pack;
Expand All @@ -54,6 +58,8 @@
import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.RangedAttribute;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.flag.FeatureFlagSet;
import net.minecraft.world.flag.FeatureFlags;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.BlockGetter;
Expand Down Expand Up @@ -686,6 +692,33 @@ public void gatherData(GatherDataEvent event) {
gen.addProvider(event.includeClient(), new NeoForgeSpriteSourceProvider(packOutput, lookupProvider, existingFileHelper));
gen.addProvider(event.includeClient(), new VanillaSoundDefinitionsProvider(packOutput, existingFileHelper));
gen.addProvider(event.includeClient(), new NeoForgeLanguageProvider(packOutput));

// mod experimental pack
// custom impl since using PackMetadataGenerator throws "duplicate provider" (getName() is final which is used for provider id)
gen.addProvider(true, new DataProvider() {
@Override
public CompletableFuture<?> run(CachedOutput cache) {
var json = new JsonObject();

json.add(PackMetadataSection.TYPE.getMetadataSectionName(), PackMetadataSection.TYPE.toJson(new PackMetadataSection(
Component.translatable("pack.neoforge.experimental.description"),
DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA),
Optional.of(new InclusiveRange<>(0, Integer.MAX_VALUE)))));

json.add(FeatureFlagsMetadataSection.TYPE.getMetadataSectionName(), FeatureFlagsMetadataSection.TYPE.toJson(new FeatureFlagsMetadataSection(FeatureFlagSet.of(FeatureFlags.MOD_EXPERIMENTAL))));

return DataProvider.saveStable(cache, json, packOutput.getOutputFolder(PackOutput.Target.DATA_PACK)
.resolve("neoforge")
.resolve("datapacks")
.resolve("mod_experimental")
.resolve("pack.mcmeta"));
}

@Override
public String getName() {
return "mod_experimental_pack";
}
});
}

// done in an event instead of deferred to only enable if a mod requests it
Expand Down

0 comments on commit d979ddb

Please sign in to comment.