From 72c5e41eb4a4bc33b95eddae92b162e2caa8d955 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 22 Dec 2024 21:19:27 +0000 Subject: [PATCH 1/3] fix stone dust tag Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/tags.js | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 232b68b32..23f04da80 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -16,21 +16,21 @@ const registerGTCEUItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', '#forge:ores') //#region Пыли стоунтайпов в один тэг - event.add('tfg:stone_dusts', 'gtceu:gabbro_dust') - event.add('tfg:stone_dusts', 'gtceu:shale_dust') - event.add('tfg:stone_dusts', 'gtceu:claystone_dust') - event.add('tfg:stone_dusts', 'gtceu:limestone_dust') - event.add('tfg:stone_dusts', 'gtceu:conglomerate_dust') - event.add('tfg:stone_dusts', 'gtceu:dolomite_dust') - event.add('tfg:stone_dusts', 'gtceu:chert_dust') - event.add('tfg:stone_dusts', 'gtceu:chalk_dust') - event.add('tfg:stone_dusts', 'gtceu:rhyolite_dust') - event.add('tfg:stone_dusts', 'gtceu:dacite_dust') + event.add('tfg:stone_dusts', 'tfg:gabbro_dust') + event.add('tfg:stone_dusts', 'tfg:shale_dust') + event.add('tfg:stone_dusts', 'tfg:claystone_dust') + event.add('tfg:stone_dusts', 'tfg:limestone_dust') + event.add('tfg:stone_dusts', 'tfg:conglomerate_dust') + event.add('tfg:stone_dusts', 'tfg:dolomite_dust') + event.add('tfg:stone_dusts', 'tfg:chert_dust') + event.add('tfg:stone_dusts', 'tfg:chalk_dust') + event.add('tfg:stone_dusts', 'tfg:rhyolite_dust') + event.add('tfg:stone_dusts', 'tfg:dacite_dust') event.add('tfg:stone_dusts', 'gtceu:quartzite_dust') - event.add('tfg:stone_dusts', 'gtceu:slate_dust') - event.add('tfg:stone_dusts', 'gtceu:phyllite_dust') - event.add('tfg:stone_dusts', 'gtceu:schist_dust') - event.add('tfg:stone_dusts', 'gtceu:gneiss_dust') + event.add('tfg:stone_dusts', 'tfg:slate_dust') + event.add('tfg:stone_dusts', 'tfg:phyllite_dust') + event.add('tfg:stone_dusts', 'tfg:schist_dust') + event.add('tfg:stone_dusts', 'tfg:gneiss_dust') event.add('tfg:stone_dusts', 'gtceu:marble_dust') event.add('tfg:stone_dusts', 'gtceu:basalt_dust') event.add('tfg:stone_dusts', 'gtceu:diorite_dust') From d4f469b0bff7486c21c9ecd290e54d7ad89d4007 Mon Sep 17 00:00:00 2001 From: Dmitry <52341158+Exzept1on@users.noreply.github.com> Date: Mon, 6 Jan 2025 22:30:09 +0700 Subject: [PATCH 2/3] Update CHANGELOG.md Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com> --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3b8d031f..a1196f4a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Fix LV recycling recipes to produce basic steel (fluffle). - Adds early glowstone recipe (Pyritie). - Added recipes to stop duping of red alloy + steam machines (Pyritie). +- Fix stone dust tag (Pyritie). ### Removed mods - ? ### Updated mods From 867c17d3aac55afac47291e9384cf9d0c1593602 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 6 Jan 2025 22:32:44 +0700 Subject: [PATCH 3/3] unfuck fucking javascript --- kubejs/server_scripts/create/recipes.js | 2 +- kubejs/server_scripts/gregtech/recipes.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index d4824d17c..25b7bb275 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1188,7 +1188,7 @@ const registerCreateRecipes = (event) => { //#region Механизм точности - e.recipes.gtceu.assembler('tfg:create/precision_mechanism') + event.recipes.gtceu.assembler('tfg:create/precision_mechanism') .itemInputs('#forge:sheets/gold','3x create:cogwheel', '3x create:large_cogwheel', '3x #forge:nuggets/iron') .itemOutputs('create:precision_mechanism') .duration(2000) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 87c27118f..650a3c2dc 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1490,7 +1490,7 @@ const registerGTCEURecipes = (event) => { '') // Clear NBT on tanks with shapeless crafts. - [ + const TANK_NAMES = [ "lv_super", "mv_super", "hv_super", @@ -1500,12 +1500,14 @@ const registerGTCEURecipes = (event) => { "zpm_quantum", "uv_quantum", "uhv_quantum", - ].forEach(prefix => { + ] + + TANK_NAMES.forEach(prefix => { // Craft super tanks to remove their NBT data. event.shapeless(`gtceu:${prefix}_tank`, [`gtceu:${prefix}_tank`]) // Craft super chests to remove their NBT data. event.shapeless(`gtceu:${prefix}_chest`, [`gtceu:${prefix}_chest`]) - }); + }) //#region fix more duping