Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed datagen for loottables and advancements.

Browse source
This commit is contained in:
Talia-12 2023-06-22 00:11:15 +10:00
parent 9d8bf7c568
commit ef12c71e92
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Fabric/src/main/java/at/petrak/hexcasting/fabric/datagen/HexFabricDataGenerators.java
View file

@ -13,14 +13,17 @@ import at.petrak.hexcasting.xplat.IXplatAbstractions;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.data.loot.LootTableProvider;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey; import net.minecraft.tags.TagKey;
import net.minecraft.world.item.*; import net.minecraft.world.item.*;
import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
public class HexFabricDataGenerators implements DataGeneratorEntrypoint { public class HexFabricDataGenerators implements DataGeneratorEntrypoint {
@ -42,7 +45,9 @@ public class HexFabricDataGenerators implements DataGeneratorEntrypoint {
pack.addProvider(HexActionTagProvider::new); pack.addProvider(HexActionTagProvider::new);
gen.addProvider(new HexLootTables(gen)); pack.addProvider((FabricDataGenerator.Pack.Factory<LootTableProvider>) (output) -> new LootTableProvider(
output, Set.of(), List.of(new LootTableProvider.SubProviderEntry(HexLootTables::new, LootContextParamSets.ALL_PARAMS))
));
} }
private static class BlockTagProviderWrapper { private static class BlockTagProviderWrapper {

14
Forge/src/main/java/at/petrak/hexcasting/forge/datagen/ForgeHexDataGenerators.java
View file

@ -15,12 +15,15 @@ import at.petrak.hexcasting.forge.recipe.ForgeModConditionalIngredient;
import at.petrak.hexcasting.xplat.IXplatAbstractions; import at.petrak.hexcasting.xplat.IXplatAbstractions;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
import net.minecraft.data.advancements.AdvancementProvider;
import net.minecraft.data.loot.LootTableProvider;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
import net.minecraftforge.common.Tags; import net.minecraftforge.common.Tags;
import net.minecraftforge.common.ToolActions; import net.minecraftforge.common.ToolActions;
import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.common.data.ExistingFileHelper;
@ -28,6 +31,8 @@ import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
public class ForgeHexDataGenerators { public class ForgeHexDataGenerators {
@ -46,10 +51,13 @@ public class ForgeHexDataGenerators {
DataGenerator gen = ev.getGenerator(); DataGenerator gen = ev.getGenerator();
var output = gen.getPackOutput(); var output = gen.getPackOutput();
var lookup = ev.getLookupProvider();
ExistingFileHelper efh = ev.getExistingFileHelper(); ExistingFileHelper efh = ev.getExistingFileHelper();
gen.addProvider(ev.includeClient(), new HexItemModels(output, efh)); gen.addProvider(ev.includeClient(), new HexItemModels(output, efh));
gen.addProvider(ev.includeClient(), new HexBlockStatesAndModels(output, efh)); gen.addProvider(ev.includeClient(), new HexBlockStatesAndModels(output, efh));
gen.addProvider(ev.includeServer(), new HexAdvancements()); gen.addProvider(ev.includeServer(), new AdvancementProvider(
output, lookup, List.of(new HexAdvancements())
));
} }
private static void configureForgeDatagen(GatherDataEvent ev) { private static void configureForgeDatagen(GatherDataEvent ev) {
@ -59,7 +67,9 @@ public class ForgeHexDataGenerators {
var pack = gen.getPackOutput(); var pack = gen.getPackOutput();
var lookup = ev.getLookupProvider(); var lookup = ev.getLookupProvider();
ExistingFileHelper efh = ev.getExistingFileHelper(); ExistingFileHelper efh = ev.getExistingFileHelper();
gen.addProvider(ev.includeServer(), new HexLootTables()); gen.addProvider(ev.includeServer(), new LootTableProvider(
pack, Set.of(), List.of(new LootTableProvider.SubProviderEntry(HexLootTables::new, LootContextParamSets.ALL_PARAMS))
));
gen.addProvider(ev.includeServer(), new HexplatRecipes(pack, INGREDIENTS, ForgeHexConditionsBuilder::new)); gen.addProvider(ev.includeServer(), new HexplatRecipes(pack, INGREDIENTS, ForgeHexConditionsBuilder::new));
var xtags = IXplatAbstractions.INSTANCE.tags(); var xtags = IXplatAbstractions.INSTANCE.tags();