Add "Washed by 'Liquid'" tag for filtering (#3171)

Co-authored-by: screret <68943070+screret@users.noreply.github.com>

Author: AbyssiusVIII

src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java

@@ -7,6 +7,7 @@
 import com.gregtechceu.gtceu.api.data.chemical.material.ItemMaterialData;
 import com.gregtechceu.gtceu.api.data.chemical.material.Material;
 import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidProperty;
+import com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty;
 import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
 import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack;
 import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
@@ -17,7 +18,6 @@
 import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
 import com.gregtechceu.gtceu.api.registry.registrate.forge.GTClientFluidTypeExtensions;
-import com.gregtechceu.gtceu.common.data.GTBlocks;
 import com.gregtechceu.gtceu.common.data.GTMaterialBlocks;
 import com.gregtechceu.gtceu.common.data.GTMaterialItems;
 import com.gregtechceu.gtceu.config.ConfigHolder;
@@ -72,11 +72,25 @@ public static <T> void generateGTDynamicTags(Map<ResourceLocation, List<TagLoade
                     for (TagKey<Item> materialTag : materialTags) {
                         List<TagLoader.EntryWithSource> tags = new ArrayList<>();
                         itemLikes.forEach(item -> tags.add(new TagLoader.EntryWithSource(
-                                TagEntry.element(BuiltInRegistries.ITEM.getKey(item.get().asItem())),
+                                TagEntry.element(BuiltInRegistries.ITEM.getKey(item.get())),
                                 GTValues.CUSTOM_TAG_SOURCE)));
                         tagMap.computeIfAbsent(materialTag.location(), path -> new ArrayList<>()).addAll(tags);
                     }
 
+                    if (entry.tagPrefix() == TagPrefix.crushed && material.hasProperty(PropertyKey.ORE)) {
+                        OreProperty ore = material.getProperty(PropertyKey.ORE);
+                        Material washedIn = ore.getWashedIn().first();
+                        if (washedIn.isNull()) return;
+                        ResourceLocation generalTag = CustomTags.CHEM_BATH_WASHABLE.location();
+                        ResourceLocation specificTag = generalTag.withSuffix("/" + washedIn.getName());
+
+                        List<TagLoader.EntryWithSource> tags = new ArrayList<>();
+                        itemLikes.forEach(item -> tags.add(new TagLoader.EntryWithSource(
+                                TagEntry.element(BuiltInRegistries.ITEM.getKey(item.get())),
+                                GTValues.CUSTOM_TAG_SOURCE)));
+                        tagMap.computeIfAbsent(generalTag, path -> new ArrayList<>()).addAll(tags);
+                        tagMap.computeIfAbsent(specificTag, path -> new ArrayList<>()).addAll(tags);
+                    }
                 }
             });
 
@@ -133,13 +147,6 @@ public static <T> void generateGTDynamicTags(Map<ResourceLocation, List<TagLoade
                         .add(new TagLoader.EntryWithSource(TagEntry.element(id), GTValues.CUSTOM_TAG_SOURCE));
             });
 
-            GTBlocks.ALL_FUSION_CASINGS.forEach((casingType, block) -> {
-                ResourceLocation blockId = BuiltInRegistries.BLOCK.getKey(block.get());
-                tagMap.computeIfAbsent(CustomTags.TOOL_TIERS[casingType.getHarvestLevel()].location(),
-                        path -> new ArrayList<>())
-                        .add(new TagLoader.EntryWithSource(TagEntry.element(blockId), GTValues.CUSTOM_TAG_SOURCE));
-            });
-
             // if config is NOT enabled, add the pickaxe/axe tags to the "configurable" mineability tags
             if (!ConfigHolder.INSTANCE.machines.requireGTToolsForBlocks) {
                 var tagList = tagMap.computeIfAbsent(BlockTags.MINEABLE_WITH_PICKAXE.location(),

src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java

@@ -120,6 +120,8 @@ public class CustomTags {
     public static final TagKey<Item> STEP_BOOTS = TagUtil.createModItemTag("step_boots");
     public static final TagKey<Item> RUBBER_LOGS = TagUtil.createModItemTag("rubber_logs");
 
+    public static final TagKey<Item> CHEM_BATH_WASHABLE = TagUtil.createModItemTag("chemical_bath_washable");
+
     // Mineability tags
     public static final TagKey<Block> MINEABLE_WITH_WRENCH = TagUtil.createBlockTag("mineable/wrench");
     public static final TagKey<Block> MINEABLE_WITH_WIRE_CUTTER = TagUtil.createBlockTag("mineable/wire_cutter");

src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java

@@ -50,7 +50,7 @@
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.List;
+import java.util.*;
 
 import static com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey.HAZARD;