diff --git a/CHANGELOG.md b/CHANGELOG.md index 24f90cccb..09b2fb0f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - 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 @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/config/fancymenu/panoramas/mars/panorama/panorama_0.png b/config/fancymenu/panoramas/mars/panorama/panorama_0.png index b724c075f..5271bb102 100644 Binary files a/config/fancymenu/panoramas/mars/panorama/panorama_0.png and b/config/fancymenu/panoramas/mars/panorama/panorama_0.png differ diff --git a/config/fancymenu/panoramas/mars/panorama/panorama_1.png b/config/fancymenu/panoramas/mars/panorama/panorama_1.png index df8697a94..eb6cac4f3 100644 Binary files a/config/fancymenu/panoramas/mars/panorama/panorama_1.png and b/config/fancymenu/panoramas/mars/panorama/panorama_1.png differ diff --git a/config/fancymenu/panoramas/mars/panorama/panorama_2.png b/config/fancymenu/panoramas/mars/panorama/panorama_2.png index 298db9527..1c55cb419 100644 Binary files a/config/fancymenu/panoramas/mars/panorama/panorama_2.png and b/config/fancymenu/panoramas/mars/panorama/panorama_2.png differ diff --git a/config/fancymenu/panoramas/mars/panorama/panorama_3.png b/config/fancymenu/panoramas/mars/panorama/panorama_3.png index 47691273f..674736f1b 100644 Binary files a/config/fancymenu/panoramas/mars/panorama/panorama_3.png and b/config/fancymenu/panoramas/mars/panorama/panorama_3.png differ diff --git a/config/fancymenu/panoramas/mars/panorama/panorama_4.png b/config/fancymenu/panoramas/mars/panorama/panorama_4.png index beb4a3fe2..6867948b0 100644 Binary files a/config/fancymenu/panoramas/mars/panorama/panorama_4.png and b/config/fancymenu/panoramas/mars/panorama/panorama_4.png differ diff --git a/config/fancymenu/panoramas/mars/panorama/panorama_5.png b/config/fancymenu/panoramas/mars/panorama/panorama_5.png index 9cef86085..87c5634ad 100644 Binary files a/config/fancymenu/panoramas/mars/panorama/panorama_5.png and b/config/fancymenu/panoramas/mars/panorama/panorama_5.png differ 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 000000000..31cd04b8b Binary files /dev/null and b/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_diamond.png differ 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 000000000..890abd97f Binary files /dev/null and b/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_gold.png differ diff --git a/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_iron.png b/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_iron.png new file mode 100644 index 000000000..66a9783ab Binary files /dev/null and b/kubejs/assets/tacz/textures/item/ammo_box/upgrade_ring_iron.png differ diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 58776317d..4ef126872 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -87,6 +87,7 @@ ServerEvents.tags('block', event => { 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