From 40e887488727d6ecb44e5527140a1fa4f15bfcaf Mon Sep 17 00:00:00 2001 From: Indi Date: Tue, 17 Jun 2025 12:31:15 -0700 Subject: [PATCH 1/3] Whitelisted molds and pumps for Beneath Hellforge (#1183) Signed-off-by: Indi --- kubejs/server_scripts/create/tags.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 22487693c..9253c1cbb 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -46,10 +46,18 @@ const registerCreateItemTags = (event) => { event.add('create:blaze_burner_fuel/special', "gtceu:flawless_coal_gem") event.add('create:blaze_burner_fuel/special', "gtceu:exquisite_coal_gem") event.add('create:blaze_burner_fuel/special', "gtceu:coke_gem") - event.add('create:blaze_burner_fuel/special', "beneath:cursecoal") + // Lets the basin be put on top of a charcoal forge event.add('tfc:forge_invisible_whitelist', 'create:basin') + // Allows automation with the 3x3 Hellforge + event.add('tfc:forge_invisible_whitelist', 'tfcchannelcasting:channel') + event.add('tfc:forge_invisible_whitelist', 'tfcchannelcasting:mold_table') + event.add('tfc:forge_invisible_whitelist', 'greate:steel_mechanical_pump') + event.add('tfc:forge_invisible_whitelist', 'greate:aluminum_mechanical_pump') + event.add('tfc:forge_invisible_whitelist', 'greate:stainless_steel_mechanical_pump') + event.add('tfc:forge_invisible_whitelist', 'greate:titanium_mechanical_pump') + event.add('create:non_movable', 'gtceu:wood_crate') event.add('create:non_movable', 'gtceu:bronze_crate') event.add('create:non_movable', 'gtceu:steel_crate') @@ -88,6 +96,14 @@ const registerCreateBlockTags = (event) => { // Lets the basin be put on top of a charcoal forge event.add('tfc:forge_invisible_whitelist', 'create:basin') + + // Allows automation with the 3x3 Hellforge + event.add('tfc:forge_invisible_whitelist', 'tfcchannelcasting:channel') + event.add('tfc:forge_invisible_whitelist', 'tfcchannelcasting:mold_table') + event.add('tfc:forge_invisible_whitelist', 'greate:steel_mechanical_pump') + event.add('tfc:forge_invisible_whitelist', 'greate:aluminum_mechanical_pump') + event.add('tfc:forge_invisible_whitelist', 'greate:stainless_steel_mechanical_pump') + event.add('tfc:forge_invisible_whitelist', 'greate:titanium_mechanical_pump') } From 0b056481894164e873eaef8817d9bba35431bb9e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 19 Jun 2025 12:11:06 +0100 Subject: [PATCH 2/3] fixed a few other steel items being extractable in LV --- kubejs/server_scripts/gregtech/recipes.materials.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 52a6197e4..c77755487 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -79,7 +79,7 @@ function registerGTCEUMetalRecipes(event) { .outputFluids(Fluid.of(material.getFluid(), 144)) .duration(material.getMass() * 6) .category(GTRecipeCategories.EXTRACTOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) + .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV]) } } else if (material.hasProperty(PropertyKey.GEM)) { @@ -598,7 +598,7 @@ function registerGTCEUMetalRecipes(event) { .outputFluids(Fluid.of(material.getFluid(), 14 * 144)) .duration(material.getMass() * 32) .category(GTRecipeCategories.EXTRACTOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) + .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV]) event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_anvil`) .itemInputs(ChemicalHelper.get(TagPrefix.ingot, material, 14)) @@ -674,7 +674,7 @@ function registerGTCEUMetalRecipes(event) { .outputFluids(Fluid.of(material.getFluid(), 144)) .duration(material.getMass() * 8) .category(GTRecipeCategories.EXTRACTOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) + .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV]) event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_unfinished_lamp`) .itemInputs(materialIngotStack) @@ -719,7 +719,7 @@ function registerGTCEUMetalRecipes(event) { .outputFluids(Fluid.of(material.getFluid(), 144)) .duration(material.getMass() * 7) .category(GTRecipeCategories.EXTRACTOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) + .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV]) event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_trapdoor`) .itemInputs(materialIngotStack) @@ -767,7 +767,7 @@ function registerGTCEUMetalRecipes(event) { .outputFluids(Fluid.of(material.getFluid(), 9)) .duration(material.getMass() * 3) .category(GTRecipeCategories.EXTRACTOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) + .EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV]) event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_chain`) .itemInputs(materialIngotStack) From 5f7b9dd29193453025a1b4cca11d99ad41a63ae0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 19 Jun 2025 12:11:56 +0100 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c8217a36..cd8d82457 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fixed double ingots not having a temperature (#1165) @Pyritie - Removed a few recipes that had unobtainable create-related materials @Pyritie - Fixed the color of placed zinc ingots and plated blocks to match the material @Pyritie +- Fixed some other steel/colored steel items being extractable in LV @Pyritie ### Changes - Changed pineapple yarn recipe from assembler to wiremill & coiling machine, like the other strings (#1162) @Pyritie - Lowered durability of wooden tongs @Pyritie