mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Add support for tagging StructureFeatures (#8408)
This commit is contained in:
1 parent
82a20911cb
commit
2765c0d8d9
5 files changed
+76
-3
No files matched your search
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2021.
|
||||
* Copyright (c) 2016-2022.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -22,9 +22,12 @@ package net.minecraftforge.debug.misc;
|
||||
import java.util.Set;
|
||||
import java.util.function.Supplier;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.effect.MobEffect;
|
||||
import net.minecraft.world.effect.MobEffects;
|
||||
import net.minecraft.world.item.enchantment.Enchantment;
|
||||
@@ -43,6 +46,7 @@ import net.minecraft.tags.SerializationTags;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.level.levelgen.feature.StructureFeature;
|
||||
import net.minecraftforge.common.ForgeTagHandler;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
@@ -79,6 +83,7 @@ public class CustomTagTypesTest
|
||||
private static final Tag.Named<Potion> DAMAGE = ForgeTagHandler.createOptionalTag(ForgeRegistries.POTIONS, new ResourceLocation(MODID, "damage"));
|
||||
private static final Tag.Named<BlockEntityType<?>> STORAGE = ForgeTagHandler.createOptionalTag(ForgeRegistries.BLOCK_ENTITIES, new ResourceLocation(MODID, "storage"));
|
||||
private static final Tag.Named<MobEffect> BEACON = ForgeTagHandler.createOptionalTag(ForgeRegistries.MOB_EFFECTS, new ResourceLocation(MODID, "beacon"));
|
||||
private static final Tag.Named<StructureFeature<?>> OVERWORLD_TEMPLE = ForgeTagHandler.createOptionalTag(ForgeRegistries.STRUCTURE_FEATURES, new ResourceLocation(MODID, "overworld_temple"));
|
||||
|
||||
public CustomTagTypesTest()
|
||||
{
|
||||
@@ -99,6 +104,7 @@ public class CustomTagTypesTest
|
||||
gen.addProvider(new PotionTags(gen, existingFileHelper));
|
||||
gen.addProvider(new BlockEntityTypeTags(gen, existingFileHelper));
|
||||
gen.addProvider(new MobEffectTypeTags(gen, existingFileHelper));
|
||||
gen.addProvider(new StructureFeatureTags(gen, existingFileHelper));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,6 +121,21 @@ public class CustomTagTypesTest
|
||||
if (blockEntity != null) logTagsIfPresent(blockEntity.getType().getTags());
|
||||
event.getEntityLiving().getActiveEffects().forEach((mobEffectInstance) -> logTagsIfPresent(mobEffectInstance.getEffect().getTags()));
|
||||
}
|
||||
|
||||
if (event.getPlayer().getLevel() instanceof ServerLevel serverLevel)
|
||||
{
|
||||
OVERWORLD_TEMPLE.getValues().forEach(temple -> {
|
||||
final BlockPos found = serverLevel.findNearestMapFeature(temple, event.getPos(), 100, false);
|
||||
if (found != null)
|
||||
{
|
||||
LOGGER.info("Found {} at {}", temple.getRegistryName(), found);
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.info("Could not find {}", temple.getRegistryName());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private void logTagsIfPresent(Set<ResourceLocation> tags)
|
||||
@@ -234,4 +255,25 @@ public class CustomTagTypesTest
|
||||
return "Mob Effect Tags";
|
||||
}
|
||||
}
|
||||
|
||||
public static class StructureFeatureTags extends ForgeRegistryTagsProvider<StructureFeature<?>>
|
||||
{
|
||||
|
||||
public StructureFeatureTags(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
super(gen, ForgeRegistries.STRUCTURE_FEATURES, MODID, existingFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
return "Structure Feature Tags";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addTags()
|
||||
{
|
||||
tag(OVERWORLD_TEMPLE).add(StructureFeature.DESERT_PYRAMID, StructureFeature.JUNGLE_TEMPLE);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user