Port fabric-tag-api-v1

Author: Su5eD

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricProvidedTagBuilder.java

@@ -16,25 +16,32 @@
 
 package net.fabricmc.fabric.api.datagen.v1.provider;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Stream;
+
+import net.fabricmc.fabric.impl.datagen.ForcedTagEntry;
 import net.minecraft.data.tags.TagsProvider;
+import net.minecraft.data.tags.TagsProvider.TagAppender;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.TagEntry;
 import net.minecraft.tags.TagKey;
+import net.neoforged.neoforge.common.extensions.ITagAppenderExtension;
 
 /**
  * Interface-injected to {@link TagsProvider.TagAppender}.
  */
 @SuppressWarnings("unchecked")
-public interface FabricProvidedTagBuilder<T> {
+public interface FabricProvidedTagBuilder<T> extends ITagAppenderExtension<T> {
 	/**
 	 * Sets the value of the {@code replace} flag. When set to {@code true}
 	 * this tag will replace contents of any other tag.
 	 * @param replace whether to replace the contents of the tag
 	 * @return this, for chaining
 	 */
 	default FabricProvidedTagBuilder<T> setReplace(boolean replace) {
-		throw new AssertionError("Implemented via mixin");
+        replace(replace);
+        return this;
 	}
 
 	/**
@@ -44,16 +51,18 @@ default FabricProvidedTagBuilder<T> setReplace(boolean replace) {
 	 * @return this, for chaining
 	 */
 	default FabricProvidedTagBuilder<T> forceAddTag(TagKey<T> tag) {
-		throw new AssertionError("Implemented via mixin");
+        self().add(new ForcedTagEntry(TagEntry.element(tag.location())));
+        return this;
 	}
 
 	/**
-	 * Removes an entry from the tag.
-	 * @param element The entry to remove from the contents of the tag
-	 * @return this, for chaining
-	 */
-	default FabricProvidedTagBuilder<T> remove(ResourceKey<T> element) {
-		throw new AssertionError("Implemented via mixin");
+     * Removes an entry from the tag.
+     *
+     * @param element The entry to remove from the contents of the tag
+     * @return this, for chaining
+     */
+	default TagAppender<T> remove(ResourceKey<T> element) {
+		return ITagAppenderExtension.super.remove(element);
 	}
 
 	/**
@@ -62,7 +71,8 @@ default FabricProvidedTagBuilder<T> remove(ResourceKey<T> element) {
 	 * @return this, for chaining
 	 */
 	default FabricProvidedTagBuilder<T> remove(final ResourceKey<T>... elements) {
-		throw new AssertionError("Implemented via mixin");
+        removeAll(Arrays.asList(elements));
+        return this;
 	}
 
 	/**
@@ -71,7 +81,10 @@ default FabricProvidedTagBuilder<T> remove(final ResourceKey<T>... elements) {
 	 * @return this, for chaining
 	 */
 	default FabricProvidedTagBuilder<T> removeAll(final Collection<ResourceKey<T>> elements) {
-		throw new AssertionError("Implemented via mixin");
+        for (ResourceKey<T> element : elements) {
+            remove(element);
+        }
+        return this;
 	}
 
 	/**
@@ -80,7 +93,8 @@ default FabricProvidedTagBuilder<T> removeAll(final Collection<ResourceKey<T>> e
 	 * @return this, for chaining
 	 */
 	default FabricProvidedTagBuilder<T> removeAll(final Stream<ResourceKey<T>> elements) {
-		throw new AssertionError("Implemented via mixin");
+		elements.forEach(this::remove);
+        return this;
 	}
 
 	/**
@@ -89,6 +103,11 @@ default FabricProvidedTagBuilder<T> removeAll(final Stream<ResourceKey<T>> eleme
 	 * @return this, for chaining
 	 */
 	default FabricProvidedTagBuilder<T> removeTag(TagKey<T> tag) {
-		throw new AssertionError("Implemented via mixin");
+        remove(tag);
+        return this;
 	}
+
+    private TagsProvider.TagAppender<T> self() {
+        return (TagsProvider.TagAppender<T>) this;
+    }
 }

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java

@@ -16,18 +16,9 @@
 
 package net.fabricmc.fabric.api.datagen.v1.provider;
 
-import java.util.Collection;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import org.jetbrains.annotations.Nullable;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.impl.datagen.ForcedTagEntry;
-import net.fabricmc.fabric.impl.datagen.TagBuilderHooks;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.Registry;
@@ -37,20 +28,20 @@
 import net.minecraft.data.tags.TagsProvider;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.EntityTypeTags;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.tags.GameEventTags;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.TagBuilder;
-import net.minecraft.tags.TagEntry;
-import net.minecraft.tags.TagKey;
+import net.minecraft.tags.*;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.material.Fluid;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
 /**
  * Implement this class (or one of the inner classes) to generate a tag list.
@@ -395,85 +386,5 @@ public final FabricTagBuilder add(ResourceKey<T>... registryKeys) {
 
 			return this;
 		}
-
-		/**
-		 * Remove an element from the tag.
-		 *
-		 * @return the {@link FabricTagBuilder} instance
-		 */
-		public FabricTagBuilder remove(T element) {
-			remove(reverseLookup(element));
-			return this;
-		}
-
-		/**
-		 * Remove multiple elements from the tag.
-		 *
-		 * @return the {@link FabricTagBuilder} instance
-		 */
-		@SafeVarargs
-		public final FabricTagBuilder remove(T... elements) {
-			Stream.of(elements).map(FabricTagProvider.this::reverseLookup).forEach(this::remove);
-			return this;
-		}
-
-		/**
-		 * Remove an element from the tag.
-		 *
-		 * @return the {@link FabricTagBuilder} instance
-		 */
-		@Override
-		public FabricTagBuilder remove(ResourceKey<T> registryKey) {
-			((TagBuilderHooks) this.builder).fabric_removeElement(registryKey.location());
-			return this;
-		}
-
-		/**
-		 * Remove multiple elements from the tag.
-		 *
-		 * @return the {@link FabricTagBuilder} instance
-		 */
-		@SafeVarargs
-		@Override
-		public final FabricTagBuilder remove(ResourceKey<T>... registryKeys) {
-			for (ResourceKey<T> registryKey : registryKeys) {
-				remove(registryKey);
-			}
-
-			return this;
-		}
-
-		/**
-		 * Remove multiple elements from the tag.
-		 *
-		 * @return the {@link FabricTagBuilder} instance
-		 */
-		@Override
-		public FabricTagBuilder removeAll(final Collection<ResourceKey<T>> registryKeys) {
-			registryKeys.forEach(this::remove);
-			return this;
-		}
-
-		/**
-		 * Remove multiple elements from the tag.
-		 *
-		 * @return the {@link FabricTagBuilder} instance
-		 */
-		@Override
-		public FabricTagBuilder removeAll(final Stream<ResourceKey<T>> registryKeys) {
-			registryKeys.forEach(this::remove);
-			return this;
-		}
-
-		/**
-		 * Remove another tag from this tag.
-		 *
-		 * @return the {@link FabricTagBuilder} instance
-		 */
-		@Override
-		public FabricTagBuilder removeTag(TagKey<T> tag) {
-			((TagBuilderHooks) this.builder).fabric_removeTag(tag.location());
-			return this;
-		}
 	}
 }

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/TagBuilderHooks.java

@@ -99,6 +99,7 @@
 import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
+import net.neoforged.neoforge.common.extensions.ITagAppenderExtension;
 
 public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
 	private static final ResourceCondition ALWAYS_LOADED = ResourceConditions.alwaysTrue();
@@ -325,7 +326,7 @@ protected void addTags(HolderLookup.Provider registries) {
 					.remove(Blocks.RED_SAND.builtInRegistryHolder().key())
 					.removeTag(BlockTags.DIRT);
 
-			tag(BlockTags.NEEDS_DIAMOND_TOOL)
+			((ITagAppenderExtension<Block>) tag(BlockTags.NEEDS_DIAMOND_TOOL))
 					.remove(
 							Blocks.ANCIENT_DEBRIS.builtInRegistryHolder().key(),
 							Blocks.NETHERITE_BLOCK.builtInRegistryHolder().key(),
@@ -402,7 +403,7 @@ public void generateAdvancement(HolderLookup.Provider registryLookup, Consumer<A
 					.addCriterion("killed_something", KilledTrigger.TriggerInstance.playerKilledEntity())
 					.save(withConditions(consumer, NEVER_LOADED), MOD_ID + ":test/root_not_loaded");
 			AdvancementHolder adventureChild = Advancement.Builder.advancement()
-					.display(SIMPLE_BLOCK,
+					.display(SIMPLE_BLOCK.value(),
 							Component.translatable("advancements.test.adventure_child.title"),
 							Component.translatable("advancements.test.adventure_child.description"),
 							ResourceLocation.withDefaultNamespace("textures/gui/advancements/backgrounds/end.png"),

fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.tag;
+package net.fabricmc.fabric.mixin.tags;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.mojang.serialization.MapCodec;

…ricmc/fabric/mixin/tag/TagFileMixin.java …icmc/fabric/mixin/tags/TagFileMixin.javafabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/TagFileMixin.java renamed to fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tags/TagFileMixin.java fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tag/TagFileMixin.java renamed to fabric-tag-api-v1/src/main/java/net/fabricmc/fabric/mixin/tags/TagFileMixin.java

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.tag",
+  "package": "net.fabricmc.fabric.mixin.tags",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
     "TagFileMixin"

fabric-tag-api-v1/src/main/resources/fabric-tag-api-v1.mixins.json

@@ -84,7 +84,7 @@ static <T> void assertInTag(GameTestHelper context, Logger logger, String succes
 			HolderSet.Named<T> registryEntryList = lookup.getOrThrow(tag);
 			Set<ResourceKey<T>> actual = registryEntryList.contents
 					.stream()
-					.map(entry -> entry.getKey().orElseThrow())
+					.map(entry -> entry.unwrapKey().orElseThrow())
 					.collect(Collectors.toSet());
 
 			for (ResourceKey<T> key : expected) {
@@ -123,7 +123,7 @@ static <T> void assertTagContent(GameTestHelper context, Logger logger, String s
 			HolderSet.Named<T> registryEntryList = lookup.getOrThrow(tag);
 			Set<ResourceKey<T>> actual = registryEntryList.contents
 					.stream()
-					.map(entry -> entry.getKey().orElseThrow())
+					.map(entry -> entry.unwrapKey().orElseThrow())
 					.collect(Collectors.toSet());
 
 			if (!actual.equals(expected)) {

fabric-tag-api-v1/src/testmod/java/net/fabricmc/fabric/test/tag/TagTestUtils.java

@@ -1,7 +1,7 @@
 loom.platform=neoforge
 fabric.loom.dontRemap=true
 
-implementationVersion=2.2.5
+implementationVersion=2.3.0
 
 versionMc=1.21.1
 versionForge=21.1.219