merge

config/immersive_optimization.json

@@ -24,7 +24,8 @@
     "minecraft:player": false,
     "minecraft:arrow": false,
     "create": false,
-    "minecraft:ender_dragon": false
+    "minecraft:ender_dragon": false,
+	"sandworm_mod": false
   },
   "version": 2,
   "name": "immersive_optimization"

kubejs/assets/tacz/lang/en_us.json

@@ -1,11 +1,17 @@
 {
   "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "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",
+  
   "applied_armorer.attachment.extended_mag_aa_1.name": "Certus Grooved Magazine",
   "applied_armorer.attachment.extended_mag_aa_2.name": "§9Certus Grooved Magazine",
   "applied_armorer.attachment.extended_mag_aa_3.name": "§dCertus Grooved Magazine",
+  
   "applied_armorer.attachment.extended_mid_mag_aa_1.name": "Fluix Grooved Magazine",
   "applied_armorer.attachment.extended_mid_mag_aa_2.name": "§9Fluix Grooved Magazine",
   "applied_armorer.attachment.extended_mid_mag_aa_3.name": "§dFluix Grooved Magazine",
+  
   "applied_armorer.attachment.grip_lf11.name": "LF-11 Laser-Grip",
   "applied_armorer.attachment.grip_sl_2.name": "SL-2 Laser-Grip",
   "applied_armorer.attachment.grip_stable.name": "ST-61 Grip",
@@ -15,4 +21,5 @@
   "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"
+  
 }

kubejs/server_scripts/create/recipes.js

@@ -2010,12 +2010,14 @@ const registerCreateRecipes = (event) => {
 	event.recipes.gtceu.assembler('create:goggles')
 		.itemInputs('2x #forge:rings/brass', '#forge:leather', '2x tfc:lens')
 		.itemOutputs('create:goggles')
+		.circuit(10)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 
 	event.recipes.gtceu.assembler('create:goggles_rubber')
 		.itemInputs('2x #forge:rings/brass', '#forge:foils/rubber', '2x tfc:lens')
 		.itemOutputs('create:goggles')
+		.circuit(10)
 		.duration(50)
 		.EUt(GTValues.VA[GTValues.ULV])
 

kubejs/server_scripts/main_server_script.js

@@ -271,4 +271,14 @@ TaCZServerEvents.ammoIndexLoad((event) => {
 
 TaCZServerEvents.attachmentIndexLoad((event) => {
 	attachmentIndexLogic(event)
-})
+})
+
+TaCZServerEvents.gunDataLoad((event) => {
+	gunDataLogic(event)
+})
+
+TaCZServerEvents.attachmentDataLoad((event) => {
+	attachmentDataLogic(event)
+})
+
+

kubejs/server_scripts/tacz/index_modifiers.js

@@ -1,24 +1,78 @@
 "use strict";
 
+//IndexLogic is used mainly for the removal of tacz items
+//	const json = JSON.parse(event.getStdJson());
+//	console.log(json);
+//	return event.setJson(JSON.stringify(json));
+//This can be used to read what the json contains for any given id
+
 const ammoIndexLogic = (event) => {
 	const id = event.getId().toString();
-	
+
 	if (!global.TACZ_ENABLED_AMMO.includes(id)) {
 		
 		return event.removeAmmo();
 	}
-	
-	
 }
 
 const attachmentIndexLogic = (event) => {
-	const id = event.getId().toString();
+	const id = event.getId().toString();	
 	
 	if (!global.TACZ_ENABLED_ATTACH.includes(id)) {
 		
 		return event.removeAttachment();
 	}
 	
+	const json = JSON.parse(event.getStdJson());
+	
+	
+	switch(id) {
+		
+		//Scope Sorting
+		case "create_armorer:sight_simple": json.sort = 100; break;
+		case "create_armorer:sight_reflex": json.sort = 101; break;
+		case "applied_armorer:si_pricision": json.sort = 102; break;
+		case "applied_armorer:si_double_sided_mirror": json.sort = 103; break;
+		
+		case "create_armorer:sight_standard": json.sort = 200; break;
+		case "applied_armorer:si_ms_12": json.sort = 201; break;
+		
+		case "create_armorer:sight_medium_distance": json.sort = 400; break;
+		case "applied_armorer:scope_ms_14": json.sort = 401; break;
+		case "tacz:scope_1873_6x": json.sort = 600; break;
+		case "create_armorer:scope_telephoto": json.sort = 800; break;
+		case "applied_armorer:scope_xgs_905": json.sort = 801; break;
+		
+		//Muzzle Sorting
+		case "create_armorer:muzzle_refit_bigger_cylinder": json.sort = 100; break;
+		case "create_armorer:muzzle_refit_lava_perfusion_bottle": json.sort = 101; break;
+		case "applied_armorer:muzzle_ns_1": json.sort = 201; break;
+		case "applied_armorer:muzzle_classic": json.sort = 202; break;
+		case "applied_armorer:muzzle_bs_mod4": json.sort = 203; break;
+		case "applied_armorer:muzzle_commander": json.sort = 204; break;
+		
+		//Grip Sorting
+		case "create_armorer:grip_wooden": json.sort = 100; break;
+		case "create_armorer:grip_gantry_shaft": json.sort = 101; break;
+		case "applied_armorer:grip_light": json.sort = 102; break;
+		case "applied_armorer:grip_stable": json.sort = 103; break;
+		
+		case "create_armorer:grip_shaft": json.sort = 200; break;
+		case "applied_armorer:grip_hf_17": json.sort = 201; break;
+		
+		case "applied_armorer:grip_lf11": json.sort = 300; break;
+		case "applied_armorer:grip_sl_2": json.sort = 301; break;
+		
+		//Mag Sorting
+		case "applied_armorer:extended_mag_aa_1": json.sort = 401; break;
+		case "applied_armorer:extended_mag_aa_2": json.sort = 402; break;
+		case "applied_armorer:extended_mag_aa_3": json.sort = 403; break;
+		case "applied_armorer:extended_mid_mag_aa_1": json.sort = 404; break;
+		case "applied_armorer:extended_mid_mag_aa_2": json.sort = 405; break;
+		case "applied_armorer:extended_mid_mag_aa_3": json.sort = 406; break;
+	} 
+	
+	return event.setJson(JSON.stringify(json));
 }
 
 const gunIndexLogic = (event) => {
@@ -28,6 +82,75 @@ const gunIndexLogic = (event) => {
 		
 		return event.removeGun();
 	}
+}
+
+const attachmentDataLogic = (event) => {
 	
+}
+
+const gunDataLogic = (event) => {
+	const id = event.getId().toString();
+	const json = JSON.parse(event.getStdJson());
 	
-}
+	if(id === "create_armorer:pistol_revolver_torque_data"){
+		json.bullet.extra_damage.armor_ignore = 0.25;
+	}
+	
+	if(id === "create_armorer:sniper_semi_clockwork_data"){
+		json.bullet.extra_damage.armor_ignore = 0.30;
+		json.bullet.damage = 22;
+		json.bullet.extra_damage.damage_adjust = 
+		[
+			{"distance": 60, "damage": 22},
+			{"distance": 120, "damage": 19},
+			{"distance": "infinite", "damage": 17}
+		]
+		json.builtin_attachments = {};
+		json.builtin_attachments.scope = "create_armorer:sight_simple";
+	}
+	
+	if(id === "applied_armorer:moritz_rifle_ar77_data") {
+		json.ammo = "applied_armorer:hard_core_quartz_bullet";
+		json.bullet.damage = 13;
+		json.bullet.extra_damage.armor_ignore = 0.35;
+		json.bullet.extra_damage.head_shot_multiplier = 1.75;
+		json.bullet.extra_damage.damage_adjust =
+		[
+			{"distance": 80, "damage": 13},
+			{"distance": 120, "damage": 11},
+			{"distance": "infinite", "damage": 9}
+		]
+		
+	}
+	
+	if(id === "tacz:db_long_data"){
+		json.bullet.extra_damage.armor_ignore = 0.22;
+	}
+	
+	if(id === "tacz:db_short_data"){
+		json.bullet.extra_damage.armor_ignore = 0.22;
+	}
+	
+	if(id === "create_armorer:cannon_40mm_salamander_data"){
+		json.bullet.damage = 50;
+		json.bullet.extra_damage.damage_adjust =
+		[
+			{"distance": 200, "damage": 50},
+			{"distance": "infinite", "damage": 45}
+		]
+		json.builtin_attachments = {};
+		json.builtin_attachments.scope = "create_armorer:sight_simple";
+	}
+	
+	if(id === "applied_armorer:moritz_gernade_gl3_data"){
+		json.ammo_amount = 2;
+		json.extended_mag_ammo_amount = 
+		[
+			3,
+			4,
+			5
+		]
+	}
+	
+	return event.setJson(JSON.stringify(json));
+}

kubejs/server_scripts/tacz/recipes.ammo.js

@@ -71,6 +71,13 @@ function registerTACZAmmoRecipes(event){
 					'{AmmoId:"create_armorer:rbapb"}'))
 		.EUt(GTValues.VA[GTValues.MV])
 		.duration(20)
+	event.recipes.gtceu.assembler('tfg_tacz:rb_small_nc')
+		.itemInputs('8x #forge:nuggets/lead','4x #forge:foils/copper', '8x tfg:small_bullet_casing', 
+					'tfg:nitrocellulose')
+		.itemOutputs(Item.of('tacz:ammo', 8, 
+					'{AmmoId:"create_armorer:rbapb"}'))
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(20)
 	event.recipes.gtceu.assembler('tfg_tacz:slap_large')
 		.itemInputs('4x #forge:nuggets/lead','4x #forge:foils/copper', '4x tfg:large_bullet_casing', 
 					'#forge:dusts/gunpowder')
@@ -78,54 +85,102 @@ function registerTACZAmmoRecipes(event){
 					'{AmmoId:"create_armorer:slap"}'))
 		.EUt(GTValues.VA[GTValues.MV])
 		.duration(20)
-	event.recipes.gtceu.assembler('tfg_tacz:12g_shell_peth')
+	event.recipes.gtceu.assembler('tfg_tacz:slap_large_nc')
-		.itemInputs('12x #forge:nuggets/lead', '4x tfg:shell_bullet_casing', '#forge:dusts/gunpowder')
+		.itemInputs('8x #forge:nuggets/lead','8x #forge:foils/copper', '8x tfg:large_bullet_casing', 
-		.inputFluids(Fluid.of('gtceu:polyethylene', 288))
+					'tfg:nitrocellulose')
-		.itemOutputs(Item.of('tacz:ammo', 4, 
+		.itemOutputs(Item.of('tacz:ammo', 8, 
-					'{AmmoId:"tacz:12g"}'))
+					'{AmmoId:"create_armorer:slap"}'))
-		.EUt(GTValues.VA[GTValues.MV])
+		.EUt(GTValues.VA[GTValues.EV])
 		.duration(20)
-	event.recipes.gtceu.assembler('tfg_tacz:12g_shell_pvc')
+	
-		.itemInputs('12x #forge:nuggets/lead', '4x tfg:shell_bullet_casing', '#forge:dusts/gunpowder')
-		.inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 144))
-		.itemOutputs(Item.of('tacz:ammo', 4, 
-					'{AmmoId:"tacz:12g"}'))
-		.EUt(GTValues.VA[GTValues.MV])
-		.duration(30)
 	
 	//Certus era
 	event.recipes.gtceu.assembler('tfg_tacz:fluix_grenade')
-		.itemInputs('#forge:ingots/magnalium', '4x gtceu:gelled_toluene', 'tfg:nitrocellulose')
+		.itemInputs('#forge:ingots/magnalium', '2x gtceu:gelled_toluene', '4x tfg:nitrocellulose')
 		.inputFluids(Fluid.of('tfg:fluix', 720))
 		.itemOutputs(Item.of('tacz:ammo', 
 					'{AmmoId:"applied_armorer:fluix_infused_grenade"}'))
 		.EUt(GTValues.VA[GTValues.EV])
-		.duration(20)
+		.duration(40)
+	event.recipes.gtceu.assembler('tfg_tacz:40mm_he')
+		.itemInputs('#forge:ingots/brass', '#forge:ingots/steel', '8x gtceu:gelled_toluene', 
+					'6x tfg:nitrocellulose')
+		.itemOutputs(Item.of('tacz:ammo', 
+					'{AmmoId:"create_armorer:40mmhe"}'))
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(40)
 
 	event.recipes.gtceu.assembler('tfg_tacz:etched_quartz_small')
-		.itemInputs('2x ae2:certus_quartz_crystal', '4x tfg:small_bullet_casing', 'tfg:nitrocellulose')
+		.itemInputs('2x #forge:flawless_gems/certus_quartz', '4x tfg:small_bullet_casing', '2x tfg:nitrocellulose')
 		.itemOutputs(Item.of('tacz:ammo', 4, 
 					'{AmmoId:"applied_armorer:etched_quartz_bullet"}'))
 		.EUt(GTValues.VA[GTValues.EV])
 		.duration(20)
 	event.recipes.gtceu.assembler('tfg_tacz:hard_quartz_large')
-		.itemInputs('4x ae2:charged_certus_quartz_crystal', '4x tfg:large_bullet_casing', 'tfg:nitrocellulose')
+		.itemInputs('4x #forge:exquisite_gems/certus_quartz', '8x #forge:bolts/tungsten', '4x tfg:large_bullet_casing', 
+					'2x tfg:nitrocellulose')
 		.itemOutputs(Item.of('tacz:ammo', 4, 
 					'{AmmoId:"applied_armorer:hard_core_quartz_bullet"}'))
 		.EUt(GTValues.VA[GTValues.EV])
 		.duration(20)
 	event.recipes.gtceu.assembler('tfg_tacz:cluster_quartz_shell_ptfe')
-		.itemInputs('16x gtceu:chipped_certus_quartz_gem', '4x tfg:shell_bullet_casing', 'tfg:nitrocellulose')
+		.itemInputs('16x gtceu:chipped_certus_quartz_gem', '4x tfg:shell_bullet_casing', '2x tfg:nitrocellulose')
 		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144))
 		.itemOutputs(Item.of('tacz:ammo', 4, 
 					'{AmmoId:"applied_armorer:cluster_quartz_bullet"}'))
 		.EUt(GTValues.VA[GTValues.EV])
 		.duration(20)
 	event.recipes.gtceu.assembler('tfg_tacz:cluster_quartz_shell_pbi')
-		.itemInputs('16x gtceu:chipped_certus_quartz_gem', '4x tfg:shell_bullet_casing', 'tfg:nitrocellulose')
+		.itemInputs('16x gtceu:chipped_certus_quartz_gem', '4x tfg:shell_bullet_casing', '2x tfg:nitrocellulose')
 		.inputFluids(Fluid.of('gtceu:polybenzimidazole', 72))
 		.itemOutputs(Item.of('tacz:ammo', 4, 
 					'{AmmoId:"applied_armorer:cluster_quartz_bullet"}'))
 		.EUt(GTValues.VA[GTValues.EV])
 		.duration(30)
+		
+	//12gauge shell
+	event.recipes.gtceu.assembler('tfg_tacz:12g_shell_peth')
+		.itemInputs('12x #forge:nuggets/lead', '4x tfg:shell_bullet_casing', '2x #forge:dusts/gunpowder')
+		.inputFluids(Fluid.of('gtceu:polyethylene', 288))
+		.itemOutputs(Item.of('tacz:ammo', 4, 
+					'{AmmoId:"tacz:12g"}'))
+		.EUt(GTValues.VA[GTValues.MV])
+		.duration(20)
+	event.recipes.gtceu.assembler('tfg_tacz:12g_shell_pvc')
+		.itemInputs('12x #forge:nuggets/lead', '4x tfg:shell_bullet_casing', '2x #forge:dusts/gunpowder')
+		.inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 144))
+		.itemOutputs(Item.of('tacz:ammo', 4, 
+					'{AmmoId:"tacz:12g"}'))
+		.EUt(GTValues.VA[GTValues.MV])
+		.duration(20)
+	event.recipes.gtceu.assembler('tfg_tacz:12g_shell_ptfe')
+		.itemInputs('12x #forge:nuggets/lead', '4x tfg:shell_bullet_casing', '2x #forge:dusts/gunpowder')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 72))
+		.itemOutputs(Item.of('tacz:ammo', 4, 
+					'{AmmoId:"tacz:12g"}'))
+		.EUt(GTValues.VA[GTValues.HV])
+		.duration(20)
+	event.recipes.gtceu.assembler('tfg_tacz:12g_shell_pbi')
+		.itemInputs('12x #forge:nuggets/lead', '4x tfg:shell_bullet_casing', '2x #forge:dusts/gunpowder')
+		.inputFluids(Fluid.of('gtceu:polybenzimidazole', 36))
+		.itemOutputs(Item.of('tacz:ammo', 4, 
+					'{AmmoId:"tacz:12g"}'))
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(20)
+		
+	event.recipes.gtceu.assembler('tfg_tacz:12g_shell_nc_ptfe')
+		.itemInputs('12x #forge:nuggets/lead', '4x tfg:shell_bullet_casing', 'tfg:nitrocellulose')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 72))
+		.itemOutputs(Item.of('tacz:ammo', 4, 
+					'{AmmoId:"tacz:12g"}'))
+		.EUt(GTValues.VA[GTValues.HV])
+		.duration(20)
+	event.recipes.gtceu.assembler('tfg_tacz:12g_shell_nc_pbi')
+		.itemInputs('12x #forge:nuggets/lead', '4x tfg:shell_bullet_casing', 'tfg:nitrocellulose')
+		.inputFluids(Fluid.of('gtceu:polybenzimidazole', 36))
+		.itemOutputs(Item.of('tacz:ammo', 4, 
+					'{AmmoId:"tacz:12g"}'))
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(20)
+	
 }

kubejs/server_scripts/tacz/recipes.attach.js

@@ -16,7 +16,6 @@ function registerTACZAttachRecipes(event){
 		F: '#forge:tools/files'
 		
 	}).id('tfg_tacz:trapdoor_scope');
-	
 	event.recipes.gtceu.assembler('tfg_tacz:ca_reflex')
 		.itemInputs('tfc:lens', '#forge:rings/brass', '#forge:plates/steel')
 		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"create_armorer:sight_reflex"}'))
@@ -44,6 +43,12 @@ function registerTACZAttachRecipes(event){
 		.circuit(4)
 		.EUt(GTValues.VA[GTValues.MV])
 		.duration(10);
+	event.recipes.gtceu.assembler('tfg_tacz:ca_simple')
+		.itemInputs('#forge:rings/brass', '2x #forge:screws/black_steel', '2x #forge:plates/steel')
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"create_armorer:sight_simple"}'))
+		.circuit(5)
+		.EUt(GTValues.VA[GTValues.MV])
+		.duration(10)
 
 
 	event.recipes.gtceu.assembler('tfg_tacz:aa_pricision')
@@ -134,11 +139,116 @@ function registerTACZAttachRecipes(event){
 	event.recipes.gtceu.assembler('tfg_tacz:wooden_grip')
 		.itemInputs('gtceu:treated_wood_planks', '2x #forge:ingots/steel')
 		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"create_armorer:grip_wooden"}'))
+		.circuit(1)
 		.EUt(GTValues.VA[GTValues.MV])
 		.duration(10)
 	event.recipes.gtceu.assembler('tfg_tacz:gantry_grip')
 		.itemInputs('create:gantry_shaft', '2x #forge:ingots/steel')
 		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"create_armorer:grip_gantry_shaft"}'))
+		.circuit(2)
 		.EUt(GTValues.VA[GTValues.MV])
 		.duration(10)
+	event.recipes.gtceu.assembler('tfg_tacz:grip_shaft')
+		.itemInputs('greate:aluminium_shaft', '#forge:ingots/steel', '#forge:leather')
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"create_armorer:grip_shaft"}'))
+		.circuit(3)
+		.EUt(GTValues.VA[GTValues.MV])
+		.duration(10)
+		
+	event.recipes.gtceu.assembler('tfg_tacz:light_grip')
+		.itemInputs('#forge:ingots/tungsten', '2x #forge:screws/tungsten')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*2))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:grip_light"}'))
+		.circuit(1)
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(20)
+	event.recipes.gtceu.assembler('tfg_tacz:stable_grip')
+		.itemInputs('2x #forge:ingots/tungsten', '4x #forge:screws/tungsten')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*4))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:grip_stable"}'))
+		.circuit(2)
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(20)
+	event.recipes.gtceu.assembler('tfg_tacz:hf17_grip')
+		.itemInputs('2x #forge:ingots/tungsten', '4x #forge:screws/tungsten')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*6))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:grip_hf_17"}'))
+		.circuit(3)
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(20)
+		
+	event.recipes.gtceu.assembler('tfg_tacz:laser_a_grip')
+		.itemInputs('2x #forge:ingots/tungsten', '8x #forge:screws/tungsten', '#forge:lenses/light_blue',
+					'#gtceu:batteries/ev', '8x #forge:fine_wires/aluminium')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*4))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:grip_lf11"}'))
+		.circuit(4)
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(20)
+	event.recipes.gtceu.assembler('tfg_tacz:laser_b_grip')
+		.itemInputs('3x #forge:ingots/tungsten', '10x #forge:screws/tungsten', '#forge:lenses/light_blue',
+					'2x #gtceu:batteries/ev', '16x #forge:fine_wires/aluminium')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*8))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:grip_sl_2"}'))
+		.circuit(5)
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(20)
+		
+	//Mags
+	event.recipes.gtceu.assembler('tfg_tacz:invar_mag')
+		.itemInputs('4x #forge:ingots/invar', '#forge:springs/kanthal')
+		.inputFluids(Fluid.of('gtceu:soldering_alloy', 288))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"create_armorer:extended_mag_ca_1"}'))
+		.EUt(GTValues.VA[GTValues.MV])
+		.duration(60)
+	event.recipes.gtceu.assembler('tfg_tacz:copper_mag')
+		.itemInputs('6x #forge:ingots/stainless_steel', '6x #forge:plates/copper', '#forge:springs/nichrome')
+		.inputFluids(Fluid.of('gtceu:soldering_alloy', 432))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"create_armorer:extended_mag_ca_2"}'))
+		.EUt(GTValues.VA[GTValues.HV])
+		.duration(60)
+	event.recipes.gtceu.assembler('tfg_tacz:brass_mag')
+		.itemInputs('8x #forge:ingots/titanium', '8x #forge:plates/brass', '#forge:springs/niobium_titanium')
+		.inputFluids(Fluid.of('gtceu:soldering_alloy', 576))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"create_armorer:extended_mag_ca_3"}'))
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(60)
+		
+	event.recipes.gtceu.assembler('tfg_tacz:fluix_mag_1')
+		.itemInputs('6x #forge:ingots/titanium', '4x #forge:exquisite_gems/fluix', '#forge:springs/niobium_titanium')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*6))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:extended_mid_mag_aa_1"}'))
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(60)
+	event.recipes.gtceu.assembler('tfg_tacz:fluix_mag_2')
+		.itemInputs('8x #forge:ingots/tungsten_steel', '6x #forge:exquisite_gems/fluix', '#forge:springs/hssg')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*8))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:extended_mid_mag_aa_2"}'))
+		.EUt(GTValues.VA[GTValues.IV])
+		.duration(60)
+	event.recipes.gtceu.assembler('tfg_tacz:fluix_mag_3')
+		.itemInputs('10x #forge:ingots/rhodium_plated_palladium', '8x #forge:exquisite_gems/fluix', '#forge:springs/naquadah')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*10))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:extended_mid_mag_aa_3"}'))
+		.EUt(GTValues.VA[GTValues.LuV])
+		.duration(60)
+		
+	event.recipes.gtceu.assembler('tfg_tacz:certus_mag_1')
+		.itemInputs('4x #forge:ingots/titanium', '2x #forge:exquisite_gems/certus_quartz', '#forge:springs/niobium_titanium')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*4))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:extended_mag_aa_1"}'))
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(60)
+	event.recipes.gtceu.assembler('tfg_tacz:certus_mag_2')
+		.itemInputs('6x #forge:ingots/tungsten_steel', '4x #forge:exquisite_gems/certus_quartz', '#forge:springs/hssg')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*6))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:extended_mag_aa_2"}'))
+		.EUt(GTValues.VA[GTValues.IV])
+		.duration(60)
+	event.recipes.gtceu.assembler('tfg_tacz:certus_mag_3')
+		.itemInputs('8x #forge:ingots/rhodium_plated_palladium', '6x #forge:exquisite_gems/certus_quartz', '#forge:springs/naquadah')
+		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 144*8))
+		.itemOutputs(Item.of('tacz:attachment', '{AttachmentId:"applied_armorer:extended_mag_aa_3"}'))
+		.EUt(GTValues.VA[GTValues.LuV])
+		.duration(60)
 }

kubejs/server_scripts/tacz/recipes.guns.js

@@ -48,6 +48,26 @@ function registerTACZGunRecipes(event){
 		
 	}).id('tacz:trapdoor_rifle');
 	
+	//DB shotguns
+	event.recipes.gtceu.assembler('tfg_tacz:db_short')
+		.itemInputs('2x gtceu:steel_small_fluid_pipe', '4x #forge:ingots/black_steel', '#forge:rods/black_steel',
+					'3x gtceu:treated_wood_planks', '10x #forge:screws/black_steel', 'tfg:advanced_clockwork_mechanism')
+		.inputFluids(Fluid.of('gtceu:soldering_alloy', 432))
+		.itemOutputs(Item.of('tacz:modern_kinetic_gun', 
+					'{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"tacz:db_short",HasBulletInBarrel:1b}'))
+		.circuit(1)
+		.EUt(GTValues.VA[GTValues.MV])
+		.duration(60)
+	event.recipes.gtceu.assembler('tfg_tacz:db_long')
+		.itemInputs('4x gtceu:steel_small_fluid_pipe', '4x #forge:ingots/black_steel', '#forge:rods/black_steel',
+					'6x gtceu:treated_wood_planks', '14x #forge:screws/black_steel', 'tfg:advanced_clockwork_mechanism')
+		.inputFluids(Fluid.of('gtceu:soldering_alloy', 576))
+		.itemOutputs(Item.of('tacz:modern_kinetic_gun', 
+					'{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"tacz:db_long",HasBulletInBarrel:1b}'))
+		.circuit(2)
+		.EUt(GTValues.VA[GTValues.MV])
+		.duration(100)
+	
 	//Region clockwork era
 	event.recipes.gtceu.assembler('tfg_tacz:ca_torque_revo')
 		.itemInputs('gtceu:steel_small_fluid_pipe', '4x #forge:ingots/aluminium', '2x #forge:plates/brass',
@@ -170,8 +190,18 @@ function registerTACZGunRecipes(event){
 		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 2304))
 		.itemOutputs(Item.of('tacz:modern_kinetic_gun', 
 			'{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"applied_armorer:moritz_gernade_gl3",HasBulletInBarrel:1b}'))
-		.circuit(7)
+		.circuit(8)
 		.EUt(GTValues.VA[GTValues.EV])
 		.duration(240)
 	
+	event.recipes.gtceu.assembler('tfg_tacz:ca_cannon')
+		.itemInputs('2x gtceu:tungsten_large_fluid_pipe', '2x gtceu:tungsten_normal_fluid_pipe', '10x #forge:ingots/titanium',
+					'4x #forge:ingots/tungsten', '10x #forge:plates/brass', 'create:gantry_shaft',
+					'4x gtceu:treated_wood_planks', '30x #forge:screws/tungsten', '3x tfg:advanced_clockwork_mechanism')
+		.inputFluids(Fluid.of('gtceu:soldering_alloy', 3024))
+		.itemOutputs(Item.of('tacz:modern_kinetic_gun', 
+							 '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"create_armorer:cannon_40mm_salamander",HasBulletInBarrel:1b}'))
+		.EUt(GTValues.VA[GTValues.EV])
+		.duration(300)
+	
 }

kubejs/server_scripts/tfc/recipes.alabaster.js

@@ -39,6 +39,21 @@ function registerTFCAlabasterRecipes(event) {
 	}
 
 	// Raw Alabaster
+
+	event.remove({ id: 'tfc:barrel/raw_alabaster' })
+	event.recipes.tfc.barrel_sealed(1000)
+		.inputs('gtceu:poor_raw_gypsum', TFC.fluidStackIngredient('tfc:limewater', 50))
+		.outputItem('tfc:alabaster/raw')
+		.id('tfg:barrel/poor_raw_ore_alabaster')
+	event.recipes.tfc.barrel_sealed(1000)
+		.inputs('gtceu:raw_gypsum', TFC.fluidStackIngredient('tfc:limewater', 100))
+		.outputItem('2x tfc:alabaster/raw')
+		.id('tfg:barrel/raw_ore_alabaster')
+	event.recipes.tfc.barrel_sealed(1000)
+		.inputs('gtceu:rich_raw_gypsum', TFC.fluidStackIngredient('tfc:limewater', 150))
+		.outputItem('3x tfc:alabaster/raw')
+		.id('tfg:barrel/rich_raw_ore_alabaster')
+	
 	event.recipes.gtceu.chemical_bath('tfc:alabaster/raw/poor_raw_gypsum')
 		.itemInputs('gtceu:poor_raw_gypsum')
 		.inputFluids(Fluid.of('tfc:limewater', 50))
@@ -93,4 +108,4 @@ function registerTFCAlabasterRecipes(event) {
 			.EUt(7)
 			.category(GTRecipeCategories.CHEM_DYES)
 	}
-}
+}

kubejs/startup_scripts/tacz/constants.js

@@ -65,9 +65,11 @@ global.TACZ_GUNS_INDEX = [
 	
 	//Sniper
 	'create_armorer:sniper_semi_clockwork',
+	'create_armorer:sniper_semi_m1',
 	
 	//Rifle
 	'create_armorer:rifle_assult_crane',
+	'create_armorer:rifle_assult_roller',
 	
 	//Shotgun
 	'create_armorer:shotgun_db_stone',
@@ -77,6 +79,8 @@ global.TACZ_GUNS_INDEX = [
 	'create_armorer:smg_auto_crank',
 	
 	//Heavy
+	'create_armorer:gl_revolver_devastator',
+	'create_armorer:cannon_40mm_salamander',
 	'create_armorer:special_melee_wrench',
 	'create_armorer:special_melee_atomic',
 	'create_armorer:mg_platemag_flywheel',
@@ -141,6 +145,8 @@ global.TACZ_AMMO_INDEX = [
 	'create_armorer:melee_weapon',
 	'create_armorer:rbapb',
 	'create_armorer:gas_pistol_ammo',
+	'create_armorer:gernade',
+	'create_armorer:40mmhe',
 	
 	//AA
 	'applied_armorer:hard_core_quartz_bullet',
@@ -258,17 +264,21 @@ global.TACZ_ATTACH_INDEX = [
 	'create_armorer:sight_standard',
 	'create_armorer:sight_medium_distance',
 	'create_armorer:scope_pipe',
+	'create_armorer:sight_simple',
 	
 	//muzzle
 	'create_armorer:muzzle_refit_iron_spike',
 	'create_armorer:muzzle_refit_brass_retractor',
 	'create_armorer:muzzle_refit_bigger_cylinder',
 	'create_armorer:muzzle_refit_lava_perfusion_bottle',
+	'create_armorer:refit_blasting_protocol',
+	'create_armorer:muzzle_refit_ap_grenade',
 	
 	//grip
 	'create_armorer:grip_pipe',
 	'create_armorer:grip_wooden',
 	'create_armorer:grip_gantry_shaft',
+	'create_armorer:grip_shaft',
 	
 	//mag
 	'create_armorer:extended_mag_ca_1',
@@ -353,13 +363,16 @@ global.TACZ_ENABLED_GUNS = [
 	'ulv_guns:blunderbuss',
 	'create_armorer:shotgun_pump_bearing',
 	'applied_armorer:moritz_shotgun_sg914',
+	'tacz:db_short',
+	'tacz:db_long',
 	
 	//SMG
 	
 	
 	//Heavy
 	'create_armorer:mg_platemag_flywheel',
-	'applied_armorer:moritz_gernade_gl3'
+	'applied_armorer:moritz_gernade_gl3',
+	'create_armorer:cannon_40mm_salamander'
 
 ];
 	
@@ -369,6 +382,7 @@ global.TACZ_ENABLED_AMMO = [
 	'tacz:45_70',
 	'create_armorer:slap',
 	'create_armorer:rbapb',
+	'create_armorer:40mmhe',
 	'applied_armorer:hard_core_quartz_bullet',
 	'applied_armorer:etched_quartz_bullet',
 	'applied_armorer:fluix_infused_grenade',
@@ -383,6 +397,7 @@ global.TACZ_ENABLED_ATTACH = [
 	'create_armorer:scope_telephoto',
 	'create_armorer:sight_standard',
 	'create_armorer:sight_medium_distance',
+	'create_armorer:sight_simple',
 	'applied_armorer:si_double_sided_mirror',
 	'applied_armorer:scope_xgs_905',
 	'applied_armorer:si_ms_12',
@@ -408,14 +423,28 @@ global.TACZ_ENABLED_ATTACH = [
 	
 	//grip
 	'create_armorer:grip_wooden',
-	'create_armorer:grip_gantry_shaft'
+	'create_armorer:grip_gantry_shaft',
+	'create_armorer:grip_shaft',
+	'applied_armorer:grip_hf_17',
+	'applied_armorer:grip_stable',
+	'applied_armorer:grip_light',
+	'applied_armorer:grip_lf11',
+	'applied_armorer:grip_sl_2',
 	
 	//mag
-	
+	'create_armorer:extended_mag_ca_1',
+	'create_armorer:extended_mag_ca_2',
+	'create_armorer:extended_mag_ca_3',
+	'applied_armorer:extended_mag_aa_1',
+	'applied_armorer:extended_mag_aa_2',
+	'applied_armorer:extended_mag_aa_3',
+	'applied_armorer:extended_mid_mag_aa_1',
+	'applied_armorer:extended_mid_mag_aa_2',
+	'applied_armorer:extended_mid_mag_aa_3'
 	
 	//laser
 
 ];
 	
 	
-	
+