From 2efa0180a8188f5a46df4fe74a9d96172d6bcd80 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Feb 2026 11:20:59 +0000 Subject: [PATCH] Greate splashing update (#2995) * update to greate 0.0.65 * update greate and pakku, add circuits to fan recipes * that doesn't work * add ore deposits too --- config/greate-recipes.yaml | 9 ++ kubejs/server_scripts/greate/recipes.js | 20 +++++ kubejs/server_scripts/tfc/recipes.metals.js | 7 ++ .../tfg/food/recipes.meal_bags.js | 5 +- .../recipes.material_ores.js | 51 ++++++++++-- .../tfg/primitive/recipes.wood.js | 10 ++- kubejs/startup_scripts/greate/constants.js | 3 + pakku-lock.json | 82 +++++++++---------- 8 files changed, 135 insertions(+), 52 deletions(-) diff --git a/config/greate-recipes.yaml b/config/greate-recipes.yaml index 50dd46256..e3cc99132 100644 --- a/config/greate-recipes.yaml +++ b/config/greate-recipes.yaml @@ -13,6 +13,15 @@ useCreateItemsInRecipes: false # [WARNING]: This will not cover every single recipe conflict, only common conflicts (like components (plates/sheets)), or ore processing conflicts. disableConflictingRecipes: true +# Should tiered encased fans process item entities? +processItemEntitiesWithFan: false + +# Should recipes that cannot be removed be logged? +logUnremovableRecipes: true + +# "Multiplier used for calculating how many ticks should initially be removed in fan processing recipes, based on how fast the fan is spinning." +fanSpeedMultiplier: 0.5 + # Recipe types that should not be copied to Greate machines. Ex. 'gtceu:macerator' for macerator recipes ignoredRecipeTypes: - gtceu:ore_washer diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index bac53d5ba..cdce0215e 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -1132,4 +1132,24 @@ function registerGreateRecipes(event) { C: 'gtceu:iv_electric_pump', D: 'create:spout' }).addMaterialInfo().id('tfg:shaped/toms_favourite_block') + + event.shaped(`2x greate:treated_wood_window`, [ + 'BAB', + ' B ' + ], { + A: '#forge:glass', + B: 'gtceu:treated_wood_planks' + }).id(`tfg:greate/shaped/treated_wood_window`) + + event.shapeless(`2x greate:treated_wood_window_pane`, + [ + `greate:treated_wood_window`, + '#forge:tools/saws' + ]).id('tfg:greate/shapeless/treated_wood_window_pane') + + event.recipes.gtceu.cutter(`tfg:greate/greate:treated_wood_window_pane`) + .itemInputs(`3x greate:treated_wood_window`) + .itemOutputs(`8x greate:treated_wood_window_pane`) + .duration(40) + .EUt(7) } diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index 84f0f4ff9..079f34930 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -308,6 +308,13 @@ function registerTFCMetalsRecipes(event) { .itemOutputs(`1x tfc:ore/normal_${ore}`) .duration(20) .EUt(GTValues.VHA[GTValues.LV]) + + event.recipes.greate.splashing( + [`tfc:ore/normal_${ore}`], + [`1x tfc:deposit/${ore}/${stone}`, Fluid.of('minecraft:water', 100)] + ) + .recipeTier(1) + .id(`tfg:splashing/${ore}/${stone}_deposit`) }) }) //#endregion diff --git a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js index 4ac8c515a..72ccd1165 100644 --- a/kubejs/server_scripts/tfg/food/recipes.meal_bags.js +++ b/kubejs/server_scripts/tfg/food/recipes.meal_bags.js @@ -53,7 +53,7 @@ function registerTFGMealBagRecipes(event) { .itemInputs('1x tfg:used_foil_pack') .inputFluids(Fluid.of('gtceu:distilled_water', 10)) .itemOutputs('1x tfg:clean_foil_pack') - .duration(200) + .duration(50) .circuit(2) .EUt(GTValues.VA[GTValues.ULV]) @@ -68,7 +68,8 @@ function registerTFGMealBagRecipes(event) { result: { item: 'tfg:clean_foil_pack' } }).id('tfg:ae_transform/clean_foil_pack') - event.recipes.greate.splashing(['tfg:clean_foil_pack'], 'tfg:used_foil_pack') + event.recipes.greate.splashing(['tfg:clean_foil_pack'], ['tfg:used_foil_pack', Fluid.of('minecraft:water', 100)]) + .recipeTier(0) .id('tfg:splashing/clean_foil_pack') event.shapeless('1x tfg:used_foil_pack', [ diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js index 09f9e62f1..2e3fe3968 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.material_ores.js @@ -325,9 +325,22 @@ function processCrushedOre(event, material) { .EUt(2) // Bulk washing + + event.recipes.greate.splashing( + [pureOreItem, Item.of(byproductItem).withChance(0.14), 'gtceu:stone_dust'], + [crushedOreItem, Fluid.of('minecraft:water', 100)] + ) + .recipeTier(1) + .circuitNumber(1) + .id(`tfg:splashing/${materialName}_purified_ore_water`) - event.recipes.greate.splashing([pureOreItem, Item.of(byproductItem).withChance(0.333), 'gtceu:stone_dust'], crushedOreItem) - .id(`tfg:splashing/${materialName}_purified_ore`) + event.recipes.greate.splashing( + [pureOreItem, Item.of(byproductItem).withChance(0.333), 'gtceu:stone_dust'], + [crushedOreItem, Fluid.of('gtceu:distilled_water', 10)] + ) + .recipeTier(1) + .circuitNumber(2) + .id(`tfg:splashing/${materialName}_purified_ore_distilled`) // Dropping in water event.custom({ @@ -443,8 +456,21 @@ function processImpureDust(event, material) { const materialName = material.getName(); // Bulk washing - event.recipes.greate.splashing(dustItem, impureDustItem) - .id(`tfg:splashing/${materialName}_dust_from_impure`) + event.recipes.greate.splashing( + [dustItem], + [impureDustItem, Fluid.of('minecraft:water', 100)] + ) + .recipeTier(1) + .circuitNumber(1) + .id(`tfg:splashing/${materialName}_dust_from_impure_water`) + + event.recipes.greate.splashing( + [dustItem], + [impureDustItem, Fluid.of('gtceu:distilled_water', 10)] + ) + .recipeTier(1) + .circuitNumber(2) + .id(`tfg:splashing/${materialName}_dust_from_impure_distilled`) event.recipes.tfc.barrel_instant() .inputItem(impureDustItem) @@ -495,8 +521,21 @@ function processPureDust(event, material) { const materialName = material.getName(); // Bulk washing - event.recipes.greate.splashing(dustItem, pureDustItem) - .id(`tfg:splashing/${materialName}_dust_from_pure`) + event.recipes.greate.splashing( + [dustItem], + [pureDustItem, Fluid.of('minecraft:water', 100)] + ) + .recipeTier(1) + .circuitNumber(1) + .id(`tfg:splashing/${materialName}_dust_from_pure_water`) + + event.recipes.greate.splashing( + [dustItem], + [pureDustItem, Fluid.of('gtceu:distilled_water', 10)] + ) + .recipeTier(1) + .circuitNumber(2) + .id(`tfg:splashing/${materialName}_dust_from_pure_distilled`) event.recipes.tfc.barrel_instant() .inputItem(pureDustItem) diff --git a/kubejs/server_scripts/tfg/primitive/recipes.wood.js b/kubejs/server_scripts/tfg/primitive/recipes.wood.js index 70afd59ac..746aad25f 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.wood.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.wood.js @@ -15,9 +15,13 @@ function registerTFGWoodRecipes(event) { .duration(20 * 5) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.create.splashing([Item.of('tfc:powder/wood_ash').withChance(0.25), Item.of('minecraft:stick').withChance(0.25)], 'tfc:torch') - .id('tfg:splashing/wash_torch') - + event.recipes.greate.splashing( + [Item.of('tfc:powder/wood_ash').withChance(0.25), Item.of('minecraft:stick').withChance(0.25)], + ['tfc:torch', Fluid.of('minecraft:water', 100)] + ) + .recipeTier(0) + .id('tfg:splashing/wash_torch') + // Just a dummy recipe to tell people they can get wood ash by throwing torches in water via TFC event.custom({ type: "ae2:transform", diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index c0e4eaf7c..3e1ada724 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -34,6 +34,9 @@ global.GREATE_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:darmstadtium_alloy", "gtceu:neutronium_alloy", + "greate:rubber_window", + "greate:rubber_window_pane", + "gtceu:neutronium_whisk", "greate:polyethylene_belt_connector", "greate:polytetrafluoroethylene_belt_connector", diff --git a/pakku-lock.json b/pakku-lock.json index 05137e8d1..ffc824f1c 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4875,7 +4875,7 @@ "files": [ { "type": "curseforge", - "file_name": "domum_ornamentum-1.20.1-1.0.295-universal.jar", + "file_name": "domum_ornamentum-1.20.1-1.0.296-universal.jar", "mc_versions": [ "1.20.1" ], @@ -4883,16 +4883,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7530/695/domum_ornamentum-1.20.1-1.0.295-universal.jar", - "id": "7530695", + "url": "https://edge.forgecdn.net/files/7585/567/domum_ornamentum-1.20.1-1.0.296-universal.jar", + "id": "7585567", "parent_id": "527361", "hashes": { - "sha1": "29950245b98ec35184d806e3b9ace700e67ac585", - "md5": "2f8435a8c43ebff6df70299ea212b336" + "sha1": "f0052adb170e5f73f0f5b625c411bc5b99183c00", + "md5": "2a29092b7f67ac477f253c44d3d0463c" }, "required_dependencies": [], - "size": 1141554, - "date_published": "2026-01-26T15:27:31.327Z" + "size": 1141555, + "date_published": "2026-02-06T18:57:22.807Z" } ] }, @@ -7163,7 +7163,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.64.jar", + "file_name": "greate-0.0.66.jar", "mc_versions": [ "1.20.1" ], @@ -7172,23 +7172,23 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/9flLlqpd/greate-0.0.64.jar", - "id": "9flLlqpd", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/PKMB9cOR/greate-0.0.66.jar", + "id": "PKMB9cOR", "parent_id": "8wDcQuht", "hashes": { - "sha512": "9f7d4f37fa720eeca5177263c4cd00f6812cd77063214061f31ef416123d51bc0a553f46393c1e0e3a548ef6d15b2da2bd6f703d80379d3ad084ee749c12b2c0", - "sha1": "7e779ac568c27ebb8cb9b16c6b8797b633ffdcdf" + "sha512": "664e7ef0bd1a75739159dd2da6e8acb1085071c50f057eb8e8edd9b6e3c71c738364c328f98cfa00841a55411fa27980c53befea3a9867d1245bc7818f326560", + "sha1": "34cc291020c237e39e0f04939cc78ccf2a9ab862" }, "required_dependencies": [ "7tG215v7", "LNytGWDc" ], - "size": 1257336, - "date_published": "2026-01-24T05:55:41.391475Z" + "size": 1302534, + "date_published": "2026-02-06T02:33:01.791850Z" }, { "type": "curseforge", - "file_name": "greate-0.0.64.jar", + "file_name": "greate-0.0.66.jar", "mc_versions": [ "1.20.1" ], @@ -7197,19 +7197,19 @@ "neoforge" ], "release_type": "alpha", - "url": "https://edge.forgecdn.net/files/7516/28/greate-0.0.64.jar", - "id": "7516028", + "url": "https://edge.forgecdn.net/files/7582/520/greate-0.0.66.jar", + "id": "7582520", "parent_id": "901996", "hashes": { - "sha1": "7e779ac568c27ebb8cb9b16c6b8797b633ffdcdf", - "md5": "31e92230efe5fc01d683e25fbe6a561c" + "sha1": "34cc291020c237e39e0f04939cc78ccf2a9ab862", + "md5": "5a4ed301d6d3ab28f32be01489390cc7" }, "required_dependencies": [ - "890405", - "328085" + "328085", + "890405" ], - "size": 1257336, - "date_published": "2026-01-24T05:55:39.687Z" + "size": 1302534, + "date_published": "2026-02-06T02:32:59.240Z" } ] }, @@ -10548,7 +10548,7 @@ "files": [ { "type": "modrinth", - "file_name": "particle_core-0.3.2+1.20.1+forge.jar", + "file_name": "particle_core-0.3.3+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -10557,23 +10557,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/RSeLon5O/versions/qSjxrRl9/particle_core-0.3.2+1.20.1+forge.jar", - "id": "qSjxrRl9", + "url": "https://cdn.modrinth.com/data/RSeLon5O/versions/cFafZfyr/particle_core-0.3.3+1.20.1+forge.jar", + "id": "cFafZfyr", "parent_id": "RSeLon5O", "hashes": { - "sha512": "042a26c72ed13a5b7a961afd575561442fe979295e2adc5901127e2be578391f597ce24d17d92fdf6ad515a19033f1b7cde0a455e7e9e9b0a36a8089caddf459", - "sha1": "57079d1607ce044533fb076d2db0e2a3d277a4fb" + "sha512": "46694c2525b1e14b20ec6043ce9f7e7b92b9fe3a7d55c995951ec54d7acecf1c1a8a674d829efb42e6d1d9c7b0a29fd0edc834a876fb5a85ad90f35b932748ff", + "sha1": "1da5744853d17979033d5ee3cd4251b8340ea7be" }, "required_dependencies": [ - "ordsPcFz", - "hYykXjDp" + "hYykXjDp", + "ordsPcFz" ], - "size": 773147, - "date_published": "2026-01-25T16:04:41.088385Z" + "size": 773448, + "date_published": "2026-02-05T19:47:58.826248Z" }, { "type": "curseforge", - "file_name": "particle_core-0.3.2+1.20.1+forge.jar", + "file_name": "particle_core-0.3.3+1.20.1+forge.jar", "mc_versions": [ "1.20.1" ], @@ -10582,19 +10582,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7525/37/particle_core-0.3.2+1.20.1+forge.jar", - "id": "7525037", + "url": "https://edge.forgecdn.net/files/7581/36/particle_core-0.3.3+1.20.1+forge.jar", + "id": "7581036", "parent_id": "985426", "hashes": { - "sha1": "57079d1607ce044533fb076d2db0e2a3d277a4fb", - "md5": "5ebd6c2396924c3e33ea96003ec10b0c" + "sha1": "1da5744853d17979033d5ee3cd4251b8340ea7be", + "md5": "eb8ce770b3ddc793df437bfcec169a6d" }, "required_dependencies": [ - "1005914", - "351264" + "351264", + "1005914" ], - "size": 773147, - "date_published": "2026-01-25T16:04:36.363Z" + "size": 773448, + "date_published": "2026-02-05T19:47:53.227Z" } ] },