From 0ba7c6cf7b24fc59c7f1802b54ab62c6027e4eae Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 11 Nov 2025 21:42:21 +0000 Subject: [PATCH] fix #2197, cleaned up armor stand recipes --- CHANGELOG.md | 5 ++++- kubejs/server_scripts/ad_astra/tags.js | 6 ++++++ kubejs/server_scripts/create/tags.js | 15 +++++++++++++++ .../server_scripts/minecraft/recipes.removes.js | 2 ++ kubejs/server_scripts/minecraft/tags.js | 4 ++++ kubejs/server_scripts/tfc/recipes.js | 3 +++ kubejs/server_scripts/tfg/tags.stones.js | 5 +++++ 7 files changed, 39 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e739117a3..9f4db7c56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ - Added an AE2-linked TACZ ammo box @BlueBoat29 - Buffed hiking boots durability by 250%, also changed horseshoe durability and stats to match @Pyritie - Added more automatable mud brick recipes, ensured all dirt types are renewable (#2169) @Pyritie -- Added a sky stone block recipe to the rock breaker (#2159) @Pyritie +- Added a sky stone block duping recipe to the rock breaker (#2159) @Pyritie - Improved the tag for cleanroom doors @Pyritie - The food oven and refrigerator now emit heat (for TFC ambiental) @Pyritie - Dioxygen Difluoride is now cryogenic and acidic @Pyritie @@ -29,6 +29,9 @@ - Fixed some typos in gun/attachment names and descriptions @Jeuvke - Fixed ocean moai spawning underwater sometimes 🗿 @Pyritie - Added missing recipes for the Advanced and Electronic Gyroscope @Pyritie +- Fixed several quest typos and errors (#2151, #2176, #2177) @Pyritie +- Fixed not being able to put Seed Oil in a Mixing Bowl (#2203) @slavek +- Added missing items to the smooth stone slabs tag, cleaned up armor stand recipes (#2197) @Pyritie ### Translation updates - Russian @DI-GitH + @nineex - Brazilian Portuguese @Redeix diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 7d1dd7882..f29b93dc4 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -157,6 +157,12 @@ const registerAdAstraItemTags = (event) => { } }) + event.add('forge:smooth_stone_slab', 'ad_astra:polished_moon_stone_slab') + event.add('forge:smooth_stone_slab', 'ad_astra:polished_mars_stone_slab') + event.add('forge:smooth_stone_slab', 'ad_astra:polished_venus_stone_slab') + event.add('forge:smooth_stone_slab', 'ad_astra:polished_mercury_stone_slab') + event.add('forge:smooth_stone_slab', 'ad_astra:polished_glacio_stone_slab') + event.add('forge:smooth_stone_slab', 'ad_astra:polished_permafrost_slab') } const registerAdAstraBlockTags = (event) => { diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index c5cdb2e42..ee7c1e2b2 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -90,6 +90,21 @@ const registerCreateItemTags = (event) => { event.remove('create:stone_types/deepslate', 'minecraft:deepslate') event.remove('create:stone_types/dripstone', 'minecraft:dripstone_block') event.remove('create:stone_types/blackstone', 'minecraft:blackstone') + + event.add('forge:smooth_stone_slab', 'create:polished_cut_granite_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_diorite_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_andesite_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_calcite_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_dripstone_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_deepslate_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_tuff_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_limestone_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_asurine_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_crimsite_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_ochrum_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_scoria_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_scorchia_slab') + event.add('forge:smooth_stone_slab', 'create:polished_cut_veridium_slab') } const registerCreateBlockTags = (event) => { diff --git a/kubejs/server_scripts/minecraft/recipes.removes.js b/kubejs/server_scripts/minecraft/recipes.removes.js index c48fac8cb..da3192bef 100644 --- a/kubejs/server_scripts/minecraft/recipes.removes.js +++ b/kubejs/server_scripts/minecraft/recipes.removes.js @@ -2083,4 +2083,6 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'gtceu:assembler/lodestone' }) //#endregion + + event.remove({ id: 'minecraft:armor_stand' }) } \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 5e866482f..97cf8ecfe 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -96,6 +96,10 @@ const registerMinecraftItemTags = (event) => { event.add('create:blaze_burner_fuel/regular', 'minecraft:charcoal') event.add('minecraft:wart_blocks', 'minecraft:mushroom_stem') + + event.add('forge:smooth_stone_slab', 'minecraft:polished_deepslate_slab') + event.add('forge:smooth_stone_slab', 'minecraft:polished_blackstone_slab') + event.add('forge:smooth_stone_slab', 'minecraft:polished_blackstone_brick_slab') } const registerMinecraftBlockTags = (event) => { diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 2ce60c45e..f38d1df41 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -350,4 +350,7 @@ const registerTFCRecipes = (event) => { ], { A: '#tfc:lumber' }).id('tfc:crafting/vanilla/ladder') + + event.replaceInput({ id: 'tfc:crafting/vanilla/armor_stand' }, '#minecraft:planks', '#tfc:lumber') + event.remove({ id: 'tfc:crafting/vanilla/armor_stand_bulk' }) } diff --git a/kubejs/server_scripts/tfg/tags.stones.js b/kubejs/server_scripts/tfg/tags.stones.js index 000a1d7cf..d1c642af9 100644 --- a/kubejs/server_scripts/tfg/tags.stones.js +++ b/kubejs/server_scripts/tfg/tags.stones.js @@ -407,6 +407,11 @@ function registerTFGItemStoneTags(event) { event.add(`tfc:${STONE_TYPES.red_granite}_items`, 'gtceu:chiseled_red_granite') event.add('tfc:rock/bricks', 'gtceu:chiseled_red_granite') event.add('tfc:rock/chiseled_bricks', 'gtceu:chiseled_red_granite') + + // Smooth stone slabs + event.add('forge:smooth_stone_slabs', 'tfg:rock/polished_crackrack_slab') + event.add('forge:smooth_stone_slabs', 'tfg:rock/polished_moon_deepslate_slab') + event.add('forge:smooth_stone_slabs', 'tfg:rock/polished_red_granite_slab') // Permafrost (???) [NA] event.remove('tfc:metamorphic_rock', 'tfg:loose/permafrost')