From 1a8600203a5c3191cc43ec6410e6fb7b07a3e7ad Mon Sep 17 00:00:00 2001
From: Xikaro <55663835+Xikaro@users.noreply.github.com>
Date: Tue, 14 Nov 2023 22:10:30 +0500
Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D1=80=D0=B0=D1=84=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D1=80=D1=8E=D0=BA=D0=B7=D0=B0=D0=BA=D0=BE=D0=B2=20part3"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 027f1770ebcebe78106b05205464a42d0e7d37d8.
---
 kubejs/client_scripts/mainClientScript.js     |   1 -
 .../sophisticatedbackpacks/constants.js       |  25 --
 .../sophisticatedbackpacks/rei.js             |   7 -
 .../sophisticatedbackback/recipes.js          | 259 ++----------------
 4 files changed, 20 insertions(+), 272 deletions(-)
 delete mode 100644 kubejs/client_scripts/sophisticatedbackpacks/constants.js
 delete mode 100644 kubejs/client_scripts/sophisticatedbackpacks/rei.js

diff --git a/kubejs/client_scripts/mainClientScript.js b/kubejs/client_scripts/mainClientScript.js
index b858d738e..7dff6b554 100644
--- a/kubejs/client_scripts/mainClientScript.js
+++ b/kubejs/client_scripts/mainClientScript.js
@@ -7,7 +7,6 @@ REIEvents.hide('item', event => {
     hideCreateStuff(event)
     hideMinecraftStuff(event)
     hideExtendedCraftingStuff(event)
-    hideSophisticatedBackpacksStuff(event)
 })
 
 
diff --git a/kubejs/client_scripts/sophisticatedbackpacks/constants.js b/kubejs/client_scripts/sophisticatedbackpacks/constants.js
deleted file mode 100644
index 209310fdf..000000000
--- a/kubejs/client_scripts/sophisticatedbackpacks/constants.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// priority: 199
-
-const sophisticatedbackpacksItemsToHide = [
-    'sophisticatedbackpacks:inception_upgrade',
-    'sophisticatedbackpacks:smelting_upgrade',
-    'sophisticatedbackpacks:auto_smelting_upgrade',
-    'sophisticatedbackpacks:smoking_upgrade',
-    'sophisticatedbackpacks:auto_smoking_upgrade',
-    'sophisticatedbackpacks:blasting_upgrade',
-    'sophisticatedbackpacks:auto_blasting_upgrade',
-    'sophisticatedbackpacks:stonecutter_upgrade',
-    'sophisticatedbackpacks:stonecutter_upgrade',
-    'sophisticatedbackpacks:stack_upgrade_tier_2',
-    'sophisticatedbackpacks:stack_upgrade_tier_3',
-    'sophisticatedbackpacks:stack_upgrade_tier_4',
-    'sophisticatedbackpacks:tank_upgrade',
-    'sophisticatedbackpacks:battery_upgrade',
-    'sophisticatedbackpacks:pump_upgrade',
-    'sophisticatedbackpacks:advanced_pump_upgrade',
-    'sophisticatedbackpacks:xp_pump_upgrade',
-    'sophisticatedbackpacks:advanced_compacting_upgrade',
-    'sophisticatedbackpacks:compacting_upgrade',
-    'sophisticatedbackpacks:advanced_feeding_upgrade',
-    'sophisticatedbackpacks:feeding_upgrade'
-]
diff --git a/kubejs/client_scripts/sophisticatedbackpacks/rei.js b/kubejs/client_scripts/sophisticatedbackpacks/rei.js
deleted file mode 100644
index 11f8819fa..000000000
--- a/kubejs/client_scripts/sophisticatedbackpacks/rei.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// priority: 0
-
-const hideSophisticatedBackpacksStuff = (event) => {
-    sophisticatedbackpacksItemsToHide.forEach(itemToHide => {
-        event.hide(itemToHide)
-    })
-}
\ No newline at end of file
diff --git a/kubejs/server_scripts/sophisticatedbackback/recipes.js b/kubejs/server_scripts/sophisticatedbackback/recipes.js
index 8599b5f92..a978ae74d 100644
--- a/kubejs/server_scripts/sophisticatedbackback/recipes.js
+++ b/kubejs/server_scripts/sophisticatedbackback/recipes.js
@@ -1,13 +1,9 @@
 const registersophisticatedbackpacksRecipes = (event) => {
-
-// Удаление рецептов мода sophisticatedbackpacks
-
+    // Удаление рецептов мода create 
     event.remove({ mod: 'sophisticatedbackpacks' });
 
-
-//изменение крафтов рюкзаков
-
-  //измененный крафт БАЗОВОГО рюкзака
+    //изменение крафтов
+    //измененный крафт БАЗОВОГО рюкзака
     event.shaped('sophisticatedbackpacks:backpack', [
     'ABD', 
     'ACA',
@@ -19,7 +15,8 @@ const registersophisticatedbackpacksRecipes = (event) => {
     D: 'minecraft:name_tag'   
   });
 
-  //измененный крафт ЖЕЛЕЗНОГО рюкзака
+    //измененный крафт ЖЕЛЕЗНОГО рюкзака
+
    event.shaped('sophisticatedbackpacks:iron_backpack', [// arg 1: output
     'ABA', 
     'BCB', // arg 2: the shape (array of strings)
@@ -30,7 +27,7 @@ const registersophisticatedbackpacksRecipes = (event) => {
     C: 'sophisticatedbackpacks:backpack'   
   });
 
-  //измененный крафт ЗОЛОТОГО рюкзака
+    //измененный крафт ЗОЛОТОГО рюкзака
    event.shaped('sophisticatedbackpacks:gold_backpack', [
     'ABA',
     'CDC',
@@ -43,7 +40,8 @@ const registersophisticatedbackpacksRecipes = (event) => {
     E: '#forge:plates/double/steel'
   });
 
-  //измененный крафт АЛМАЗНОГО рюкзака
+
+    //измененный крафт АЛМАЗНОГО рюкзака
    event.shaped('sophisticatedbackpacks:diamond_backpack', [
         'ABA',
         'BCB',
@@ -54,7 +52,7 @@ const registersophisticatedbackpacksRecipes = (event) => {
         C: 'sophisticatedbackpacks:gold_backpack'
     });
     
-  //измененный крафт НЕЗЕРИТОВОГО рюкзака
+    //измененный крафт НЕЗЕРИТОВОГО рюкзака
    event.shaped('sophisticatedbackpacks:netherite_backpack', [
         'ABC',
         'DED',
@@ -67,232 +65,15 @@ const registersophisticatedbackpacksRecipes = (event) => {
         E: 'sophisticatedbackpacks:diamond_backpack'
     });
 
-
-//изменение крафтов апгрейдов
-
-  //измененный крафт upgrade_base
-  event.shaped('sophisticatedbackpacks:upgrade_base', [
-    'ABA',
-    'BCB',
-    'ADA'
-    ], {
-    A: '#forge:string',
-    B: '#forge:rods/long/wrought_iron',
-    C: 'minecraft:leather',
-    D: '#forge:plates/steel'
-  });
-
-  //измененный крафт pickup_upgrade
-  event.shaped('sophisticatedbackpacks:pickup_upgrade', [
-    'ABA',
-    'CDE',
-    'FGF'
-    ], {
-    A: 'gtceu:hv_electric_motor',
-    B: 'gtceu:mercury_barium_calcium_cuprate_single_wire',
-    C: 'gtceu:hv_conveyor_module',
-    D: 'sophisticatedbackpacks:upgrade_base',
-    E: 'gtceu:hv_robot_arm',
-    F: '#forge:circuits/hv',
-    G: '#forge:batteries/hv'
-  });
-
-  //измененный крафт advanced_pickup_upgrade
-  event.shapeless('sophisticatedbackpacks:advanced_pickup_upgrade', [
-    'sophisticatedbackpacks:pickup_upgrade',
-    '#forge:circuits/ev'
-  ]);
-
-  //измененный крафт filter_upgrade
-  event.shaped('sophisticatedbackpacks:filter_upgrade', [
-    'ABC',
-    'DEF',
-    'GHG'
-    ], {
-    A: '#forge:batteries/lv',
-    B: 'gtceu:item_filter',
-    C: 'gtceu:manganese_phosphide_single_wire',
-    D: 'gtceu:lv_conveyor_module',
-    E: 'sophisticatedbackpacks:upgrade_base',
-    F: 'gtceu:lv_robot_arm',
-    G: '#forge:circuits/lv',
-    H: 'gtceu:item_tag_filter'
-  });
-
-  //измененный крафт advanced_filter_upgrade
-  event.shapeless('sophisticatedbackpacks:advanced_filter_upgrade', [
-    'sophisticatedbackpacks:filter_upgrade',
-    '#forge:circuits/mv'
-  ]);
-
-  //измененный крафт magnet_upgrade
-  event.shaped('sophisticatedbackpacks:magnet_upgrade', [
-    'ABA',
-    'CDC',
-    'AEA'
-    ], {
-    A: 'gtceu:hv_robot_arm',
-    B: 'gtceu:item_filter',
-    C: '#forge:circuits/hv',
-    D: 'sophisticatedbackpacks:upgrade_base',
-    E: '#forge:batteries/hv'
-  });
-
-  //измененный крафт advanced_magnet_upgrade
-  event.shapeless('sophisticatedbackpacks:advanced_magnet_upgrade', [
-    'sophisticatedbackpacks:magnet_upgrade',
-    '#forge:circuits/ev'
-  ]);
-
-  //измененный крафт void_upgrade
-  event.shaped('sophisticatedbackpacks:void_upgrade', [
-    'ABA',
-    'CDE',
-    'FGF'
-    ], {
-    A: '#forge:screws/steel',
-    B: 'gtceu:item_detector_cover',
-    C: '#forge:tools/screwdrivers',
-    D: 'sophisticatedbackpacks:upgrade_base',
-    E: '#forge:tools/wrenches',
-    F: 'gtceu:brass_normal_item_pipe',
-    G: '#forge:ender_pearls'
-  });
-
-  //измененный крафт advanced_void_upgrade
-  event.shapeless('sophisticatedbackpacks:advanced_void_upgrade', [
-    'sophisticatedbackpacks:void_upgrade',
-    '#forge:circuits/mv'
-  ]);
-
-  //измененный крафт deposit_upgrade
-  event.shaped('sophisticatedbackpacks:deposit_upgrade', [
-    'ABC',
-    'DED',
-    ' F '
-    ], {
-    A: '#forge:batteries/lv',
-    B: 'gtceu:manganese_phosphide_single_wire',
-    C: '#forge:circuits/lv',
-    D: 'gtceu:lv_conveyor_module',
-    E: 'sophisticatedbackpacks:upgrade_base',
-    F: 'gtceu:lv_robot_arm'
-  });
-
-  //измененный крафт advanced_deposit_upgrade
-  event.shapeless('sophisticatedbackpacks:advanced_deposit_upgrade', [
-    'sophisticatedbackpacks:deposit_upgrade',
-    '#forge:circuits/mv'
-  ]);
-
-  //измененный крафт restock_upgrade
-  event.shaped('sophisticatedbackpacks:restock_upgrade', [
-    ' A ',
-    'BCB',
-    'DEF'
-    ], {
-    A: 'gtceu:lv_robot_arm',
-    B: 'gtceu:lv_conveyor_module',
-    C: 'sophisticatedbackpacks:upgrade_base',
-    D: '#forge:batteries/lv',
-    E: 'gtceu:manganese_phosphide_single_wire',
-    F: '#forge:circuits/lv',
-  });
-
-  //измененный крафт advanced_restock_upgrade
-  event.shapeless('sophisticatedbackpacks:advanced_restock_upgrade', [
-    'sophisticatedbackpacks:restock_upgrade',
-    '#forge:circuits/mv'
-  ]);
-
-  //измененный крафт refill_upgrade
-  event.shaped('sophisticatedbackpacks:refill_upgrade', [
-    'ABC',
-    'DED',
-    'CBA'
-    ], {
-    A: 'gtceu:manganese_phosphide_single_wire',
-    B: '#forge:circuits/lv',
-    C: '#forge:batteries/lv',
-    D: 'gtceu:lv_robot_arm',
-    E: 'sophisticatedbackpacks:upgrade_base'
-  });
-
-  //измененный крафт advanced_refill_upgrade
-  event.shapeless('sophisticatedbackpacks:advanced_refill_upgrade', [
-    'sophisticatedbackpacks:refill_upgrade',
-    '#forge:circuits/mv'
-  ]);
-
-  //измененный крафт everlasting_upgrade
-  event.shaped('sophisticatedbackpacks:everlasting_upgrade', [
-    'ABC',
-    'BDB',
-    'EBA'
-    ], {
-    A: 'gtceu:zpm_field_generator',
-    B: '#forge:plates/neutronium',
-    C: '#forge:circuits/zpm',
-    D: 'sophisticatedbackpacks:upgrade_base',
-    E: '#forge:batteries/zpm'
-  });
-
-  //измененный крафт crafting_upgrade
-  event.shaped('sophisticatedbackpacks:crafting_upgrade', [
-    'ABA',
-    'CDC',
-    'ACA'
-    ], {
-    A: '#forge:rods/steel',
-    B: '#tfc:workbenches',
-    C: '#forge:plates/steel',
-    D: 'sophisticatedbackpacks:upgrade_base',
-  });
-
-  //измененный крафт stack_upgrade_tier_1
-  event.shaped('sophisticatedbackpacks:stack_upgrade_tier_1', [
-    'ABA',
-    'CDC',
-    'AEA'
-    ], {
-    A: '#forge:circuits/iv',
-    B: 'gtceu:samarium_iron_arsenic_oxide_single_wire',
-    C: '#forge:batteries/iv',
-    D: 'sophisticatedbackpacks:upgrade_base',
-    E: 'gtceu:iv_field_generator'
-  });
-
-  //измененный крафт jukebox_upgrade
-  event.shaped('sophisticatedbackpacks:jukebox_upgrade', [
-    'ABA',
-    'CDC',
-    'ACA'
-    ], {
-    A: '#forge:rods/steel',
-    B: 'minecraft:jukebox',
-    C: '#forge:plates/steel',
-    D: 'sophisticatedbackpacks:upgrade_base',
-  });
-
-  //измененный крафт tool_swapper_upgrade
-  event.shaped('sophisticatedbackpacks:tool_swapper_upgrade', [
-    'ABC',
-    'DEF',
-    'CGA'
-    ], {
-    A: '#forge:circuits/lv',
-    B: '#minecraft:pickaxes',
-    C: 'gtceu:lv_robot_arm',
-    D: '#minecraft:hoes',
-    E: 'sophisticatedbackpacks:upgrade_base',
-    F: '#minecraft:shovels',
-    G: '#minecraft:axes',
-  });
-
-  //измененный крафт advanced_tool_swapper_upgrade
-  event.shapeless('sophisticatedbackpacks:advanced_tool_swapper_upgrade', [
-    'sophisticatedbackpacks:tool_swapper_upgrade',
-    '#forge:circuits/mv'
-  ]);
-//все крафты данного мода были изменены или удалены.
+    //измененный крафт АПГРЕЙД БАЗЫ
+   event.shaped('sophisticatedbackpacks:upgrade_base', [
+        'ABA',
+        'BCB',
+        'ADA'
+        ], {
+        A: '#forge:string',
+        B: '#forge:rods/long/wrought_iron',
+        C: 'minecraft:leather',
+        D: '#forge:plates/steel'
+    });
 }
\ No newline at end of file