molten fluid tags and recipe for fluid tag filter

GregTechCEu · Aug 20, 2024 · 66bcf5a · 66bcf5a
1 parent 884ed61
commit 66bcf5a
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 5 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -30,9 +30,9 @@ dependencies {
     modImplementation forge.flywheel
 
     // JEI
-    modCompileOnly(forge.jei.common.api) { transitive = false }
-    modCompileOnly(forge.jei.forge.api) { transitive = false }
-    modCompileOnly(forge.jei.forge.impl) { transitive = false }
+    modImplementation(forge.jei.common.api) { transitive = false }
+    modImplementation(forge.jei.forge.api) { transitive = false }
+    modImplementation(forge.jei.forge.impl) { transitive = false }
 
     // REI
     modCompileOnly forge.rei.plugin

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/materials/frame.json b/src/generated/resources/assets/gtceu/compass/nodes/materials/frame.json
@@ -4,8 +4,8 @@
     "res": "gtceu:aluminium_frame"
   },
   "items": [
-    "#minecraft:climbable",
-    "#forge:frames"
+    "#forge:frames",
+    "#minecraft:climbable"
   ],
   "page": "gtceu:materials/frame",
   "position": [

diff --git a/src/generated/resources/data/forge/tags/fluids/molten.json b/src/generated/resources/data/forge/tags/fluids/molten.json
@@ -0,0 +1,51 @@
+{
+  "values": [
+    "gtceu:molten_kanthal",
+    "gtceu:molten_nichrome",
+    "gtceu:molten_niobium_nitride",
+    "gtceu:molten_niobium_titanium",
+    "gtceu:molten_sterling_silver",
+    "gtceu:molten_rose_gold",
+    "gtceu:molten_black_bronze",
+    "gtceu:molten_bismuth_bronze",
+    "gtceu:molten_rtm_alloy",
+    "gtceu:molten_stainless_steel",
+    "gtceu:molten_ultimet",
+    "gtceu:molten_vanadium_gallium",
+    "gtceu:molten_yttrium_barium_cuprate",
+    "gtceu:molten_osmiridium",
+    "gtceu:molten_gallium_arsenide",
+    "gtceu:molten_tungsten_carbide",
+    "gtceu:molten_manganese_phosphide",
+    "gtceu:molten_magnesium_diboride",
+    "gtceu:molten_mercury_barium_calcium_cuprate",
+    "gtceu:molten_uranium_triplatinum",
+    "gtceu:molten_samarium_iron_arsenic_oxide",
+    "gtceu:molten_indium_tin_barium_titanium_cuprate",
+    "gtceu:molten_uranium_rhodium_dinaquadide",
+    "gtceu:molten_enriched_naquadah_trinium_europium_duranide",
+    "gtceu:molten_ruthenium_trinium_americium_neutronate",
+    "gtceu:molten_black_steel",
+    "gtceu:molten_tungsten_steel",
+    "gtceu:molten_vanadium_steel",
+    "gtceu:molten_naquadah_alloy",
+    "gtceu:molten_rhodium_plated_palladium",
+    "gtceu:molten_red_steel",
+    "gtceu:molten_blue_steel",
+    "gtceu:molten_hssg",
+    "gtceu:molten_hsse",
+    "gtceu:molten_hsss",
+    "gtceu:molten_tantalum_carbide",
+    "gtceu:molten_hsla_steel",
+    "gtceu:molten_molybdenum_disilicide",
+    "gtceu:molten_zeron_100",
+    "gtceu:molten_watertight_steel",
+    "gtceu:molten_incoloy_ma_956",
+    "gtceu:molten_maraging_steel_300",
+    "gtceu:molten_hastelloy_x",
+    "gtceu:molten_stellite_100",
+    "gtceu:molten_titanium_carbide",
+    "gtceu:molten_titanium_tungsten_carbide",
+    "gtceu:molten_hastelloy_c_276"
+  ]
+}
diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java
@@ -132,4 +132,5 @@ public class CustomTags {
             "chemical_immune");
 
     public static final TagKey<Fluid> LIGHTER_FLUIDS = TagUtil.createFluidTag("lighter_fluid");
+    public static final TagKey<Fluid> MOLTEN_FLUIDS = TagUtil.createFluidTag("molten");
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java
@@ -59,6 +59,8 @@ public static void init(Consumer<FinishedRecipe> provider) {
                 "XXX", "XYX", "XXX", 'X', new UnificationEntry(foil, Zinc), 'Y', new UnificationEntry(plate, Olivine));
         VanillaRecipeHelper.addShapedRecipe(provider, "ore_dictionary_filter_emerald", ORE_DICTIONARY_FILTER.asStack(),
                 "XXX", "XYX", "XXX", 'X', new UnificationEntry(foil, Zinc), 'Y', new UnificationEntry(plate, Emerald));
+        VanillaRecipeHelper.addShapedRecipe(provider, "fluid_tag_filter", TAG_FLUID_FILTER.asStack(),
+                "XXX", "XYX", "XXX", 'X', new UnificationEntry(foil, Zinc), 'Y', new UnificationEntry(plate, Amethyst));
 
         // TODO smart filter
         // VanillaRecipeHelper.addShapedRecipe(provider, "smart_item_filter_olivine", SMART_FILTER.asStack(), "XEX",

diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/FluidTagLoader.java
@@ -1,5 +1,9 @@
 package com.gregtechceu.gtceu.data.tags;
 
+import com.gregtechceu.gtceu.api.GTCEuAPI;
+import com.gregtechceu.gtceu.api.data.chemical.material.Material;
+import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
+import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys;
 import com.gregtechceu.gtceu.common.data.GTMaterials;
 import com.gregtechceu.gtceu.data.recipe.CustomTags;
 
@@ -14,6 +18,13 @@ public class FluidTagLoader {
 
     public static void init(RegistrateTagsProvider<Fluid> provider) {
         create(provider, CustomTags.LIGHTER_FLUIDS, GTMaterials.Butane.getFluid(), GTMaterials.Propane.getFluid());
+
+        for (final Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) {
+            if (material.hasProperty(PropertyKey.ALLOY_BLAST)) {
+                Fluid fluid = material.getProperty(PropertyKey.FLUID).getStorage().get(FluidStorageKeys.MOLTEN);
+                create(provider, CustomTags.MOLTEN_FLUIDS, fluid);
+            }
+        }
     }
 
     public static void create(RegistrateTagsProvider<Fluid> provider, TagKey<Fluid> tag, ResourceLocation... rls) {