From 0d5c176d3a4ad9d8921583d79e0b4521ab503806 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 00:26:09 +0100 Subject: [PATCH 01/21] added a resource pack that makes some animals look nicer --- pakku-lock.json | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index 857a69258..b4276ec52 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -5878,6 +5878,39 @@ } ] }, + { + "pakku_id": "v7A0bgYd4KcqmpVA", + "type": "RESOURCE_PACK", + "slug": { + "curseforge": "new-animals-for-terrafirmacraft" + }, + "name": { + "curseforge": "New Animals for TerraFirmaCraft" + }, + "id": { + "curseforge": "1246070" + }, + "files": [ + { + "type": "curseforge", + "file_name": "TerraFirmaCraft_New_Animals.zip", + "mc_versions": [ + "1.20.1" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6436/812/TerraFirmaCraft_New_Animals.zip", + "id": "6436812", + "parent_id": "1246070", + "hashes": { + "sha1": "c3318956eff6b4c9e49e81b89ff2b49eaf16d4dc", + "md5": "09466b7016348fb845c40886f466e9b2" + }, + "required_dependencies": [], + "size": 65591, + "date_published": "2025-04-18T17:00:53.570Z" + } + ] + }, { "pakku_id": "PelbQK42HFCTe5cc", "type": "MOD", From 08e0c4072351e9680e869cc2b7e949e7e3a85d3e Mon Sep 17 00:00:00 2001 From: Xikaro Date: Thu, 5 Jun 2025 17:30:13 +0500 Subject: [PATCH 02/21] bump --- CHANGELOG.md | 3 +++ pakku.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e0d7ac4..b63c4b0cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog ## [Unreleased] +### Changes + +## [0.9.10] - 05.06.2025 ### New features - Added Trowel tool to randomly place blocks from hotbar (#1106) @Redeix - Started work on Brazilian Portuguese translations @gifpxto diff --git a/pakku.json b/pakku.json index d0db97959..d6425913f 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.9", + "version": "0.9.10", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [ From 80fff75580bcdee0f4384b172e8735aa12632989 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 21:44:37 +0100 Subject: [PATCH 03/21] fixes #1130 --- config/ftbquests/quests/chapters/queststfc_tips.snbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 219a9f019..c9a45c9e9 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1996,7 +1996,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)custom(HasPreservation/tfc:brined)" + "ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)custom(HasPreservation/tfc:brined)" } } title: "{quests.tfg_tips.smoke_meat.task}" @@ -5269,7 +5269,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)item(tfc:food/pork)" + "ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)item(tfc:food/pork)" } } title: "{quests.tfg_tips.bacon.task}" From 1942321b1c79be7a7e251d4400737edc935eac1b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 5 Jun 2025 21:48:45 +0100 Subject: [PATCH 04/21] added clean-swing-through-grass mod --- pakku-lock.json | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index a04aece95..3176e285f 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1462,6 +1462,44 @@ } ] }, + { + "pakku_id": "0Cv6dO3ZGvsziQH1", + "type": "MOD", + "slug": { + "curseforge": "clean-swing-through-grass" + }, + "name": { + "curseforge": "Clean Swing Through Grass" + }, + "id": { + "curseforge": "915308" + }, + "files": [ + { + "type": "curseforge", + "file_name": "cleanswing-1.20-1.8.jar", + "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5962/530/cleanswing-1.20-1.8.jar", + "id": "5962530", + "parent_id": "915308", + "hashes": { + "sha1": "c128e24c47ab4a389b3868ff6913ee0631f254e8", + "md5": "84f9950e09245d82f72a6461f57ca30f" + }, + "required_dependencies": [], + "size": 8305, + "date_published": "2024-12-04T16:23:38.883Z" + } + ] + }, { "pakku_id": "PDE7RB7hlFnTfgkq", "type": "MOD", @@ -2494,7 +2532,7 @@ { "pakku_id": "SG15bUHPcW2KqNGd", "type": "MOD", - "side": "BOTH", + "side": "CLIENT", "slug": { "curseforge": "detected-setblock-be-gone" }, @@ -6592,7 +6630,6 @@ "id": { "curseforge": "585406" }, - "export": false, "files": [ { "type": "curseforge", From e8c9346f8aa5f46900b9a37d7d3ee2da6bf1feb3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:12:01 +0100 Subject: [PATCH 05/21] added computercraft/advanced peripherals resource pack --- pakku-lock.json | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pakku-lock.json b/pakku-lock.json index 3176e285f..4aabc5f2a 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1689,6 +1689,45 @@ } ] }, + { + "pakku_id": "On44S9fQbI0vVJTW", + "type": "RESOURCE_PACK", + "slug": { + "curseforge": "computercraft-greg-flavored" + }, + "name": { + "curseforge": "ComputerCraft: Greg Flavored" + }, + "id": { + "curseforge": "1061743" + }, + "files": [ + { + "type": "curseforge", + "file_name": "ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip", + "mc_versions": [ + "1.20.2", + "1.20.5", + "1.20.3", + "1.20.1", + "1.20", + "1.20.6", + "1.20.4" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5560/613/ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip", + "id": "5560613", + "parent_id": "1061743", + "hashes": { + "sha1": "6d1d3642537c40ea813507379941773a49c62f28", + "md5": "57d0168a3d006bca79603d0646594f83" + }, + "required_dependencies": [], + "size": 957439, + "date_published": "2024-07-24T09:35:57.853Z" + } + ] + }, { "pakku_id": "MaU4DxZPJWpFlsaT", "type": "MOD", From 7dc2130819b445ebab6e1cb5660bd66843a209cd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:13:55 +0100 Subject: [PATCH 06/21] fixes #1134 --- CHANGELOG.md | 3 +++ kubejs/server_scripts/gregtech/recipes.materials.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63c4b0cc..937e6bd65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## [Unreleased] +### New features ### Changes +### Bug fixes +- Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie ## [0.9.10] - 05.06.2025 ### New features diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index a3b5bbbc8..1e63e277e 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -666,7 +666,7 @@ function registerGTCEUMetalRecipes(event) { event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_unfinished_lamp`) .itemInputs(unfinishedLampStack) - .itemOutputs([materialIngotStack, glassDustStack]) + .itemOutputs(materialIngotStack) .duration(material.getMass() * 8) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) From a99c2da26cf2893856dad90a08e083a77605a2b0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 11:24:04 +0100 Subject: [PATCH 07/21] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 937e6bd65..7249d00ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### New features ### Changes ### Bug fixes +- Fixed trowel being consumed on use @Redeix - Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie ## [0.9.10] - 05.06.2025 From 0ab15723923dd92fb78703b380f9c06c0335d9d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 23:29:34 +0100 Subject: [PATCH 08/21] added a bunch of circuits to create's assembler recipes --- kubejs/server_scripts/create/recipes.js | 28 +++++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 7035d80c8..684b6ff15 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -373,6 +373,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:rope_pulley') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(22) // Шкиф подъемника event.shaped('create:elevator_pulley', [ @@ -411,6 +412,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:cart_assembler') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(21) // Контроллер рельсы event.shaped('create:controller_rail', [ @@ -477,6 +479,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:mechanical_drill') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(19) event.shaped('create:mechanical_roller', [ 'GBG', @@ -497,6 +500,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:mechanical_roller') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(20) // Редстоуновый контакт event.shaped('2x create:redstone_contact', [ @@ -555,7 +559,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('tfg:create/mechanical_plough') .itemInputs('3x #forge:hoe_heads', '2x #forge:plates/wrought_iron', '#tfg:small_cogwheels', 'create:andesite_casing') - .circuit(4) + .circuit(5) .itemOutputs('create:mechanical_plough') .duration(200) .EUt(20) @@ -715,7 +719,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:andesite_funnel') .itemInputs('#forge:plates/wrought_iron', '#forge:foils/rubber') .itemOutputs('create:andesite_funnel') - .circuit(4) + .circuit(6) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -732,7 +736,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:andesite_funnel_leather') .itemInputs('#forge:plates/wrought_iron', '#forge:leather') .itemOutputs('create:andesite_funnel') - .circuit(4) + .circuit(7) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -752,7 +756,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:brass_funnel') .itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube') .itemOutputs('2x create:brass_funnel') - .circuit(6) + .circuit(8) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -771,7 +775,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:brass_funnel_leather') .itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube') .itemOutputs('2x create:brass_funnel') - .circuit(6) + .circuit(9) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -789,7 +793,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:andesite_tunnel') .itemInputs('#forge:plates/wrought_iron', '#forge:foils/rubber') .itemOutputs('create:andesite_tunnel') - .circuit(5) + .circuit(10) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -806,7 +810,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:andesite_tunnel_leather') .itemInputs('#forge:plates/wrought_iron', '#forge:leather') .itemOutputs('create:andesite_tunnel') - .circuit(5) + .circuit(11) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -825,7 +829,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:brass_tunnel') .itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube') .itemOutputs('2x create:brass_tunnel') - .circuit(5) + .circuit(12) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -843,7 +847,7 @@ const registerCreateRecipes = (event) => { event.recipes.gtceu.assembler('create:brass_tunnel_leather') .itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube') .itemOutputs('2x create:brass_tunnel') - .circuit(5) + .circuit(13) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) @@ -863,6 +867,7 @@ const registerCreateRecipes = (event) => { .itemInputs('2x #forge:plates/wrought_iron', '2x #forge:rings/wrought_iron', '#forge:small_gears') .itemOutputs('create:display_board') .duration(50) + .circuit(14) .EUt(GTValues.VA[GTValues.ULV]) // Латунная рука @@ -913,6 +918,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('2x create:electron_tube') .duration(50) .EUt(7) + .circuit(14) event.shaped('4x create:electron_tube', [ 'FAG', @@ -1687,6 +1693,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:contraption_controls') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(18) event.shaped('create:wrench', [ ' BB', @@ -1757,6 +1764,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:redstone_link') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(17) event.shaped('create:display_link', [ 'FED', @@ -1833,6 +1841,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:mechanical_bearing') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(15) event.shaped('create:gantry_carriage', [ 'DCE', @@ -1871,6 +1880,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:weighted_ejector') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(16) event.shaped('create:turntable', [ 'DA ', From 8beb9ba0902d67745355fd791ceae0db10c12654 Mon Sep 17 00:00:00 2001 From: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> Date: Sun, 8 Jun 2025 18:21:46 -0300 Subject: [PATCH 09/21] Conflict issues fix (#1141) * Remove Scaffolding Frame recipe Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update Scaffolding Frame recipe Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Fix Glass Jar conflict Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --------- Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --- kubejs/server_scripts/tfc/recipes.machines.js | 2 +- kubejs/server_scripts/tfg/recipes.miscellaneous.js | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index ee2542c74..ac2370124 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -355,7 +355,7 @@ function registerTFCMachineRecipes(event) { // Empty Jar event.recipes.gtceu.alloy_smelter('tfc:jar_alloying') .itemInputs('#tfc:glass_batches_tier_2') - .notConsumable('gtceu:cylinder_casting_mold') + .notConsumable('gtceu:ball_casting_mold') .itemOutputs('tfc:empty_jar') .duration(100) .EUt(2) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index c9f7e2374..9c8e2ee1b 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -124,7 +124,7 @@ function registerTFGMiscellaneousRecipes(event) { .outputFluids(Fluid.of('firmalife:curdled_goat_milk', 1000)) .duration(300) .EUt(GTValues.VA[GTValues.LV]) - + //Scaffolding Frame event.shaped('tfg:scaffolding_frame', [ @@ -136,13 +136,7 @@ function registerTFGMiscellaneousRecipes(event) { A: '#forge:rods/wood', B: '#forge:cloth' }).id('tfg:shaped/scaffolding_frame'); - - event.recipes.gtceu.assembler('tfg:assembler/scaffolding_frame') - .itemInputs('4x #forge:rods/wood', '#forge:cloth') - .itemOutputs('tfg:scaffolding_frame') - .duration(10) - .EUt(GTValues.VA[GTValues.ULV]); - + //Airship Hull event.shaped('tfg:airship_hull', [ 'A B', @@ -485,4 +479,4 @@ function registerTFGMiscellaneousRecipes(event) { .duration(40) .circuit(4) .EUt(GTValues.VA[GTValues.ULV]) -} \ No newline at end of file +} From e4014d1d6e8e4bb8b11974f3dcc065bcf1a5ec35 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Sun, 8 Jun 2025 17:22:01 -0400 Subject: [PATCH 10/21] Small fixes for Empty Jar, Beekeeper quest and Assembler Chute (#1142) * Fix Chute Assembler recipe * Fix quest tips beekeper * Fix for wine and jar alloy smelter conflicting recipe * fix to fit #1141 * mistakes were made * Fix jetpack 1 quest mv * Mistake again * Revert the fix on chute --- config/ftbquests/quests/chapters/mv__medium_voltage.snbt | 4 ++-- config/ftbquests/quests/chapters/queststfc_tips.snbt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index af23a8289..043c8d484 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1268,12 +1268,12 @@ { dependencies: ["45769156F4253C86"] dependency_requirement: "one_completed" - description: ["{quests.medium_voltage.mv_.desc}"] + description: ["{quests.medium_voltage.mv_jetpack.desc}"] id: "6FA956DAA72D6139" optional: true shape: "heart" size: 1.0d - subtitle: "{quests.medium_voltage.mv_.subtitle}" + subtitle: "{quests.medium_voltage.mv_jetpack.subtitle}" tasks: [{ id: "022324F9630960C6" item: { diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index c9a45c9e9..91963f4fd 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1269,6 +1269,7 @@ Damage: 0 } } + optional_task: true type: "item" } { @@ -1280,6 +1281,7 @@ Damage: 0 } } + optional_task: true type: "item" } { @@ -1291,6 +1293,7 @@ Damage: 0 } } + optional_task: true type: "item" } { @@ -1302,6 +1305,7 @@ Damage: 0 } } + optional_task: true type: "item" } { From 2a0f11bd152820eb5f2b5763a89f3283ccac49ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A5=93?= Date: Mon, 9 Jun 2025 23:54:04 +0800 Subject: [PATCH 11/21] Include ElytraServers/Greate-Encased-Cogwheel-Drop-Fix (#1148) --- ...site_encased_large_aluminium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_andesite_alloy_cogwheel.json | 21 +++++++++++++++++++ ...e_encased_large_darmstadtium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_naquadah_alloy_cogwheel.json | 21 +++++++++++++++++++ ...ite_encased_large_neutronium_cogwheel.json | 21 +++++++++++++++++++ ...rge_rhodium_plated_palladium_cogwheel.json | 21 +++++++++++++++++++ ...ncased_large_stainless_steel_cogwheel.json | 21 +++++++++++++++++++ ...andesite_encased_large_steel_cogwheel.json | 21 +++++++++++++++++++ ...esite_encased_large_titanium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_tungsten_steel_cogwheel.json | 21 +++++++++++++++++++ ...rass_encased_large_aluminium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_andesite_alloy_cogwheel.json | 21 +++++++++++++++++++ ...s_encased_large_darmstadtium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_naquadah_alloy_cogwheel.json | 21 +++++++++++++++++++ ...ass_encased_large_neutronium_cogwheel.json | 21 +++++++++++++++++++ ...rge_rhodium_plated_palladium_cogwheel.json | 21 +++++++++++++++++++ ...ncased_large_stainless_steel_cogwheel.json | 21 +++++++++++++++++++ .../brass_encased_large_steel_cogwheel.json | 21 +++++++++++++++++++ ...brass_encased_large_titanium_cogwheel.json | 21 +++++++++++++++++++ ...encased_large_tungsten_steel_cogwheel.json | 21 +++++++++++++++++++ 20 files changed, 420 insertions(+) create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json create mode 100644 kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json new file mode 100644 index 000000000..e14f22878 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_aluminium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_aluminium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json new file mode 100644 index 000000000..09304f82f --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_andesite_alloy_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_andesite_alloy_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json new file mode 100644 index 000000000..ec3f612b3 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_darmstadtium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_darmstadtium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json new file mode 100644 index 000000000..965a57b1d --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_naquadah_alloy_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_naquadah_alloy_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json new file mode 100644 index 000000000..c6fb85829 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_neutronium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_neutronium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json new file mode 100644 index 000000000..8d26ac33b --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_rhodium_plated_palladium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json new file mode 100644 index 000000000..2580d9875 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_stainless_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_stainless_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json new file mode 100644 index 000000000..221f23fdb --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json new file mode 100644 index 000000000..408bcdbd6 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_titanium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_titanium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json new file mode 100644 index 000000000..444e3d5b1 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_tungsten_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/andesite_encased_large_tungsten_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json new file mode 100644 index 000000000..a7a746480 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_aluminium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_aluminium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json new file mode 100644 index 000000000..687399fa3 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_andesite_alloy_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_andesite_alloy_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json new file mode 100644 index 000000000..bbd6490e1 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_darmstadtium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_darmstadtium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json new file mode 100644 index 000000000..d2cf7859b --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_naquadah_alloy_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_naquadah_alloy_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json new file mode 100644 index 000000000..26bce8b0a --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_neutronium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_neutronium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json new file mode 100644 index 000000000..84a91c18e --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_rhodium_plated_palladium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_rhodium_plated_palladium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json new file mode 100644 index 000000000..a71faa358 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_stainless_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_stainless_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json new file mode 100644 index 000000000..1c6189f67 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_steel_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json new file mode 100644 index 000000000..a2e4466d2 --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_titanium_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_titanium_cogwheel" +} \ No newline at end of file diff --git a/kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json new file mode 100644 index 000000000..8fdc6db6b --- /dev/null +++ b/kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "greate:large_tungsten_steel_cogwheel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "greate:blocks/brass_encased_large_tungsten_steel_cogwheel" +} \ No newline at end of file From 158f2c112cd565474d42f64f927588e76c817e58 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Mon, 9 Jun 2025 10:56:02 -0500 Subject: [PATCH 12/21] gregtech facade crafting (#1145) * Update recipes.js * Whitelist Tag from Redeix * Update tags.js * fixed create copper blocks tag * added more blocks to facades * Fixed industrial iron * changed facades to tfg * changed tag to tfg * updated tag to tfg from ae2 --- kubejs/server_scripts/ae2/tags.js | 2 +- kubejs/server_scripts/gregtech/recipes.js | 26 +- kubejs/server_scripts/tfg/tags.facades.js | 324 +++++++++++++++++++++ kubejs/server_scripts/tfg/tags.js | 1 + kubejs/startup_scripts/create/constants.js | 53 +--- 5 files changed, 352 insertions(+), 54 deletions(-) create mode 100644 kubejs/server_scripts/tfg/tags.facades.js diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index 719cf7567..90cf5ce3d 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -5,7 +5,7 @@ const registerAE2ItemTags = (event) => { global.AE2_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) - }) + }) } const registerAE2BlockTags = (event) => { diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 09cec2dc8..927ec9b51 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1132,7 +1132,31 @@ const registerGTCEURecipes = (event) => { .EUt(2) //#endregion - + + //#region GT Facades + event.shapeless(Item.of('gtceu:facade_cover', 8, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/iron', "#tfg:whitelisted/facades"]) + .modifyResult((craftingGrid, result) => + { + let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id + + console.log(blockID) + let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}" + result.nbt = facadeNBT + return result; + }).id('gtceu:facade_cover'); + + event.shapeless(Item.of('gtceu:facade_cover', 32, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/titanium', "#tfg:whitelisted/facades"]) + .modifyResult((craftingGrid, result) => + { + let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id + + console.log(blockID) + let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}" + result.nbt = facadeNBT + return result; + }).id('gtceu:facade_cover32'); + //#endregion + event.recipes.gtceu.laser_engraver('tfg:diamond_gear') .itemInputs('4x #forge:plates/diamond') .itemOutputs('#forge:gears/diamond') diff --git a/kubejs/server_scripts/tfg/tags.facades.js b/kubejs/server_scripts/tfg/tags.facades.js new file mode 100644 index 000000000..abbdb17f9 --- /dev/null +++ b/kubejs/server_scripts/tfg/tags.facades.js @@ -0,0 +1,324 @@ +// priority: 0 + +function registerFacadeWhitelistTags(event) { + + const facade_materials = [ + //tags + '#tfc:rock/bricks', + '#tfc:rock/smooth', + '#tfc:rock/gravel', + '#tfc:rock/cracked_bricks', + '#tfc:rock/chiseled', + '#tfc:rock/raw', + '#tfc:metal_plated_blocks', + + '#tfc:colored_raw_alabaster', + '#tfc:colored_bricks_alabaster', + '#tfc:colored_polished_alabaster', + '#tfc:mud_bricks', + '#forge:sandstone', + '#forge:storage_blocks', + '#forge:glass', + '#minecraft:terracotta', + '#create:casing', + '#dormum_ornamentum:brick_items', + '#simplylight:any_lamp_on', + '#simplylight:any_lamp_off', + '#minecraft:planks', + '#minecraft:logs', + //rnr shingles + 'rnr:ceramic_roof', + 'rnr:terracotta_roof', + + //tfc blocks + 'tfc:fire_bricks', + 'tfc:aggregate', + 'tfc:alabaster/raw', + 'tfc:alabaster/bricks', + 'tfc:alabaster/polished', + + //firmalife blocks + 'firmalife:metal/blocks/stainless_steel', + 'firmalife:metal/blocks/chromium', + 'firmalife:sealed_bricks', + 'firmalife:chiseled_sealed_bricks', + 'firmalife:polished_sealed_bricks', + + //gtceu blocks + 'gtceu:coke_oven_bricks', + 'gtceu:firebricks', + 'gtceu:wood_wall', + 'gtceu:tempered_glass', + 'gtceu:laminated_glass', + 'gtceu:plascrete', + 'gtceu:cleanroom_glass', + + //gtceu casing + 'gtceu:steam_machine_casing', + 'gtceu:heatproof_machine_casing', + 'gtceu:frostproof_machine_casing', + 'gtceu:solid_machine_casing', + 'gtceu:clean_machine_casing', + 'gtceu:stable_machine_casing', + 'gtceu:robust_machine_casing', + 'gtceu:inert_machine_casing', + 'gtceu:sturdy_machine_casing', + 'gtceu:stainless_evaporation_casing', + 'gtceu:nonconducting_casing', + 'gtceu:vibration_safe_casing', + 'gtceu:watertight_casing', + 'gtceu:secure_maceration_casing', + 'gtceu:high_temperature_smelting_casing', + 'gtceu:laser_safe_engraving_casing', + 'gtceu:large_scale_assembler_casing', + 'gtceu:shock_proof_cutting_casing', + 'gtceu:stress_proof_casing', + 'gtceu:corrosion_proof_casing', + 'gtceu:reaction_safe_mixing_casing', + 'gtceu:assembly_line_casing', + 'gtceu:titanium_turbine_casing', + 'gtceu:stainless_turbine_casing', + 'gtceu:tungstensteel_turbine_casing', + 'gtceu:computer_casing', + 'gtceu:advanced_computer_casing', + 'gtceu:high_power_casing', + + //gtceu hazard signs + 'gtceu:acid_hazard_sign_block', + 'gtceu:antimatter_hazard_sign_block', + 'gtceu:bio_hazard_sign_block', + 'gtceu:boss_hazard_sign_block', + 'gtceu:causality_hazard_sign_block', + 'gtceu:explosion_hazard_sign_block', + 'gtceu:fire_hazard_sign_block', + 'gtceu:frost_hazard_sign_block', + 'gtceu:generic_hazard_sign_block', + 'gtceu:gregification_hazard_sign_block', + 'gtceu:high_pressure_hazard_sign_block', + 'gtceu:high_voltage_hazard_sign_block', + 'gtceu:laser_hazard_sign_block', + 'gtceu:magic_hazard_sign_block', + 'gtceu:magnetic_hazard_sign_block', + 'gtceu:mob_infestation_hazard_sign_block', + 'gtceu:mob_spawner_hazard_sign_block', + 'gtceu:noise_hazard_sign_block', + 'gtceu:radioactive_hazard_sign_block', + 'gtceu:spatial_storage_hazard_sign_block', + 'gtceu:turret_hazard_sign_block', + 'gtceu:void_hazard_sign_block', + 'gtceu:yellow_stripes_block_a', + 'gtceu:yellow_stripes_block_b', + + //windows + 'create:dark_oak_window', + 'create:mangrove_window', + 'create:ornate_iron_window', + 'create_connected:cherry_window', + 'create_connected:bamboo_window', + 'createdeco:andesite_window', + 'createdeco:copper_window', + 'createdeco:iron_window', + 'createdeco:industrial_iron_window', + 'createdeco:brass_window', + 'createdeco:zinc_window', + 'everycomp:c/domum_ornamentum/cactus_window', + 'everycomp:c/domum_ornamentum/cactus_extra_window', + 'ae2:quartz_glass', + + //create deco + 'createdeco:andesite_sheet_metal', + 'createdeco:brass_sheet_metal', + 'createdeco:iron_sheet_metal', + 'createdeco:copper_sheet_metal', + 'createdeco:industrial_iron_sheet_metal', + 'createdeco:zinc_sheet_metal' + ]; + + const mc_colors = + [ + 'white', + 'orange', + 'magenta', + 'light_blue', + 'yellow', + 'lime', + 'pink', + 'gray', + 'light_gray', + 'cyan', + 'purple', + 'blue', + 'brown', + 'green', + 'red', + 'black' + ] + + const wood_types_tfc = + [ + 'acacia', + 'ash', + 'aspen', + 'birch', + 'blackwood', + 'chestnut', + 'douglas_fir', + 'hickory', + 'kapok', + 'mangrove', + 'maple', + 'oak', + 'palm', + 'pine', + 'rosewood', + 'sequoia', + 'spruce', + 'sycamore', + 'white_cedar', + 'willow' + ] + + const wood_types_afc = + [ + 'baobao', + 'eucalyptus', + 'mahogany', + 'heavea', + 'tualang', + 'teak', + 'cypress', + 'fig', + 'ironwood', + 'ipe' + ] + + const createdeco_bricks_fm = + [ + 'pearl_bricks', + 'verdant_bricks', + 'red_bricks', + 'dean_bricks', + 'umber_bricks', + 'dusk_bricks', + 'blue_bricks', + 'scarlet_bricks' + ] + + const gtceu_stonelike_fm = + [ + 'light_concrete', + 'dark_concrete', + 'red_granite', + 'marble' + ] + + const create_copper_fm = + [ + 'copper', + 'exposed_copper', + 'weathered_copper', + 'oxidized_copper' + ] + + const create_rock_types_fm = + [ + 'granite', + 'diorite', + 'andesite', + 'calcite', + 'dripstone', + 'deepslate', + 'limestone' + //'ochrum', + //'scoria', + //'scorchia', + //'veridium' + //'tuff', + //'asurine', + //'crimsite', + ] + + //misc blocks + facade_materials.forEach(facade_material => { + event.add('tfg:whitelisted/facades', `${facade_material}`) + }); + + //gtceu stonelike stuff + gtceu_stonelike_fm.forEach(facade_material => { + if(facade_material != 'marble') + { + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_cobblestone') + event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_cobblestone') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'gtceu:cracked_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_bricks') + } + + event.add('tfg:whitelisted/facades', 'gtceu:polished_' + facade_material) + event.add('tfg:whitelisted/facades', 'gtceu:chiseled' + facade_material) + + event.add('tfg:whitelisted/facades', 'gtceu:small_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'gtceu:square_' + facade_material + '_bricks') + + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_tile') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_small_tile') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_a') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_b') + }); + + //gtceu misc colored blocks + mc_colors.forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_metal_sheet') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_large_metal_sheet') + event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_studs') + }); + + //create copper + create_copper_fm.forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_shingles') + event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_tiles') + }); + + //create rocks + create_rock_types_fm.forEach(facade_material => { + + if(facade_material == 'limestone') + { + event.add('tfg:whitelisted/facades', 'create:' + facade_material) + } + + event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material) + event.add('tfg:whitelisted/facades', 'create:polished_cut_' + facade_material) + event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'create:small_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', 'create:layered_' + facade_material) + event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_pillar') + }); + + //rnr shingles + wood_types_tfc.concat(wood_types_afc).forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'rnr:wood/shingles/' + facade_material) + }); + + //createdeco bricks + createdeco_bricks_fm.forEach(facade_material => { + if (facade_material != 'red_bricks') + { + event.add('tfg:whitelisted/facades', 'createdeco:' + facade_material) + } + event.add('tfg:whitelisted/facades', 'createdeco:short_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:long_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:tiled_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:corner_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:cracked_' + facade_material) + event.add('tfg:whitelisted/facades', 'createdeco:mossy_' + facade_material) + }); + + //everycomp windows + wood_types_tfc.forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'everycomp:c/tfc/' + facade_material + '_window') + }); + wood_types_afc.forEach(facade_material => { + event.add('tfg:whitelisted/facades', 'everycomp:c/afc/' + facade_material + '_window') + }); +} diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 852abde96..59f697f36 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -1,6 +1,7 @@ const registerTFGItemTags = (event) => { registerTFGTrimTags(event) + registerFacadeWhitelistTags(event) //temporary hidden items event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small') diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 8fec001aa..c78f93e53 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -186,63 +186,12 @@ global.CREATE_DISABLED_ITEMS = [ 'create:warped_window_pane', // Blocks - 'create:andesite_alloy_block', - 'create:industrial_iron_block', + 'create:andesite_alloy_block', 'create:experience_block', 'create:rose_quartz_block', 'create:rose_quartz_tiles', 'create:small_rose_quartz_tiles', - // Shit Copper Blocks (Когда гребаный Create стал модом про декор) - 'create:oxidized_copper_tiles', - 'create:copper_tile_slab', - 'create:exposed_copper_tile_slab', - 'create:weathered_copper_tile_slab', - 'create:oxidized_copper_tile_slab', - 'create:copper_tile_stairs', - 'create:exposed_copper_tile_stairs', - 'create:weathered_copper_tile_stairs', - 'create:oxidized_copper_tile_stairs', - 'create:copper_shingles', - 'create:exposed_copper_shingles', - 'create:weathered_copper_shingles', - 'create:oxidized_copper_shingles', - 'create:copper_shingle_slab', - 'create:exposed_copper_shingle_slab', - 'create:weathered_copper_shingle_slab', - 'create:oxidized_copper_shingle_slab', - 'create:copper_shingle_stairs', - 'create:exposed_copper_shingle_stairs', - 'create:weathered_copper_shingle_stairs', - 'create:oxidized_copper_shingle_stairs', - 'create:waxed_copper_shingles', - 'create:waxed_exposed_copper_shingles', - 'create:waxed_weathered_copper_shingles', - 'create:waxed_oxidized_copper_shingles', - 'create:waxed_copper_shingle_slab', - 'create:waxed_exposed_copper_shingle_slab', - 'create:waxed_weathered_copper_shingle_slab', - 'create:waxed_oxidized_copper_shingle_slab', - 'create:waxed_copper_shingle_stairs', - 'create:waxed_exposed_copper_shingle_stairs', - 'create:waxed_weathered_copper_shingle_stairs', - 'create:waxed_oxidized_copper_shingle_stairs', - 'create:copper_tiles', - 'create:exposed_copper_tiles', - 'create:weathered_copper_tiles', - 'create:waxed_copper_tiles', - 'create:waxed_exposed_copper_tiles', - 'create:waxed_weathered_copper_tiles', - 'create:waxed_oxidized_copper_tiles', - 'create:waxed_copper_tile_slab', - 'create:waxed_exposed_copper_tile_slab', - 'create:waxed_weathered_copper_tile_slab', - 'create:waxed_oxidized_copper_tile_slab', - 'create:waxed_copper_tile_stairs', - 'create:waxed_exposed_copper_tile_stairs', - 'create:waxed_weathered_copper_tile_stairs', - 'create:waxed_oxidized_copper_tile_stairs', - // Other 'create:honey_bucket', 'create:chocolate_bucket', From c11e13c9497660dfb3b06ed933ef778ac3ae5622 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 18:46:30 +0100 Subject: [PATCH 13/21] fixes #1149 --- .../gregtech/recipes.machines.js | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 1dd94ab88..2224f956b 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -718,6 +718,30 @@ function registerGTCEuMachineRecipes(event) { .EUt(GTValues.VA[GTValues.ZPM]) .stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32)) + event.remove({ id: 'gtceu:assembly_line/ultimate_battery' }) + event.recipes.gtceu.assembly_line('ultimate_battery') + .itemInputs('16x #forge:double_plates/darmstadtium', + '4x #gtceu:circuits/uhv', + '16x #gtceu:batteries/uv', + '4x gtceu:uv_field_generator', + '64x gtceu:uhpic_wafer', + '64x gtceu:uhpic_wafer', + '64x gtceu:advanced_smd_diode', + '64x gtceu:advanced_smd_capacitor', + '64x gtceu:advanced_smd_resistor', + '64x gtceu:advanced_smd_transistor', + '64x gtceu:advanced_smd_inductor', + '32x gtceu:enriched_naquadah_trinium_europium_duranide_double_wire', + '64x #forge:bolts/neutronium') + .inputFluids( + Fluid.of('gtceu:soldering_alloy', 5760), + Fluid.of('gtceu:polybenzimidazole', 2304), + Fluid.of('gtceu:naquadria', 2592)) + .itemOutputs('gtceu:max_battery') + .duration(100 * 20) + .EUt(300000) + .stationResearch(b => b.researchStack(Item.of('gtceu:energy_cluster')).EUt(GTValues.VA[GTValues.UHV]).CWUt(144)) + // #endregion // Контроллер теплицы From d3a47fa04fa9047df4bea9ec43c21a5c34fa9b2d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 18:51:11 +0100 Subject: [PATCH 14/21] changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7249d00ac..4038cdc70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,12 @@ ### New features ### Changes ### Bug fixes -- Fixed trowel being consumed on use @Redeix +- Fixed trowel being consumed on use (#1143) @Redeix - Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie +- Fixed ultimate battery recipe stack size issue (#1149) @Pyritie +- Fixed assembler recipe conflicts with certain wrought iron create items (#1142) @TomPlop & @Pyritie +- Quest fixes (#1119, #1142) @TomPlop +- Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz ## [0.9.10] - 05.06.2025 ### New features From fd7ae525ff3e431e6a02cca33e704816fb0b4b49 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 18:52:20 +0100 Subject: [PATCH 15/21] langs --- kubejs/assets/gtceu/lang/en_us.json | 3 ++- kubejs/assets/railways/lang/en_us.json | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 2aea9b95e..111f851a5 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -74,7 +74,8 @@ "material.gtceu.vitrified_asbestos": "Vitrified Asbestos", "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust", "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore", - "item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice", + "item.gtceu.tool.behavior.silk_ice": "Silk harvests Packed Ice", + "item.gtceu.tool.butchery_knife.tooltip": "Butchers animals for more meat", "block.gtceu.overworld_marker": "Earth", "block.gtceu.the_nether_marker": "The Beneath", "tagprefix.sword_head": "%s Sword Head", diff --git a/kubejs/assets/railways/lang/en_us.json b/kubejs/assets/railways/lang/en_us.json index c900a7d9d..97fc7b4bb 100644 --- a/kubejs/assets/railways/lang/en_us.json +++ b/kubejs/assets/railways/lang/en_us.json @@ -3,5 +3,22 @@ "block.railways.track_create_andesite_wide": "Wide Train Track", "block.railways.track_create_andesite_narrow": "Narrow Train Track", "item.railways.track_incomplete_create_andesite_wide": "Incomplete Wide Track", - "item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track" + "item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track", + "tfc.recipe.barrel.railways.barrel.dyeing.cap_decolor": "Decoloring", + "tfc.recipe.barrel.railways.barrel.dyeing.black_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.gray_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_gray_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.white_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.pink_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.magenta_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.purple_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.blue_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_blue_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.cyan_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.green_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.lime_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.yellow_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.orange_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.red_conductor_cap": "Dyeing", + "tfc.recipe.barrel.railways.barrel.dyeing.brown_conductor_cap": "Dyeing" } \ No newline at end of file From 1a5867d9560bb5b42e5241e7b1e277c087e60327 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 18:59:05 +0100 Subject: [PATCH 16/21] fixes #1107 --- .../quests/chapters/queststfc_tips.snbt | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 91963f4fd..78062b116 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1618,18 +1618,25 @@ description: ["{quests.tfg_tips.get_milk.desc}"] id: "3C7F170E065B60E1" subtitle: "{quests.tfg_tips.get_milk.subtitle}" - tasks: [{ - id: "5ADFB5FC06EAED6C" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))" + tasks: [ + { + id: "5ADFB5FC06EAED6C" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))" + } } + optional_task: true + title: "{quests.tfg_tips.get_milk.task}" + type: "item" } - title: "{quests.tfg_tips.get_milk.task}" - type: "item" - }] + { + id: "26460F400A280214" + type: "checkmark" + } + ] title: "{quests.tfg_tips.get_milk.title}" x: 4.5d y: -8.5d From 2b3a1d8ee2baf2b8b1b77c43756c334bee071a96 Mon Sep 17 00:00:00 2001 From: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> Date: Mon, 9 Jun 2025 15:34:05 -0300 Subject: [PATCH 17/21] Conductor (#1144) * Remove Scaffolding Frame recipe Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update Scaffolding Frame recipe Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Fix Glass Jar conflict Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Conductor Tags Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Conductor Recipes Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update constants.js Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * Update recipes.js Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> * update id Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --------- Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com> --- kubejs/server_scripts/railways/recipes.js | 40 ++++++++++++++++++++ kubejs/server_scripts/railways/tags.js | 6 ++- kubejs/startup_scripts/railways/constants.js | 18 --------- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 50f43c06e..879eaeb8d 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -85,6 +85,46 @@ const registerRailWaysRecipes = (event) => { //#endregion + //#region conductor + event.recipes.gtceu.assembler(`tfg:railways/conductor_cap`) + .itemInputs('#gtceu:circuits/lv','#gtceu:electric_motors','2x #forge:string','#tfc:high_quality_cloth') + .circuit(15) + .itemOutputs('railways:white_conductor_cap') + .duration(80) + .inputFluids(Fluid.of('gtceu:glue', 200)) + .EUt(16) + + event.recipes.tfc.barrel_sealed(1000) + .inputs('#tfg:colored_caps', Fluid.of(`tfc:lye`, 288)) + .outputItem(`railways:white_conductor_cap`) + .id(`railways:barrel/cap_decolor`) + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.recipes.gtceu.chemical_bath(`railways/${dye}_conductor_cap`) + .itemInputs('railways:white_conductor_cap') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 288)) + .itemOutputs(`railways:${dye}_conductor_cap`) + .duration(200) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + if (dye != "white") { + event.recipes.tfc.barrel_sealed(1000) + .inputs(`railways:white_conductor_cap`, Fluid.of(`tfc:${dye}_dye`, 288)) + .outputItem(`railways:${dye}_conductor_cap`) + .id(`railways:barrel/dyeing/${dye}_conductor_cap`) + + event.recipes.gtceu.chemical_bath(`tfg:cap_decolor_bath`) + .itemInputs('#tfg:colored_caps') + .inputFluids(Fluid.of('gtceu:chlorine',20)) + .itemOutputs('railways:white_conductor_cap') + .duration(80) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + } + }) + + //#endregion + // Переключатель пути поезда из андезита event.shaped('railways:track_switch_andesite', [ 'BAB', diff --git a/kubejs/server_scripts/railways/tags.js b/kubejs/server_scripts/railways/tags.js index 81863a6be..c9dcba6d6 100644 --- a/kubejs/server_scripts/railways/tags.js +++ b/kubejs/server_scripts/railways/tags.js @@ -7,8 +7,12 @@ const registerRailWaysItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) + // Adding Conductor tags + global.MINECRAFT_DYE_NAMES.forEach(dye => { + if (dye != 'white') event.add('tfg:colored_caps', `railways:${dye}_conductor_cap`) + event.remove('c:hidden_from_recipe_viewers',`railways:${dye}_conductor_cap`) + }) } - const registerRailWaysBlockTags = (event) => { // Удаление тегов у отключенных предметов diff --git a/kubejs/startup_scripts/railways/constants.js b/kubejs/startup_scripts/railways/constants.js index 3b232b34a..462167ae9 100644 --- a/kubejs/startup_scripts/railways/constants.js +++ b/kubejs/startup_scripts/railways/constants.js @@ -100,24 +100,6 @@ global.RAIL_WAYS_DISABLED_ITEMS = [ 'railways:track_incomplete_tieless_narrow', 'railways:track_incomplete_tieless_wide', - // Caps - 'railways:white_conductor_cap', - 'railways:orange_conductor_cap', - 'railways:magenta_conductor_cap', - 'railways:light_blue_conductor_cap', - 'railways:yellow_conductor_cap', - 'railways:lime_conductor_cap', - 'railways:pink_conductor_cap', - 'railways:gray_conductor_cap', - 'railways:light_gray_conductor_cap', - 'railways:cyan_conductor_cap', - 'railways:purple_conductor_cap', - 'railways:blue_conductor_cap', - 'railways:brown_conductor_cap', - 'railways:green_conductor_cap', - 'railways:red_conductor_cap', - 'railways:black_conductor_cap', - // Incomplete Caps 'railways:white_incomplete_conductor_cap', 'railways:orange_incomplete_conductor_cap', From 86a35b7386128d7f5e3194c2da8c7ca2bb21827d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 20:50:40 +0100 Subject: [PATCH 18/21] turned on the EMI default recipe button by default --- config/emi.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/emi.css b/config/emi.css index 463b05fcb..8aafd66ad 100644 --- a/config/emi.css +++ b/config/emi.css @@ -141,7 +141,7 @@ /** * Whether recipes should have a button to set as default. */ - recipe-default-button: false; + recipe-default-button: true; /** * Whether recipes should have a button to show the recipe tree. From 5be2eb1d99ae534f029b21d00b75f47af260d0c6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 21:01:09 +0100 Subject: [PATCH 19/21] welcome back stonecutter --- .../category/properties/ae2_attunement.json | 2 +- .../emi/category/properties/ae2_entropy.json | 2 +- .../category/properties/create_draining.json | 2 +- .../properties/create_spout_filling.json | 2 +- .../domum_ornamentum_architects_cutter.json | 2 +- .../emi/category/properties/emi_info.json | 2 +- .../emi/category/properties/emi_tag.json | 2 +- .../exposure_photograph_stacking.json | 2 +- .../properties/framedblocks_framing_saw.json | 2 +- .../category/properties/ftbquests_quest.json | 2 +- .../properties/greate_block_cutting.json | 2 +- .../properties/gtceu_programmed_circuit.json | 2 +- .../properties/minecraft_stonecutting.json | 1 + .../assets/emi/recipe/filters/categories.json | 3 --- kubejs/server_scripts/minecraft/recipes.js | 18 ++++++++++++++++++ .../minecraft/recipes.removes.js | 1 + .../sophisticated_backpacks/recipes.js | 12 ++++++++++++ kubejs/startup_scripts/minecraft/constants.js | 1 - .../sophisticated_backpacks/constants.js | 1 - 19 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 kubejs/assets/emi/category/properties/minecraft_stonecutting.json diff --git a/kubejs/assets/emi/category/properties/ae2_attunement.json b/kubejs/assets/emi/category/properties/ae2_attunement.json index c59ef7b95..5eaac13fc 100644 --- a/kubejs/assets/emi/category/properties/ae2_attunement.json +++ b/kubejs/assets/emi/category/properties/ae2_attunement.json @@ -1 +1 @@ -{"ae2:attunement":{"order":137}} \ No newline at end of file +{"ae2:attunement":{"order":138}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_entropy.json b/kubejs/assets/emi/category/properties/ae2_entropy.json index 216720cd4..ad4f28cee 100644 --- a/kubejs/assets/emi/category/properties/ae2_entropy.json +++ b/kubejs/assets/emi/category/properties/ae2_entropy.json @@ -1 +1 @@ -{"ae2:entropy":{"order":138}} \ No newline at end of file +{"ae2:entropy":{"order":139}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_draining.json b/kubejs/assets/emi/category/properties/create_draining.json index 53271885e..d1fcdd94a 100644 --- a/kubejs/assets/emi/category/properties/create_draining.json +++ b/kubejs/assets/emi/category/properties/create_draining.json @@ -1 +1 @@ -{"create:draining":{"order":139}} \ No newline at end of file +{"create:draining":{"order":140}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_spout_filling.json b/kubejs/assets/emi/category/properties/create_spout_filling.json index a4468f41a..c60505e9e 100644 --- a/kubejs/assets/emi/category/properties/create_spout_filling.json +++ b/kubejs/assets/emi/category/properties/create_spout_filling.json @@ -1 +1 @@ -{"create:spout_filling":{"order":140}} \ No newline at end of file +{"create:spout_filling":{"order":141}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json index 46e37bc28..20e1cce71 100644 --- a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json +++ b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json @@ -1 +1 @@ -{"domum_ornamentum:architects_cutter":{"order":135}} \ No newline at end of file +{"domum_ornamentum:architects_cutter":{"order":136}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_info.json b/kubejs/assets/emi/category/properties/emi_info.json index 93f32d060..ba0f8f819 100644 --- a/kubejs/assets/emi/category/properties/emi_info.json +++ b/kubejs/assets/emi/category/properties/emi_info.json @@ -1 +1 @@ -{"emi:info":{"order":143}} \ No newline at end of file +{"emi:info":{"order":144}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_tag.json b/kubejs/assets/emi/category/properties/emi_tag.json index 51db84b5f..c02f47c21 100644 --- a/kubejs/assets/emi/category/properties/emi_tag.json +++ b/kubejs/assets/emi/category/properties/emi_tag.json @@ -1 +1 @@ -{"emi:tag":{"order":144}} \ No newline at end of file +{"emi:tag":{"order":145}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json index fdb948c49..5919b18ac 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json @@ -1 +1 @@ -{"exposure:photograph_stacking":{"order":141}} \ No newline at end of file +{"exposure:photograph_stacking":{"order":142}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json index 60d9ec581..54596234a 100644 --- a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json +++ b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json @@ -1 +1 @@ -{"framedblocks:framing_saw":{"order":134}} \ No newline at end of file +{"framedblocks:framing_saw":{"order":135}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ftbquests_quest.json b/kubejs/assets/emi/category/properties/ftbquests_quest.json index 869db266a..466ed2a22 100644 --- a/kubejs/assets/emi/category/properties/ftbquests_quest.json +++ b/kubejs/assets/emi/category/properties/ftbquests_quest.json @@ -1 +1 @@ -{"ftbquests:quest":{"order":142}} \ No newline at end of file +{"ftbquests:quest":{"order":143}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_block_cutting.json b/kubejs/assets/emi/category/properties/greate_block_cutting.json index 124326eca..464c5b4a7 100644 --- a/kubejs/assets/emi/category/properties/greate_block_cutting.json +++ b/kubejs/assets/emi/category/properties/greate_block_cutting.json @@ -1 +1 @@ -{"greate:block_cutting":{"order":133}} \ No newline at end of file +{"greate:block_cutting":{"order":134}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json index 8ebe43293..e7ecce1ed 100644 --- a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json +++ b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json @@ -1 +1 @@ -{"gtceu:programmed_circuit":{"order":136}} \ No newline at end of file +{"gtceu:programmed_circuit":{"order":137}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json new file mode 100644 index 000000000..602760d46 --- /dev/null +++ b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json @@ -0,0 +1 @@ +{"minecraft:stonecutting":{"order":133}} \ No newline at end of file diff --git a/kubejs/assets/emi/recipe/filters/categories.json b/kubejs/assets/emi/recipe/filters/categories.json index 8b7fd72fd..ec400b936 100644 --- a/kubejs/assets/emi/recipe/filters/categories.json +++ b/kubejs/assets/emi/recipe/filters/categories.json @@ -6,9 +6,6 @@ { "category": "minecraft:brewing" }, - { - "category": "minecraft:stonecutting" - }, { "category": "minecraft:blasting" }, diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 536179d1b..55a34243c 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1010,4 +1010,22 @@ const registerMinecraftRecipes = (event) => { .itemOutputs('minecraft:shroomlight') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + + // Stonecutter + + event.shaped('minecraft:stonecutter', + [ + ' E ', + 'CAC', + 'BDB' + ], + { + A: '#forge:plates/wrought_iron', + B: '#tfc:lumber', + C: '#forge:plates/brass', + D: '#forge:small_gears', + E: '#forge:buzz_saw_heads' + }).id('tfg:shaped/stonecutter'); + + event.stonecutting('minecraft:smooth_quartz', 'minecraft:quartz_block') } diff --git a/kubejs/server_scripts/minecraft/recipes.removes.js b/kubejs/server_scripts/minecraft/recipes.removes.js index dc0df2cc0..2daad74bb 100644 --- a/kubejs/server_scripts/minecraft/recipes.removes.js +++ b/kubejs/server_scripts/minecraft/recipes.removes.js @@ -689,6 +689,7 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'minecraft:quartz' }) event.remove({ id: 'minecraft:quartz_from_blasting' }) + event.remove({ id: 'minecraft:smooth_quartz' }) //#endregion diff --git a/kubejs/server_scripts/sophisticated_backpacks/recipes.js b/kubejs/server_scripts/sophisticated_backpacks/recipes.js index 74415dad4..6306b3dc3 100644 --- a/kubejs/server_scripts/sophisticated_backpacks/recipes.js +++ b/kubejs/server_scripts/sophisticated_backpacks/recipes.js @@ -422,4 +422,16 @@ const registerSophisticatedBackpacksRecipes = (event) => { F: '#forge:tools/wrenches', G: 'gtceu:aluminium_drum', }).id('tfg:sophisticated_backpacks/shaped/tank_upgrade') + + // Stonecutter upgrade + event.shaped('sophisticatedbackpacks:stonecutter_upgrade', [ + 'ABA', + 'CDC', + 'ACA' + ], { + A: '#forge:rods/steel', + B: 'minecraft:stonecutter', + C: '#forge:plates/steel', + D: 'sophisticatedbackpacks:upgrade_base', + }).id('tfg:sophisticated_backpacks/shaped/stonecutter_upgrade') } \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index ce8873bfc..50074e51b 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -503,7 +503,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:mud', 'minecraft:netherite_scrap', 'minecraft:suspicious_gravel', - 'minecraft:stonecutter', 'minecraft:gravel', 'minecraft:large_fern', 'minecraft:tall_grass', diff --git a/kubejs/startup_scripts/sophisticated_backpacks/constants.js b/kubejs/startup_scripts/sophisticated_backpacks/constants.js index 9cebaebbc..0ad76928b 100644 --- a/kubejs/startup_scripts/sophisticated_backpacks/constants.js +++ b/kubejs/startup_scripts/sophisticated_backpacks/constants.js @@ -8,7 +8,6 @@ global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS = [ 'sophisticatedbackpacks:auto_smoking_upgrade', 'sophisticatedbackpacks:blasting_upgrade', 'sophisticatedbackpacks:auto_blasting_upgrade', - 'sophisticatedbackpacks:stonecutter_upgrade', 'sophisticatedbackpacks:stack_upgrade_tier_2', 'sophisticatedbackpacks:stack_upgrade_tier_3', 'sophisticatedbackpacks:stack_upgrade_tier_4', From f9d213019219ed283dc8f9b1588664497a455e15 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 21:05:26 +0100 Subject: [PATCH 20/21] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4038cdc70..e2d9c5f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## [Unreleased] ### New features +- Added back the vanilla stonecutter @Pyritie ### Changes ### Bug fixes - Fixed trowel being consumed on use (#1143) @Redeix From 84041d2e00fc5532dcb6c55fc285d21a99368dcc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 9 Jun 2025 21:08:50 +0100 Subject: [PATCH 21/21] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2d9c5f82..8b3cfae25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### New features - Added back the vanilla stonecutter @Pyritie +- Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29 ### Changes ### Bug fixes - Fixed trowel being consumed on use (#1143) @Redeix