From 253135b21bcbf653d89baf529a0e0fccf2ca9be1 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Sat, 25 Oct 2025 14:41:45 -0500 Subject: [PATCH] Add tacz ammo boxes (#2104) * stuff * Update CHANGELOG.md Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * 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 | 4 +++- kubejs/assets/tacz/lang/en_us.json | 7 +++++- .../item/ammo_box/upgrade_ring_diamond.png | Bin 0 -> 4312 bytes .../item/ammo_box/upgrade_ring_gold.png | Bin 0 -> 4310 bytes .../item/ammo_box/upgrade_ring_iron.png | Bin 0 -> 4313 bytes kubejs/server_scripts/main_server_script.js | 1 + kubejs/server_scripts/tacz/recipes.ammo.js | 20 ++++++++++++++++++ kubejs/server_scripts/tacz/tags.js | 9 ++++++-- 8 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_diamond.png create mode 100644 kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_gold.png create mode 100644 kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_iron.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c3a82384..6b2abd80b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ - Buffed how far each Soarer "flap" can glide for @Pyritie - Polycaprolactam string and phantom string now use circuit 3 in a wiremill instead of 0 (#2096) @SverhRazum-Nah - Added flax bundles for much faster scraping (#2080) @Xaligal -- Added more mineable tags to cobwebs since swords don't want to work +- Added more mineable tags to cobwebs since swords don't want to work @Pyritie +- Added TACZ Ammo Boxes @BlueBoat29 +- Added TACZ Guns and Ammo Boxes to tool rack @BlueBoat29 ### Bug fixes - Fixed part of the tungsten processing loop giving way too much salt (#2095) @Redeix - Fixed basic super tanks so you can now left/right click with them in GUIs like you can with the others (#2100) @jurrejelle diff --git a/kubejs/assets/tacz/lang/en_us.json b/kubejs/assets/tacz/lang/en_us.json index e2f5007a2..4e89fe173 100644 --- a/kubejs/assets/tacz/lang/en_us.json +++ b/kubejs/assets/tacz/lang/en_us.json @@ -14,5 +14,10 @@ "create_armorer.attachment.extended_mag_ca_1.name": "Invar Magazine", "create_armorer.attachment.extended_mag_ca_2.name": "Copper Plated Magazine", "create_armorer.attachment.extended_mag_ca_3.name": "Brass Plated Magazine", - "create_armorer.ammo.rbapb.name": "Rimmed Blunt Ammo" + "create_armorer.ammo.rbapb.name": "Rimmed Blunt Ammo", + + "item.tacz.ammo_box.iron": "Steel Ammo Box", + "item.tacz.ammo_box.gold": "§9Magnalium Ammo Box", + "item.tacz.ammo_box.diamond": "§6Desh Ammo Box" + } \ No newline at end of file diff --git a/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_diamond.png b/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..31cd04b8bff16ec71500f89808bbd37266b579d6 GIT binary patch literal 4312 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s74pxOklmsP~D-;yvr)B1( zDwI?fq$;FVWTr7NRNTr9h~{Hf2dQ{TCH^O>eS9DK{EAD0A zxYlLzh3onYpEN#qGrsS>S|f>!N(&0FT|F2oz+&%khgIEGT=QeS=R(&W_Tzsm%HJ1$=lfu$r6T*n&TiJ$%@!Te{p!{)rm`^TqUwPCC|e_-mZ zZ{gAh-l)I)x=qZE>DRW#?$_JY-ZD}Ff zdWk9dNvV1jxdjX$U}IlVkeHmETB4AYnx2_wtMq>NekFy>6kDZmQ(pt$0_W6>OpmIf z)Zi+=kmRcDWXlvKdpj=P7{9Oiaoz zEwNQn;!;phfEr$rTj1*pH$JZz8Vbqzx%w4}1^R}12Ku?V`p7zpOI*uJ@arfJsVqp< z4@xc0FD*(=buCNHD^W%^A|)BFzo4`z2kf1cWc}2f)ZEm(l45;BJwp^L-93E+;5tA- zke-=a0M=EJTY#dnBr^>WSSY>$$$-6s?2wAw0=T&-s$qTyD+Y&=l}mndDad)AF1AV_ z`>j&)lQUDSz|2$w3v)A5vou{pGvg#(6VoI^-9(e5L|sD@V`HOaQ$us(v@|56JoAc6 z67!N%K}J>N7U*SWrdXvUrWz(%TA1ou8l;)(nwS|I=~|kaTk0B_Cz+e1nx>?gnI$6` z;a`-Qo|%`JgX}7hQ7M@zR+gz27HP(*7P`j97HPUBW(F3z7D)!?x~3^9W~oM|#>q)0 zW?-XIlC9kGi*gf7Y?U%|6Vp@m3-Z#z5}*LLat!daRWi~uK!^n7B$lM*7vU~Fz;U}}g^6qZ_4oSB~oGS$#P&)5Vk1Bw_c z|Dw#)yplvvO0`vj=%~mouyQU+O)SYT3dzsUu~h;&O2J6a5aJ+^v~OxjVoG93qDx{) zs;!cdfsv_|p@Ef=X^5ebm9e>%k%g{-sg(he`uvp4v`Rv%?LgVX1`_EWnZ+gfMU`M7 zNS+E#ErjqO+?-61Y6S%aaJH~YOon)&II%1>1?)YzRB}dQUV3VZtr9fB!n9;!Nem_y zCKeVJNd~%RCI+dxCWdB4x{1anNxI32#>r-8X^G}WhLFI6n_irsR#Ki=l|?LT+V^YJcxmyGKZEJ8V|IzLP25F5|YAqG`L2Ci=+@BN%3gv8VxRz zLVzU2qp6E(!NrB>Or_?f*eaDP+1rUoZjxqTU|>t~c6R~ww-^|HI`6J$U|`@Z@Q5sC zVBi)8VMc~ob0ioT7}!fZeO=jKa!CrR%1u=}GM9mYq1DsHF~s8Z-AfC(4kd`NK6o#0 z*RVihOZ-h$U~+@!bXc>+4Q7u0nN5cxuGYT2Q>LeWhwn84rJL*~4rd8>{0mdKI;Vst0Ci~$JOBUy literal 0 HcmV?d00001 diff --git a/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_gold.png b/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..890abd97f0303ee20c21b67420803bd29f7f7448 GIT binary patch literal 4310 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 oSkydE^RQpDI(hmFeyg$y# { registerRailWaysBlockTags(event) registerSophisticatedBackpacksBlockTags(event) registerSpeciesBlockTags(event) + registerTACZBlockTags(event) registerTFCBlockTags(event) registerTFGBlockTags(event) registerVintageImprovementsBlockTags(event) diff --git a/kubejs/server_scripts/tacz/recipes.ammo.js b/kubejs/server_scripts/tacz/recipes.ammo.js index 4d04f3fab..d010adc8b 100644 --- a/kubejs/server_scripts/tacz/recipes.ammo.js +++ b/kubejs/server_scripts/tacz/recipes.ammo.js @@ -2,6 +2,26 @@ function registerTACZAmmoRecipes(event){ + //Ammo Boxes + event.recipes.gtceu.assembler('tfg_tacz:steel_ab') + .itemInputs('4x #forge:double_plates/steel', '16x #forge:screws/steel', '4x #forge:rings/rubber') + .itemOutputs(Item.of('tacz:ammo_box', '{Level:0}')) + .EUt(GTValues.VA[GTValues.LV]) + .duration(60) + + event.recipes.gtceu.assembler('tfg_tacz:magnalium_ab') + .itemInputs('4x #forge:double_plates/magnalium', '16x #forge:screws/aluminium', '4x #forge:rings/silicone_rubber') + .itemOutputs(Item.of('tacz:ammo_box', '{Level:1}')) + .EUt(GTValues.VA[GTValues.MV]) + .duration(60) + + event.recipes.gtceu.assembler('tfg_tacz:desh_ab') + .itemInputs('4x #forge:double_plates/desh', '16x #forge:screws/stainless_steel', '4x #forge:rings/styrene_butadiene_rubber') + .itemOutputs(Item.of('tacz:ammo_box', '{Level:2}')) + .EUt(GTValues.VA[GTValues.HV]) + .duration(60) + + //Extruder Casing event.recipes.gtceu.extruder('tfg_tacz:small_casing') .itemInputs('#forge:ingots/brass') diff --git a/kubejs/server_scripts/tacz/tags.js b/kubejs/server_scripts/tacz/tags.js index 9066fcd6e..1ccc63bc8 100644 --- a/kubejs/server_scripts/tacz/tags.js +++ b/kubejs/server_scripts/tacz/tags.js @@ -2,13 +2,18 @@ const registerTACZItemTags = (event) => { - event.add('c:hidden_from_recipe_viewers', 'tacz:ammo_box') + //event.add('c:hidden_from_recipe_viewers', 'tacz:ammo_box') event.add('c:hidden_from_recipe_viewers', 'tacz:gun_smith_table') event.add('c:hidden_from_recipe_viewers', 'tacz:workbench_a') event.add('c:hidden_from_recipe_viewers', 'tacz:workbench_b') event.add('c:hidden_from_recipe_viewers', 'tacz:workbench_c') + event.add('tfc:usable_on_tool_rack', 'tacz:ammo_box') + event.add('tfc:usable_on_tool_rack', 'tacz:modern_kinetic_gun') + +} +const registerTACZBlockTags = (event) => { - + event.add('tacz:interact_key/whitelist', '#tfc:tool_racks') } \ No newline at end of file