diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 171d3841a..bca277013 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -109,6 +109,14 @@ function registerGTCEUFluidTags(event) { event.add("c:hidden_from_recipe_viewers", "gtceu:molten_blue_steel"); event.add("c:hidden_from_recipe_viewers", "gtceu:molten_black_bronze"); event.add("c:hidden_from_recipe_viewers", "gtceu:molten_bismuth_bronze"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_rose_gold"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_sterling_silver"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_stainless_steel"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_manganese_phosphide"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_vanadium_steel"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_gallium_arsenide"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_hsla_steel"); + event.add("c:hidden_from_recipe_viewers", "gtceu:molten_rocket_alloy_t2"); event.add("c:hidden_from_recipe_viewers", "gtceu:damascus_steel"); event.add("c:hidden_from_recipe_viewers", "gtceu:blaze"); event.add("c:hidden_from_recipe_viewers", "gtceu:thorium"); diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js index 819cc4757..582f842c5 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.materials.js @@ -6,9 +6,9 @@ * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material */ function getFluidRecipeEUt(material) { - // Special case for bis/black bronze because removing the blast property doesn't change the tier of + // Special case for bis bronze, black bronze, rose gold and sterling silver because removing the blast property doesn't change the tier of // the extractor recipes retroactively - return material.hasProperty(PropertyKey.BLAST) && material !== GTMaterials.BismuthBronze && material !== GTMaterials.BlackBronze + return material.hasProperty(PropertyKey.BLAST) && material !== GTMaterials.BismuthBronze && material !== GTMaterials.BlackBronze && material !== GTMaterials.RoseGold && material !== GTMaterials.SterlingSilver ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.LV]; } diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index a00a7aea5..e6d531c48 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -170,6 +170,15 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:molten_black_bronze_bucket", "gtceu:molten_bismuth_bronze_bucket", + "gtceu:molten_rose_gold_bucket", + "gtceu:molten_sterling_silver_bucket", + "gtceu:molten_stainless_steel_bucket", + "gtceu:molten_manganese_phosphide_bucket", + "gtceu:molten_vanadium_steel_bucket", + "gtceu:molten_gallium_arsenide_bucket", + "gtceu:molten_hsla_steel_bucket", + "gtceu:molten_rocket_alloy_t2_bucket", + "gtceu:molten_desh_bucket", "tfg:molten_weak_blue_steel_bucket", "tfg:molten_weak_red_steel_bucket", diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index d9234d9d1..10ed98e61 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -365,6 +365,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BlackBronze.getProperties().removeProperty(PropertyKey.BLAST); GTMaterials.BlackBronze.getProperties().removeProperty(PropertyKey.ITEM_PIPE); GTMaterials.BlackBronze.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(1696, 20, true, false, false, false)); + // Rose Gold & Sterling Silver + GTMaterials.RoseGold.getProperties().removeProperty(PropertyKey.BLAST); + GTMaterials.SterlingSilver.getProperties().removeProperty(PropertyKey.BLAST); // Red steel fluid pipe - same flow rate as aluminium, bad heat tolerance (same as PE) but can do cryo GTMaterials.RedSteel.setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(370, 75, true, false, true, false)); // Blue steel fluid pipe - same flow rate as aluminium, same temp tolerance as tungsten