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

[Change] Support for optional Tags

Browse source
This commit is contained in:
Frank 2023-06-19 22:33:14 +02:00
parent 8a6ad50377
commit 00cb2ea0a7
2 changed files with 83 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/org/betterx/bclib/api/v3/datagen/TagDataProvider.java
View file

@ -4,6 +4,7 @@ import org.betterx.worlds.together.tag.v3.TagRegistry;
import net.minecraft.core.HolderLookup;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagEntry;
import net.minecraft.tags.TagKey;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
@ -74,18 +75,29 @@ public class TagDataProvider<T> extends FabricTagProvider<T> {
return modIDs == null || modIDs.contains(loc.getNamespace());
}
protected boolean isOptional(TagEntry e) {
return (e.verifyIfPresent(id -> false, id -> false));
}
@Override
protected void addTags(HolderLookup.Provider arg) {
tagRegistry.forEachTag((tag, locs, tags) -> {
tagRegistry.forEachEntry((tag, locs, tags) -> {
if (!forceWrite.contains(tag) && locs.isEmpty() && tags.isEmpty()) return;
final FabricTagProvider<T>.FabricTagBuilder builder = getOrCreateTagBuilder(tag);
locs.sort(Comparator.comparing(ResourceLocation::toString));
tags.sort(Comparator.comparing(a -> a.location().toString()));
locs.sort(Comparator.comparing(a -> a.first.toString()));
tags.sort(Comparator.comparing(a -> a.first.location().toString()));
locs.forEach(builder::add);
tags.forEach(builder::forceAddTag);
locs.forEach(pair -> {
if (isOptional(pair.second)) builder.addOptional(pair.first);
else builder.add(pair.first);
});
tags.forEach(pair -> {
if (isOptional(pair.second)) builder.addOptionalTag(pair.first);
else builder.forceAddTag(pair.first);
});
}, (tag, loc) -> forceWrite.contains(tag) || shouldAdd(tag.location()) || this.shouldAdd(loc));
}
}

70
src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java
View file

@ -2,6 +2,7 @@ package org.betterx.worlds.together.tag.v3;
import org.betterx.bclib.BCLib;
import org.betterx.bclib.interfaces.TriConsumer;
import org.betterx.bclib.util.Pair;
import org.betterx.worlds.together.WorldsTogether;
import net.minecraft.core.DefaultedRegistry;
@ -75,6 +76,11 @@ public class TagRegistry<T> {
super.add(tagID, elements);
}
@SafeVarargs
public final void addOptional(TagKey<T> tagID, T... elements) {
super.addOptional(tagID, elements);
}
@SafeVarargs
public final void add(T element, TagKey<T>... tagIDs) {
super.add(element, tagIDs);
@ -97,6 +103,14 @@ public class TagRegistry<T> {
* @param elements array of Elements to add into tag.
*/
public void add(TagKey<Biome> tagID, ResourceKey<Biome>... elements) {
add(tagID, false, elements);
}
public void addOptional(TagKey<Biome> tagID, ResourceKey<Biome>... elements) {
add(tagID, true, elements);
}
void add(TagKey<Biome> tagID, boolean optional, ResourceKey<Biome>... elements) {
if (isFrozen) WorldsTogether.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen.");
synchronized (this) {
Set<TagEntry> set = getSetForTag(tagID);
@ -110,8 +124,9 @@ public class TagRegistry<T> {
break;
}
}
if (id != null) {
set.add(TagEntry.element(id));
set.add(optional ? TagEntry.optionalElement(id) : TagEntry.element(id));
}
}
}
@ -139,6 +154,13 @@ public class TagRegistry<T> {
}
}
@SafeVarargs
public final void addOptional(TagKey<Item> tagID, ItemLike... elements) {
for (ItemLike element : elements) {
addOptional(tagID, element.asItem());
}
}
@SafeVarargs
public final void add(ItemLike element, TagKey<Item>... tagIDs) {
super.add(element.asItem(), tagIDs);
@ -242,12 +264,20 @@ public class TagRegistry<T> {
}
public void addOtherTags(TagKey<T> tagID, TagKey<T>... tags) {
addOtherTags(tagID, false, tags);
}
public void addOptionalOtherTags(TagKey<T> tagID, TagKey<T>... tags) {
addOtherTags(tagID, true, tags);
}
void addOtherTags(TagKey<T> tagID, boolean optional, TagKey<T>... tags) {
if (isFrozen) WorldsTogether.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen.");
Set<TagEntry> set = getSetForTag(tagID);
for (TagKey<T> tag : tags) {
ResourceLocation id = tag.location();
if (id != null) {
set.add(TagEntry.tag(id));
set.add(optional ? TagEntry.optionalTag(id) : TagEntry.tag(id));
}
}
}
@ -259,11 +289,19 @@ public class TagRegistry<T> {
* @param elements array of Elements to add into tag.
*/
protected void add(TagKey<T> tagID, T... elements) {
add(tagID, false, elements);
}
protected void addOptional(TagKey<T> tagID, T... elements) {
add(tagID, true, elements);
}
protected void add(TagKey<T> tagID, boolean optional, T... elements) {
if (isFrozen) WorldsTogether.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen.");
Set<TagEntry> set = getSetForTag(tagID);
for (T element : elements) {
ResourceLocation id = locationProvider.apply(element);
//only add if the set doesn't already contain the element
for (TagEntry tagEntry : set) {
if (!tagEntry.elementOrTag().tag() && tagEntry.elementOrTag().id().equals(id)) {
@ -273,7 +311,7 @@ public class TagRegistry<T> {
}
if (id != null) {
set.add(TagEntry.element(id));
set.add(optional ? TagEntry.optionalElement(id) : TagEntry.element(id));
}
}
}
@ -328,6 +366,30 @@ public class TagRegistry<T> {
});
}
public void forEachEntry(
TriConsumer<TagKey<T>, List<Pair<ResourceLocation, TagEntry>>, List<Pair<TagKey<T>, TagEntry>>> consumer,
BiPredicate<TagKey<T>, ResourceLocation> allow
) {
tags.forEach((tag, set) -> {
List<Pair<ResourceLocation, TagEntry>> locations = new LinkedList<>();
List<Pair<TagKey<T>, TagEntry>> tags = new LinkedList<>();
set.forEach(e -> {
ExtraCodecs.TagOrElementLocation t = e.elementOrTag();
if (allow == null || allow.test(tag, t.id())) {
if (t.tag()) {
tags.add(new Pair<>(TagKey.create(registryKey, t.id()), e));
} else {
locations.add(new Pair<>(t.id(), e));
}
}
});
consumer.accept(tag, locations, tags);
});
}
public void apply(Map<ResourceLocation, List<TagLoader.EntryWithSource>> tagsMap) {
//this.isFrozen = true;
if (BCLib.isDatagen()) {