mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Add validation via resources for tag providers (#7271)
BREAKING CHANGE: Moved ExistingFileHelper to common package Remove various workarounds from forge tag providers
This commit is contained in:
1 parent
5dac065994
commit
be5885155c
25 files changed
+191
-121
No files matched your search
@@ -22,14 +22,12 @@ package net.minecraftforge.debug;
|
||||
import static net.minecraftforge.debug.DataGeneratorTest.MODID;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.HashSet;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
@@ -75,7 +73,6 @@ import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraft.world.biome.Biomes;
|
||||
import net.minecraftforge.client.model.generators.BlockStateProvider;
|
||||
import net.minecraftforge.client.model.generators.ConfiguredModel;
|
||||
import net.minecraftforge.client.model.generators.ExistingFileHelper;
|
||||
import net.minecraftforge.client.model.generators.ItemModelProvider;
|
||||
import net.minecraftforge.client.model.generators.ModelBuilder;
|
||||
import net.minecraftforge.client.model.generators.ModelBuilder.Perspective;
|
||||
@@ -86,6 +83,7 @@ import net.minecraftforge.client.model.generators.VariantBlockStateBuilder;
|
||||
import net.minecraftforge.common.crafting.ConditionalAdvancement;
|
||||
import net.minecraftforge.common.crafting.ConditionalRecipe;
|
||||
import net.minecraftforge.common.crafting.conditions.IConditionBuilder;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.common.data.LanguageProvider;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
@@ -115,13 +113,15 @@ public class DataGeneratorTest
|
||||
if (event.includeClient())
|
||||
{
|
||||
gen.addProvider(new Lang(gen));
|
||||
gen.addProvider(new ItemModels(gen, event.getExistingFileHelper()));
|
||||
gen.addProvider(new BlockStates(gen, event.getExistingFileHelper()));
|
||||
// Let blockstate provider see generated item models by passing its existing file helper
|
||||
ItemModelProvider itemModels = new ItemModels(gen, event.getExistingFileHelper());
|
||||
gen.addProvider(itemModels);
|
||||
gen.addProvider(new BlockStates(gen, itemModels.existingFileHelper));
|
||||
}
|
||||
if (event.includeServer())
|
||||
{
|
||||
gen.addProvider(new Recipes(gen));
|
||||
gen.addProvider(new Tags(gen));
|
||||
gen.addProvider(new Tags(gen, event.getExistingFileHelper()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -183,17 +183,14 @@ public class DataGeneratorTest
|
||||
{
|
||||
private Set<ResourceLocation> filter;
|
||||
|
||||
public Tags(DataGenerator gen)
|
||||
public Tags(DataGenerator gen, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
super(gen);
|
||||
super(gen, MODID, existingFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerTags()
|
||||
{
|
||||
super.registerTags();
|
||||
filter = new HashSet<>(this.tagToBuilder.keySet()); // will copy all vanilla tags.
|
||||
|
||||
func_240522_a_(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "test").toString()))
|
||||
.func_240532_a_(Blocks.DIAMOND_BLOCK)
|
||||
.func_240531_a_(BlockTags.STONE_BRICKS)
|
||||
@@ -213,12 +210,6 @@ public class DataGeneratorTest
|
||||
.func_240532_a_(Blocks.DIORITE)
|
||||
.func_240532_a_(Blocks.ANDESITE);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Path makePath(ResourceLocation id)
|
||||
{
|
||||
return filter != null && filter.contains(id) ? null : super.makePath(id); //To escape saving vanilla tags, but still register them.
|
||||
}
|
||||
}
|
||||
|
||||
public static class Lang extends LanguageProvider
|
||||
|
||||
@@ -39,8 +39,8 @@ import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.model.generators.BlockStateProvider;
|
||||
import net.minecraftforge.client.model.generators.ExistingFileHelper;
|
||||
import net.minecraftforge.client.model.generators.ModelFile;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.event.world.PistonEvent;
|
||||
import net.minecraftforge.event.world.PistonEvent.PistonMoveType;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
|
||||
Reference in new issue
Block a user