From 934aa209d9e30ace72b365639db623c9f15c1258 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Wed, 27 Aug 2025 18:18:49 -0500 Subject: [PATCH] some container changes (#1716) * stuff * Create wraptor.json * Update tags.js * fix wool * eggs * Update constants.js * more recipe stuff * doing tooltips the correct way * oops Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * oops * eater mixin stuff * add sandworm+dep to pakku * new configs I think * soulbind recipes * thumper * Update main_server_script.js * Update pakku-lock.json * sack configs * Update sns-server.toml * Update sns-server.toml * sack recipes and stuff * Create soulbinding-common.toml * soulbind fix * Update pakku-lock.json Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update recipes.js * Update recipes.js * Delete EffekseerNativeForJava.dll Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update .gitignore * sack tags * sewing table change * Update tags.js * straw knapping * Update CHANGELOG.md Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --- CHANGELOG.md | 1 + .../tfc/textures/gui/knapping/straw.png | Bin 0 -> 1331 bytes kubejs/server_scripts/afc/tags.js | 1 + kubejs/server_scripts/beneath/recipes.js | 4 ++-- kubejs/server_scripts/beneath/tags.js | 2 ++ kubejs/server_scripts/sacksnstuff/recipes.js | 15 ++++++++++++- kubejs/server_scripts/sacksnstuff/tags.js | 18 ++++++++++++++- kubejs/server_scripts/tfc/data.js | 1 + kubejs/server_scripts/tfc/recipes.knapping.js | 21 ++++++++++++++++++ kubejs/server_scripts/tfc/recipes.wood.js | 2 ++ kubejs/server_scripts/tfc/tags.js | 2 ++ 11 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 kubejs/assets/tfc/textures/gui/knapping/straw.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 770a60bd0..b8d5f9fa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Changes - Fuelling blaze burners with liquids is now done directly instead of through straws (break and replace your blaze burners to update) @Ghoulcel - Blaze burner liquid fuelling has been fully made consistent with GregTech power values (#1694) @Ghoulcel +- Sewing Tables now use a knife instead of shears @BlueBoat29 ### Bug fixes - Fixed tongs getting stuck in ovens @Pyritie diff --git a/kubejs/assets/tfc/textures/gui/knapping/straw.png b/kubejs/assets/tfc/textures/gui/knapping/straw.png new file mode 100644 index 0000000000000000000000000000000000000000..f877310a96437e16bbab8e3af654fd6830a58ee5 GIT binary patch literal 1331 zcmV-31EX>4Tx04R}tkv&MmP!xqvQ?)7;2Rn#3WT;LSMMWH?ibb$c+6t{Yn7s54nlvOS zE{=k0!NH%!s)LKOt`4q(Aov5~9J6k5c1;qgAsyXWxUeSlCeGu7;v094H~ zlCh|m$*zilS9HOLAjZ)nF;kDH7Sr&ouY2mHx{L5E@4i2)Psy1K@QK88OgAjz4dR(i zOXs{#9AZUDAwDM_Gw6cEk6f2se&bwlSm2oea{LK$$>b`5 zkz)ZBsE`~#_#gb9t(l*ibd!Qnp!3DHKSqGSF3_mi_V=-EH%AO zrG<}x{%zpmx~0i`z~v4w_@qmQw!^BkuSK$>Q?d;=UD z0;2`WUiWx+cl+G_?P<>M2St-|l^EF2Z2$lO24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jm6;4KpV%L?ZbB000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0009DNklhPWX9t)j?*L#GKos7 zR-{6x6$)2<4IYAPUW5nWk_&{YN?h~;Bvgb{5Hzi5LRy8yj<>}7ES`<;6VJZ=s(AeA z$NY2pfxY$?CD%jkv^e?o6}75Q5CnAY9rEI*mwf){fa~iax(555eg6F8Ek>hOViiRQ zp<~-N{lNgWm=mot97j?V4vWzk&r@VshM^g_We>ev;qCbV%`|kPD5g^LSkC4wmLaZk zk-AQnZ#QXI!2N3hx1CmxO{dkXFTg99eh8J$iW)3!P6v~g=?45_1(qE;leFeMk4J&0n`JcqnM`6Z+&F?=7}u?gcf%opH!6rw;&EQRTpxb6)> zIq15^qBr2)K^tjG?21pLQ6ZnrsNZQ}nhpSD1y3FwqMiKyHwiGF%puQdwi>M0Dbg^| zr9rV;FdB`C(;Rez-JK?p(7E|=LD~1w`ojs|fA<`OAe=7P+HNtKFX{GgSfddxLnhOZ z*Kf{w_xg-g5b*qm7f93O4!(8gbRXWv^8yNmHJDd4#z9`J3Y8U6`gtEBk z4zWEC!_YBo%VaiR;&~pXIYkHoLJ$NY{n3~WN0FvEmXru7AWe``16Ls@I@)Bq@h{K2|PC;&m+U?K1m%^Pg&Df?_#bt%U#pZmnGFB{002ovPDHLkV1iMeUWEVv literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/afc/tags.js b/kubejs/server_scripts/afc/tags.js index 7f5f60616..33d35c550 100644 --- a/kubejs/server_scripts/afc/tags.js +++ b/kubejs/server_scripts/afc/tags.js @@ -22,6 +22,7 @@ const registerAFCItemTags = (event) => { event.add('firmalife:wine_shelves', `afc:wood/wine_shelf/${woodType}`) event.add('firmalife:stomping_barrels', `afc:wood/stomping_barrel/${woodType}`) event.add('firmalife:barrel_presses', `afc:wood/barrel_press/${woodType}`) + event.add('tfc:sewing_tables', `afc:wood/sewing_table/${woodType}`) }) //Hardwood Tags diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index c28c32fbd..7289608a4 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -108,7 +108,7 @@ const registerBeneathRecipes = (event) => { 'D D' ], { A: '#forge:leather', - B: '#forge:shears', + B: '#forge:tools/knives', C: 'beneath:wood/planks/crimson', D: 'beneath:wood/log/crimson' }).id('tfg:shaped/crimson_sewing_table') @@ -138,7 +138,7 @@ const registerBeneathRecipes = (event) => { 'D D' ], { A: '#forge:leather', - B: '#forge:shears', + B: '#forge:tools/knives', C: 'beneath:wood/planks/warped', D: 'beneath:wood/log/warped' }).id('tfg:shaped/warped_sewing_table') diff --git a/kubejs/server_scripts/beneath/tags.js b/kubejs/server_scripts/beneath/tags.js index df455effa..1d4c050a0 100644 --- a/kubejs/server_scripts/beneath/tags.js +++ b/kubejs/server_scripts/beneath/tags.js @@ -47,4 +47,6 @@ const registerBeneathItemTags = (event) => { event.remove('minecraft:leaves', 'beneath:wood/leaves/warped') event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/crimson') event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/warped') + event.add('tfc:sewing_tables', 'beneath:wood/sewing_table/crimson') + event.add('tfc:sewing_tables', 'beneath:wood/sewing_table/warped') } \ No newline at end of file diff --git a/kubejs/server_scripts/sacksnstuff/recipes.js b/kubejs/server_scripts/sacksnstuff/recipes.js index 8d65bd54b..5f0db5160 100644 --- a/kubejs/server_scripts/sacksnstuff/recipes.js +++ b/kubejs/server_scripts/sacksnstuff/recipes.js @@ -13,6 +13,7 @@ const registerSNSRecipes = (event) => { event.remove({ id: 'sns:crafting/leather_sack'}) event.remove({ id: 'sns:crafting/burlap_sack'}) event.remove({ id: 'sns:crafting/seed_pouch'}) + event.remove({ id: 'sns:crafting/straw_basket'}) event.remove({ output: 'sns:pack_frame'}) @@ -96,7 +97,19 @@ const registerSNSRecipes = (event) => { } ) ).id('sns:crafting/ore_sack') - + + event.recipes.tfc.knapping('sns:straw_basket', 'tfg:straw', [ + " XXX ", + "X X", + "X X", + "XXXXX", + " XXX " + ]) + .ingredient('tfc:straw') + .outsideSlotRequired(false) + .id('sns:straw_knapping/straw_basket') + + //#region helper items event.recipes.tfc.anvil( 'sns:buckle', diff --git a/kubejs/server_scripts/sacksnstuff/tags.js b/kubejs/server_scripts/sacksnstuff/tags.js index 0b123b345..f48550663 100644 --- a/kubejs/server_scripts/sacksnstuff/tags.js +++ b/kubejs/server_scripts/sacksnstuff/tags.js @@ -7,5 +7,21 @@ function registeSNSItemTags(event) { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) - + + event.add('sns:allowed_in_ore_sack', 'tfc:kaolin_clay') + event.add('sns:allowed_in_ore_sack', 'minecraft:clay_ball') + event.add('sns:allowed_in_ore_sack', 'beneath:cursecoal') + event.add('sns:allowed_in_ore_sack', 'minecraft:flint') + + event.add('sns:allowed_in_ore_sack', '#tfc:powders') + event.add('sns:allowed_in_ore_sack', '#minecraft:coals') + event.add('sns:allowed_in_ore_sack', '#tfg:stone_dusts') + event.add('sns:allowed_in_ore_sack', '#forge:rich_raw_materials') + event.add('sns:allowed_in_ore_sack', '#forge:raw_materials') + event.add('sns:allowed_in_ore_sack', '#forge:poor_raw_materials') + + event.add('sns:allowed_in_ore_sack', '#tfc:sedimentary_rock') + event.add('sns:allowed_in_ore_sack', '#tfc:metamorphic_rock') + event.add('sns:allowed_in_ore_sack', '#tfg:igneous_intrusive_rock') + event.add('sns:allowed_in_ore_sack', '#tfc:igneous_extrusive_rock') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index bb1a333bd..3d4356f52 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -70,6 +70,7 @@ const registerTFCFertilizers = (event) => { const registerTFCKnappingTypes = (event) => { event.knappingType('minecraft:flint', 1, 1, 'tfc:item.knapping.stone', true, false, true, 'minecraft:flint', 'tfg:flint') + event.knappingType('tfc:straw', 4, 4, 'tfc:item.knapping.leather', false, false, false, 'tfc:straw', 'tfg:straw') } diff --git a/kubejs/server_scripts/tfc/recipes.knapping.js b/kubejs/server_scripts/tfc/recipes.knapping.js index eaa6531f3..1240dd49d 100644 --- a/kubejs/server_scripts/tfc/recipes.knapping.js +++ b/kubejs/server_scripts/tfc/recipes.knapping.js @@ -207,5 +207,26 @@ function registerTFCKnappingRecipes(event) { .id('tfg:rock_knapping/stone_shovel_head') //#endregion + + event.recipes.tfc.knapping('tfc:thatch', 'tfg:straw', [ + "XXX", + "XXX", + "XXX" + + ]) + .ingredient('tfc:straw') + .outsideSlotRequired(false) + .id('tfc:straw_knapping/thatch_block') + + event.remove({ id: 'tfcambiental:crafting/straw_hat'}) + + event.recipes.tfc.knapping('tfcambiental:straw_hat', 'tfg:straw', [ + " XXX ", + "XXXXX" + + ]) + .ingredient('tfc:straw') + .outsideSlotRequired(false) + .id('sns:straw_knapping/straw_hat') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.wood.js b/kubejs/server_scripts/tfc/recipes.wood.js index 21b77297c..7afa73464 100644 --- a/kubejs/server_scripts/tfc/recipes.wood.js +++ b/kubejs/server_scripts/tfc/recipes.wood.js @@ -3,6 +3,8 @@ function registerTFCWoodRecipes(event) { + event.replaceInput({ output: '#tfc:sewing_tables'}, '#forge:shears', '#forge:tools/knives') + // Какие то рецепты дерева global.TFC_WOOD_TYPES.forEach(wood => { event.remove({ id: `tfc:crafting/wood/${wood}_axle` }) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 1d8b81b14..bdec8b8dc 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -330,6 +330,8 @@ const registerTFCItemTags = (event) => { event.add('minecraft:stone_buttons', `tfc:rock/button/${stone}`) event.add('minecraft:buttons', `tfc:rock/button/${stone}`) }) + + event.add('tfc:any_knapping', '#tfc:pit_kiln_straw') } const registerTFCBlockTags = (event) => {