Fix #1070: Use a tag to configure which fluids are blacklisted in the replicator (#1078)

Author: Technici4n

src/generated/resources/.cache/ab1440d8191c4e24b911c748033c3eee3ed26373

@@ -1,4 +1,4 @@
-// 1.21.1	2024-12-19T01:30:23.9116352	Tags for minecraft:fluid mod id modern_industrialization
+// 1.21.1	2025-04-18T14:28:59.8250922	Tags for minecraft:fluid mod id modern_industrialization
 2e54f5684b3cedb03e10e44437abee3e54590e96 data/c/tags/fluid/acetylene.json
 c28c9db0ff6eb51c1abebea40752b47e4eef41ec data/c/tags/fluid/acrylic_acid.json
 6e39bbfa65dad27d80c546299b5de3f96215a19d data/c/tags/fluid/acrylic_glue.json
@@ -72,3 +72,4 @@ dd47371f0ce7c13df9608ed1c6ba60f2b40d1db9 data/c/tags/fluid/toluene.json
 f18c60fea511cdf78bf733eb86baab43ad1ffbe4 data/c/tags/fluid/tritium.json
 e2f235ae147f53e3f5b0f0f43d4d9e24e9eb2e6c data/c/tags/fluid/uu_matter.json
 3c442976a65abe3c4dc72a84e30f785a3b76bf7e data/c/tags/fluid/vinyl_chloride.json
+e2f235ae147f53e3f5b0f0f43d4d9e24e9eb2e6c data/modern_industrialization/tags/fluid/replicator_blacklist.json

src/generated/resources/data/modern_industrialization/tags/fluid/replicator_blacklist.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "modern_industrialization:uu_matter"
+  ]
+}

src/main/java/aztech/modern_industrialization/MIFluids.java

@@ -120,7 +120,7 @@ public static void init(IEventBus modBus) {
     public static final FluidDefinition SYNTHETIC_RUBBER = fluid("Synthetic Rubber", "synthetic_rubber", 0xff1a1a1a, FULL_OPACITY);
     public static final FluidDefinition TOLUENE = fluid("Toluene", "toluene", 0xff9ce6ed, NEAR_OPACITY);
     public static final FluidDefinition TRITIUM = fluid("Tritium", "tritium", 0xffcc1b50, true);
-    public static final FluidDefinition UU_MATER = fluid("UU Matter", "uu_matter", 0xffff00bf, FULL_OPACITY, false);
+    public static final FluidDefinition UU_MATTER = fluid("UU Matter", "uu_matter", 0xffff00bf, FULL_OPACITY, false);
     public static final FluidDefinition VINYL_CHLORIDE = fluid("Vinyl Chloride", "vinyl_chloride", 0xffeda7d9, MEDIUM_OPACITY);
 
     static {

src/main/java/aztech/modern_industrialization/datagen/tag/MIFluidTagProvider.java

@@ -25,6 +25,7 @@
 
 import aztech.modern_industrialization.MI;
 import aztech.modern_industrialization.MIFluids;
+import aztech.modern_industrialization.machines.blockentities.ReplicatorMachineBlockEntity;
 import java.util.concurrent.CompletableFuture;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
@@ -52,5 +53,8 @@ protected void addTags(HolderLookup.Provider pProvider) {
             tag(FluidTags.create(ResourceLocation.fromNamespaceAndPath("c", def.path())))
                     .add(def.asFluid());
         }
+
+        tag(ReplicatorMachineBlockEntity.BLACKLISTED_FLUIDS)
+                .add(MIFluids.UU_MATTER.asFluid());
     }
 }

src/main/java/aztech/modern_industrialization/machines/blockentities/ReplicatorMachineBlockEntity.java

@@ -44,11 +44,13 @@
 import java.util.Collections;
 import java.util.List;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.tags.FluidTags;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.material.Fluid;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.fluids.FluidType;
 
@@ -60,7 +62,8 @@ public class ReplicatorMachineBlockEntity extends MachineBlockEntity implements
 
     private int progressTick = 0;
 
-    public static final TagKey<Item> BLACKLISTED = TagKey.create(BuiltInRegistries.ITEM.key(), MI.id("replicator_blacklist"));
+    public static final TagKey<Item> BLACKLISTED = ItemTags.create(MI.id("replicator_blacklist"));
+    public static final TagKey<Fluid> BLACKLISTED_FLUIDS = FluidTags.create(MI.id("replicator_blacklist"));
 
     public ReplicatorMachineBlockEntity(BEP bep) {
 
@@ -73,7 +76,7 @@ public ReplicatorMachineBlockEntity(BEP bep) {
         long capacity = FluidType.BUCKET_VOLUME * 256;
 
         List<ConfigurableFluidStack> fluidInput = Collections
-                .singletonList(ConfigurableFluidStack.lockedInputSlot(capacity, MIFluids.UU_MATER.asFluid()));
+                .singletonList(ConfigurableFluidStack.lockedInputSlot(capacity, MIFluids.UU_MATTER.asFluid()));
         List<ConfigurableItemStack> itemInputs = Collections.singletonList(ConfigurableItemStack.standardInputSlot());
         List<ConfigurableItemStack> itemOutputs = Collections.singletonList(ConfigurableItemStack.standardOutputSlot());
 
@@ -130,11 +133,11 @@ private static boolean canReplicate(ItemStack stack) {
             }
         }
 
-        // Disallow anything that contains UU Matter
+        // Disallow anything that contains disallowed fluids
         var fluidItem = stack.getCapability(Capabilities.FluidHandler.ITEM);
         if (fluidItem != null) {
             for (int tank = 0; tank < fluidItem.getTanks(); ++tank) {
-                if (fluidItem.getFluidInTank(tank).getFluid() == MIFluids.UU_MATER.asFluid()) {
+                if (fluidItem.getFluidInTank(tank).is(BLACKLISTED_FLUIDS)) {
                     return false;
                 }
             }
@@ -156,7 +159,7 @@ public boolean replicationStep(boolean simulate) {
                 MIFluidStorage fluidStorage = new MIFluidStorage(inventoryComponent.getFluidInputs());
 
                 long inserted = itemStorage.insertAllSlot(itemVariant, 1, tx);
-                long uuMatterExtraced = fluidStorage.extractAllSlot(MIFluids.UU_MATER.variant(), FluidType.BUCKET_VOLUME / 10, tx);
+                long uuMatterExtraced = fluidStorage.extractAllSlot(MIFluids.UU_MATTER.variant(), FluidType.BUCKET_VOLUME / 10, tx);
 
                 if (inserted == 1 && uuMatterExtraced == FluidType.BUCKET_VOLUME / 10) {
                     if (!simulate) {