Remove TagBuilderMixin in favor of Forge's TagBuilder#replace

Sinytra · Jul 10, 2023 · aa37ef0 · aa37ef0
1 parent b909fbe
commit aa37ef0
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 90 deletions.
diff --git a/...n-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java b/...n-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java
@@ -254,7 +254,7 @@ private FabricTagBuilder(ProvidedTagBuilder<T> parent) {
  * @return the {@link FabricTagBuilder} instance
  */
  public FabricTagBuilder setReplace(boolean replace) {
- ((net.fabricmc.fabric.impl.datagen.FabricTagBuilder) builder).fabric_setReplace(replace);
+ replace(replace);
  return this;
  }
 

diff --git a/...ta-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricTagBuilder.java b/...ta-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricTagBuilder.java
diff --git a/...ta-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagBuilderMixin.java b/...ta-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagBuilderMixin.java
diff --git a/...a-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagProviderMixin.java b/...a-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagProviderMixin.java
@@ -16,39 +16,17 @@
 
 package net.fabricmc.fabric.mixin.datagen;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Predicate;
-
-import com.google.gson.JsonElement;
 import net.minecraftforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
-import net.minecraft.data.DataWriter;
 import net.minecraft.data.server.tag.TagProvider;
-import net.minecraft.registry.tag.TagBuilder;
-import net.minecraft.registry.tag.TagEntry;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.fabric.impl.datagen.FabricTagBuilder;
-
 @Mixin(TagProvider.class)
 public class TagProviderMixin {
- @Inject(method = { "m_254781_", "lambda$run$6" }, at = @At(value = "INVOKE", target = "Lnet/minecraft/data/DataProvider;writeToPath(Lnet/minecraft/data/DataWriter;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture;"), locals = LocalCapture.CAPTURE_FAILHARD, require = 1)
- public void addReplaced(Predicate<Identifier> predicate, Predicate<Identifier> predicate2, DataWriter dataWriter, Map.Entry<Identifier, TagBuilder> entry, CallbackInfoReturnable<CompletableFuture<?>> cir, Identifier identifier, TagBuilder builder, List<TagEntry> list, List<TagEntry> list2, JsonElement jsonElement, Path path) {
- if (builder instanceof FabricTagBuilder fabricTagBuilder) {
- jsonElement.getAsJsonObject().addProperty("replace", fabricTagBuilder.fabric_isReplaced());
- }
- }
-
  @Redirect(method = "lambda$getOrCreateRawBuilder$9", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/common/data/ExistingFileHelper;trackGenerated(Lnet/minecraft/util/Identifier;Lnet/minecraftforge/common/data/ExistingFileHelper$IResourceType;)V"))
  public void fixExistingFileHelperNPE(@Nullable ExistingFileHelper existingFileHelper, Identifier identifier, ExistingFileHelper.IResourceType resourceType) {
  if (existingFileHelper != null) {

diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json
@@ -6,7 +6,6 @@
  "loot.BlockLootTableGeneratorMixin",
  "TagProviderMixin",
  "ModelProviderMixin",
- "TagBuilderMixin",
  "DataGeneratorMixin"
  ],
  "injectors": {