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 zcmeHKeQ?v}88-=#)CmDfx&+7)A=(6T$d)YGmQ_0>v7N*X4sLKmXxA*VBs+rGGL{@W zKH3C0pb)O@2!)OoTC%~|$aZ|J^a9tFFd(}@uRsT7z<|NF4njtITbt67X0POY-g>vo zUHe~rCrf%he(&@Ap67W_??zWe=@j)WwMwO$;wZCKg8MZ2N}deF)XS z^}lYNJmY6`4u6?owj}mCGM}Z_vInoaEYvJd!>dgZYRdIXwqLJygw~>`-?@b>mNUL z>ggatetEDu99((nV&^l{CN3!<)s5`vfxBfqimhU2M3(}vgzFS*$;jvr% ztpn}*w%-4MS|DD()$U&29$x&-iQ1ay9pcV^%)3=xoZv`))n%Re*y}Hy`_&c?Wd9n= z=zpna@s@IU>CDYpDf^07*L~gDe>3uK3BCM+Lw&mWUm0h<%1nHCtnhGP*^RDk7tIq^ zeR%w}D_<;~ef(bDozIW_pdjI^Bdc4wkL31D*#6}4bFH~|+mHu!v6M+S`!@e>ep2eS zgw^_AynCsjBBwbu{LZSxtgM9F_CMA{8Y7E+LjNxQ^WH@Dtk7-$i|!?$>l%2_UDeJ- z6eIXGG%I*GP1GL*ZKqP17e<3Lvx1W#59i|p7Wn?L_hE=cWBf-$l1!UDB9N&x^rC(%&UUmp;us0CJVDex?dwJ@ZZNGmLGwbKPzg%Af38bX62 z_9)+=gA3G`9yCX-2v>a;o?0xS@*F(A=V zBp}X}A>tS|PGmxSP~wFEBxBMZAuL&780ewF`20bqa|k{l4zK|D&_?N?7So_wzh67j zLzL_d0AwJbZ}kw}U`Vxm32*2#69LU^p2HfNOYw z!_pi^n@BxkLcMx~FyK1Gq&J!nozY_?I6dn%7?=?di$gr`s1hOMr$IS+KkehR!GKRu$b?fxE{6ryY0zPb ztDcs;zyZtvA7F)uIIME>er}0G%Y0%+14dvtsYh`mf$Fhgqbe>Wf?kwSF;s&SibgIB z1=0c3(sHK)07VY6p{yZ}mV}U75b7ZM4JzP*kUVH0+?9|CVMTNP;9m%@6~DatMJLbO? zZwOr!yi$Y?aYa7BBj5@&sKOOAZ=h83M@JK>vL`r->c*BUf=*V4L^xu-j7^7r@6FWj|f zdUkK#<*W~jjO)zhx7ka^*T3kDcBCA5{_Nb;QcJXdZ_C{u5`T|Pb#6JduORJ4NA`uO gE4nY|K3MxQQj;FkY%o~c=E*5I>=m}(6xXi#FLh}QJOBUy 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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 i-Mg8sAAgr>48^!_=iPjxQn^P?!DcPByirvB { 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