From bc2823c6368039fafd4b7c0d6a732e035d186420 Mon Sep 17 00:00:00 2001
From: Dmitry <ondyshev.dmitry@gmail.com>
Date: Thu, 25 Apr 2024 18:45:26 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20#310?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/ftbquests/quests/chapters/ae2.snbt   | 52 +++++++++++++++++----
 kubejs/server_scripts/ae2iec/recipes.js     | 32 +++++++++++++
 kubejs/server_scripts/ae2na/recipes.js      | 18 +++++++
 kubejs/server_scripts/main_server_script.js |  2 +
 4 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 kubejs/server_scripts/ae2iec/recipes.js
 create mode 100644 kubejs/server_scripts/ae2na/recipes.js

diff --git a/config/ftbquests/quests/chapters/ae2.snbt b/config/ftbquests/quests/chapters/ae2.snbt
index dcb68b017..591c35cb9 100644
--- a/config/ftbquests/quests/chapters/ae2.snbt
+++ b/config/ftbquests/quests/chapters/ae2.snbt
@@ -915,7 +915,7 @@
 				item: "ae2:wireless_terminal"
 				type: "item"
 			}]
-			x: 3.5d
+			x: 5.5d
 			y: 12.5d
 		}
 		{
@@ -931,7 +931,7 @@
 				}
 				type: "item"
 			}]
-			x: 5.5d
+			x: 7.5d
 			y: 11.5d
 		}
 		{
@@ -943,7 +943,7 @@
 				item: "ae2wtlib:wireless_pattern_encoding_terminal"
 				type: "item"
 			}]
-			x: 5.5d
+			x: 7.5d
 			y: 13.5d
 		}
 		{
@@ -960,7 +960,7 @@
 				item: "ae2wtlib:wireless_universal_terminal"
 				type: "item"
 			}]
-			x: 7.5d
+			x: 9.5d
 			y: 12.5d
 		}
 		{
@@ -972,8 +972,8 @@
 				item: "ae2wtlib:quantum_bridge_card"
 				type: "item"
 			}]
-			x: 2.5d
-			y: 14.0d
+			x: 1.5d
+			y: 14.5d
 		}
 		{
 			dependencies: ["2054E9812A64BF56"]
@@ -984,8 +984,8 @@
 				item: "ae2wtlib:magnet_card"
 				type: "item"
 			}]
-			x: 1.0d
-			y: 14.0d
+			x: 0.5d
+			y: 14.5d
 		}
 		{
 			dependencies: ["694C8A2A90A70052"]
@@ -996,7 +996,7 @@
 				item: "ae2wtlib:wireless_pattern_access_terminal"
 				type: "item"
 			}]
-			x: 5.5d
+			x: 7.5d
 			y: 12.5d
 		}
 		{
@@ -1423,6 +1423,40 @@
 			x: -6.0d
 			y: 9.5d
 		}
+		{
+			dependencies: ["3E0EE1623F16A15A"]
+			id: "34A03EDFA166A83F"
+			shape: "circle"
+			tasks: [{
+				id: "7927F49F7DC0275B"
+				item: "ae2netanalyser:network_analyser"
+				type: "item"
+			}]
+			x: 1.0d
+			y: 8.5d
+		}
+		{
+			dependencies: ["2054E9812A64BF56"]
+			id: "6214719888444F36"
+			tasks: [{
+				id: "009962F974145F70"
+				item: "ae2insertexportcard:insert_card"
+				type: "item"
+			}]
+			x: 3.5d
+			y: 11.5d
+		}
+		{
+			dependencies: ["2054E9812A64BF56"]
+			id: "6CC384B9D7A9A1AB"
+			tasks: [{
+				id: "4A2F7338322999CA"
+				item: "ae2insertexportcard:export_card"
+				type: "item"
+			}]
+			x: 3.5d
+			y: 13.5d
+		}
 	]
 	title: "&6HV&r - AE2"
 }
diff --git a/kubejs/server_scripts/ae2iec/recipes.js b/kubejs/server_scripts/ae2iec/recipes.js
new file mode 100644
index 000000000..63cdae89d
--- /dev/null
+++ b/kubejs/server_scripts/ae2iec/recipes.js
@@ -0,0 +1,32 @@
+// priority: 0
+
+const registerAE2InsertExportCardRecipes = (event) => {
+    
+    // Удаление рецептов
+    event.remove({ id: 'ae2insertexportcard:insert_card' })
+    event.remove({ id: 'ae2insertexportcard:export_card' })
+
+    // Insert Card
+    event.recipes.gtceu.assembler('ae2insertexportcard:insert_card')
+        .itemInputs(
+            '4x gtceu:ev_sensor',
+            '8x ae2:wireless_booster',
+            '2x gtceu:iv_sensor',
+            '4x ae2:import_bus',
+            'ae2:advanced_card')
+        .itemOutputs('ae2insertexportcard:insert_card')
+        .duration(100)
+        .EUt(1920)
+
+    // Export Card
+    event.recipes.gtceu.assembler('ae2insertexportcard:export_card')
+        .itemInputs(
+            '4x gtceu:ev_sensor',
+            '8x ae2:wireless_booster',
+            '2x gtceu:iv_sensor',
+            '4x ae2:export_bus',
+            'ae2:advanced_card')
+        .itemOutputs('ae2insertexportcard:export_card')
+        .duration(100)
+        .EUt(1920)
+}
\ No newline at end of file
diff --git a/kubejs/server_scripts/ae2na/recipes.js b/kubejs/server_scripts/ae2na/recipes.js
new file mode 100644
index 000000000..b901438a2
--- /dev/null
+++ b/kubejs/server_scripts/ae2na/recipes.js
@@ -0,0 +1,18 @@
+// priority: 0
+
+const registerAE2NetworkAnalyzerRecipes = (event) => {
+    
+    // Network_analyser
+    event.shaped('ae2netanalyser:network_analyser', [
+        'ABA',
+        'CDC',
+        'EFE' 
+    ], {
+        A: 'gtceu:iv_sensor',
+        B: 'gtceu:iv_emitter',
+        C: '#gtceu:circuits/iv',
+        D: 'gtceu:computer_monitor_cover',
+        E: '#forge:plates/tungsten_steel',
+        F: '#gtceu:batteries/iv'
+    }).id('ae2netanalyser:analyser')
+}
\ No newline at end of file
diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js
index 42008c03e..0bff5ea13 100644
--- a/kubejs/server_scripts/main_server_script.js
+++ b/kubejs/server_scripts/main_server_script.js
@@ -102,6 +102,8 @@ GTCEuServerEvents.oreVeins(event => {
 ServerEvents.recipes(event => {
     registerAE2Recipes(event)
     registerAsticorCartsRecipes(event)
+    registerAE2InsertExportCardRecipes(event)
+    registerAE2NetworkAnalyzerRecipes(event)
     registerAE2WTLibRecipes(event)
     registerChiselAndBitsRecipes(event)
     registerComputerCraftRecipes(event)