mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +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
@@ -20,6 +20,7 @@
|
||||
package net.minecraftforge.client.model.generators;
|
||||
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
|
||||
/**
|
||||
* Builder for block models, does not currently provide any additional
|
||||
|
||||
@@ -22,6 +22,7 @@ package net.minecraftforge.client.model.generators;
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
|
||||
/**
|
||||
* Stub class to extend for block model data providers, eliminates some
|
||||
|
||||
@@ -69,6 +69,7 @@ import net.minecraft.state.properties.SlabType;
|
||||
import net.minecraft.state.properties.StairsShape;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Direction.Axis;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
/**
|
||||
|
||||
@@ -29,6 +29,7 @@ import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
|
||||
/**
|
||||
* Builder for item models, adds the ability to build overrides via
|
||||
|
||||
@@ -22,6 +22,7 @@ package net.minecraftforge.client.model.generators;
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
|
||||
/**
|
||||
* Stub class to extend for item model data providers, eliminates some
|
||||
|
||||
@@ -37,6 +37,7 @@ import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraft.client.renderer.model.BlockFaceUV;
|
||||
import net.minecraft.client.renderer.model.BlockPart;
|
||||
import net.minecraft.client.renderer.model.BlockPartFace;
|
||||
|
||||
@@ -23,6 +23,7 @@ import com.google.common.base.Preconditions;
|
||||
|
||||
import net.minecraft.resources.ResourcePackType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
|
||||
public abstract class ModelFile {
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ import net.minecraft.data.DirectoryCache;
|
||||
import net.minecraft.data.IDataProvider;
|
||||
import net.minecraft.resources.ResourcePackType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
|
||||
public abstract class ModelProvider<T extends ModelBuilder<T>> implements IDataProvider {
|
||||
|
||||
|
||||
@@ -188,9 +188,9 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
|
||||
|
||||
if (event.includeServer())
|
||||
{
|
||||
ForgeBlockTagsProvider blockTags = new ForgeBlockTagsProvider(gen);
|
||||
ForgeBlockTagsProvider blockTags = new ForgeBlockTagsProvider(gen, event.getExistingFileHelper());
|
||||
gen.addProvider(blockTags);
|
||||
gen.addProvider(new ForgeItemTagsProvider(gen, blockTags));
|
||||
gen.addProvider(new ForgeItemTagsProvider(gen, blockTags, event.getExistingFileHelper()));
|
||||
gen.addProvider(new ForgeRecipeProvider(gen));
|
||||
gen.addProvider(new ForgeLootTableProvider(gen));
|
||||
}
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.client.model.generators;
|
||||
package net.minecraftforge.common.data;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
@@ -32,28 +32,20 @@ import net.minecraft.data.BlockTagsProvider;
|
||||
|
||||
import static net.minecraftforge.common.Tags.Blocks.*;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ForgeBlockTagsProvider extends BlockTagsProvider
|
||||
{
|
||||
private Set<ResourceLocation> filter = null;
|
||||
|
||||
public ForgeBlockTagsProvider(DataGenerator gen)
|
||||
public ForgeBlockTagsProvider(DataGenerator gen, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
super(gen);
|
||||
super(gen, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void registerTags()
|
||||
{
|
||||
super.registerTags();
|
||||
filter = this.tagToBuilder.entrySet().stream().map(e -> e.getKey()).collect(Collectors.toSet());
|
||||
|
||||
func_240522_a_(CHESTS).addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN);
|
||||
func_240522_a_(CHESTS_ENDER).func_240534_a_(Blocks.ENDER_CHEST);
|
||||
func_240522_a_(CHESTS_TRAPPED).func_240534_a_(Blocks.TRAPPED_CHEST);
|
||||
@@ -131,12 +123,6 @@ public class ForgeBlockTagsProvider extends BlockTagsProvider
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Path makePath(ResourceLocation id)
|
||||
{
|
||||
return filter != null && filter.contains(id) ? null : super.makePath(id); //We don't want to save vanilla tags.
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
|
||||
@@ -19,11 +19,8 @@
|
||||
|
||||
package net.minecraftforge.common.data;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.data.BlockTagsProvider;
|
||||
@@ -39,20 +36,15 @@ import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
public class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
{
|
||||
private Set<ResourceLocation> filter = null;
|
||||
|
||||
public ForgeItemTagsProvider(DataGenerator gen, BlockTagsProvider blockTagProvider)
|
||||
public ForgeItemTagsProvider(DataGenerator gen, BlockTagsProvider blockTagProvider, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
super(gen, blockTagProvider);
|
||||
super(gen, blockTagProvider, "forge", existingFileHelper);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void registerTags()
|
||||
{
|
||||
super.registerTags();
|
||||
filter = this.tagToBuilder.entrySet().stream().map(e -> e.getKey()).collect(Collectors.toSet());
|
||||
|
||||
func_240522_a_(Tags.Items.BONES).func_240534_a_(Items.BONE);
|
||||
func_240522_a_(Tags.Items.BOOKSHELVES).func_240534_a_(Items.BOOKSHELF);
|
||||
func_240521_a_(Tags.Blocks.CHESTS, Tags.Items.CHESTS);
|
||||
@@ -203,12 +195,6 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Path makePath(ResourceLocation id)
|
||||
{
|
||||
return filter != null && filter.contains(id) ? null : super.makePath(id); //We don't want to save vanilla tags.
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
|
||||
@@ -23,8 +23,8 @@ import com.google.common.collect.ImmutableList;
|
||||
import cpw.mods.modlauncher.TransformingClassLoader;
|
||||
import net.minecraft.util.registry.Bootstrap;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.model.generators.ExistingFileHelper;
|
||||
import net.minecraftforge.common.capabilities.CapabilityManager;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.config.ConfigTracker;
|
||||
import net.minecraftforge.fml.config.ModConfig;
|
||||
|
||||
@@ -21,7 +21,7 @@ package net.minecraftforge.fml.event.lifecycle;
|
||||
|
||||
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraftforge.client.model.generators.ExistingFileHelper;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.ModContainer;
|
||||
|
||||
|
||||
Reference in new issue
Block a user