MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Fix] Empty Tags are not created. This also invalidates other dependant tags

Browse source
This commit is contained in:
Frank 2022-06-08 20:33:54 +02:00
parent 562a1d228a
commit 722343c103
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java
View file

@ -48,6 +48,11 @@ public class CommonBlockTags {
TagAPI.BLOCKS.add(SOUL_GROUND, Blocks.SOUL_SAND, Blocks.SOUL_SOIL); TagAPI.BLOCKS.add(SOUL_GROUND, Blocks.SOUL_SAND, Blocks.SOUL_SOIL);
TagAPI.BLOCKS.add(IS_OBSIDIAN, Blocks.OBSIDIAN, Blocks.CRYING_OBSIDIAN); TagAPI.BLOCKS.add(IS_OBSIDIAN, Blocks.OBSIDIAN, Blocks.CRYING_OBSIDIAN);
TagAPI.BLOCKS.add(MYCELIUM, Blocks.MYCELIUM);
TagAPI.BLOCKS.addOtherTags(MYCELIUM, NETHER_MYCELIUM);
TagAPI.BLOCKS.add(TERRAIN, TagAPI.BLOCKS.add(TERRAIN,
Blocks.MAGMA_BLOCK, Blocks.MAGMA_BLOCK,
Blocks.GRAVEL, Blocks.GRAVEL,
@ -57,7 +62,6 @@ public class CommonBlockTags {
Blocks.BONE_BLOCK, Blocks.BONE_BLOCK,
Blocks.SCULK Blocks.SCULK
); );
TagAPI.BLOCKS.addOtherTags(TERRAIN, TagAPI.BLOCKS.addOtherTags(TERRAIN,
BlockTags.DRIPSTONE_REPLACEABLE, BlockTags.DRIPSTONE_REPLACEABLE,
BlockTags.BASE_STONE_OVERWORLD, BlockTags.BASE_STONE_OVERWORLD,
@ -68,8 +72,5 @@ public class CommonBlockTags {
NETHER_MYCELIUM, NETHER_MYCELIUM,
MYCELIUM, MYCELIUM,
END_STONES); END_STONES);
TagAPI.BLOCKS.add(MYCELIUM, Blocks.MYCELIUM);
TagAPI.BLOCKS.addOtherTags(MYCELIUM, NETHER_MYCELIUM);
} }
} }

17
src/main/java/org/betterx/bclib/api/v2/tag/TagType.java
View file

@ -46,6 +46,7 @@ public class TagType<T> {
@Override @Override
public TagKey<T> makeTag(ResourceLocation id) { public TagKey<T> makeTag(ResourceLocation id) {
initializeTag(id);
return registry return registry
.getTagNames() .getTagNames()
.filter(tagKey -> tagKey.location().equals(id)) .filter(tagKey -> tagKey.location().equals(id))
@ -102,6 +103,10 @@ public class TagType<T> {
this.locationProvider = locationProvider; this.locationProvider = locationProvider;
} }
protected void initializeTag(ResourceLocation tagID){
getSetForTag(tagID);
}
public Set<TagEntry> getSetForTag(ResourceLocation tagID) { public Set<TagEntry> getSetForTag(ResourceLocation tagID) {
return tags.computeIfAbsent(tagID, k -> Sets.newHashSet()); return tags.computeIfAbsent(tagID, k -> Sets.newHashSet());
} }
@ -121,6 +126,11 @@ public class TagType<T> {
* @return the corresponding TagKey {@link TagKey<T>}. * @return the corresponding TagKey {@link TagKey<T>}.
*/ */
public TagKey<T> makeTag(ResourceLocation id) { public TagKey<T> makeTag(ResourceLocation id) {
return creatTagKey(id);
}
protected TagKey<T> creatTagKey(ResourceLocation id) {
initializeTag(id);
return TagKey.create(registryKey, id); return TagKey.create(registryKey, id);
} }
@ -132,7 +142,7 @@ public class TagType<T> {
* @see <a href="https://fabricmc.net/wiki/tutorial:tags">Fabric Wiki (Tags)</a> * @see <a href="https://fabricmc.net/wiki/tutorial:tags">Fabric Wiki (Tags)</a>
*/ */
public TagKey<T> makeCommonTag(String name) { public TagKey<T> makeCommonTag(String name) {
return TagKey.create(registryKey, new ResourceLocation("c", name)); return creatTagKey(new ResourceLocation("c", name));
} }
public void addUntyped(TagKey<T> tagID, ResourceLocation... elements) { public void addUntyped(TagKey<T> tagID, ResourceLocation... elements) {
@ -212,10 +222,11 @@ public class TagType<T> {
if (Registry.BIOME_REGISTRY.equals(registryKey)) InternalBiomeAPI._runBiomeTagAdders(); if (Registry.BIOME_REGISTRY.equals(registryKey)) InternalBiomeAPI._runBiomeTagAdders();
//this.isFrozen = true; //this.isFrozen = true;
this.forEach((id, ids) -> apply(tagsMap.computeIfAbsent(id, key -> Lists.newArrayList()), ids)); this.forEach((id, ids) -> apply(id, tagsMap.computeIfAbsent(id, key -> Lists.newArrayList()), ids));
} }
private static List<TagLoader.EntryWithSource> apply(List<TagLoader.EntryWithSource> builder, private static List<TagLoader.EntryWithSource> apply(ResourceLocation id,
List<TagLoader.EntryWithSource> builder,
Set<TagEntry> ids) { Set<TagEntry> ids) {
ids.forEach(value -> builder.add(new TagLoader.EntryWithSource(value, BCLib.MOD_ID))); ids.forEach(value -> builder.add(new TagLoader.EntryWithSource(value, BCLib.MOD_ID)));
return builder; return builder;