From 0e102bd39a33d271cd36a21255fac7cf4133d0bb Mon Sep 17 00:00:00 2001
From: Dmitry <ondyshev.dmitry@gmail.com>
Date: Mon, 11 Dec 2023 07:46:18 +0700
Subject: [PATCH] finish small ships

---
 kubejs/server_scripts/main_server_script.js   |  3 +-
 kubejs/server_scripts/small_ships/recipes.js  | 11 ++++--
 kubejs/server_scripts/small_ships/tags.js     |  8 +++++
 .../startup_scripts/small_ships/constants.js  | 36 +++++++++++++++++--
 4 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 kubejs/server_scripts/small_ships/tags.js

diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js
index a9c80afeb..cdf012461 100644
--- a/kubejs/server_scripts/main_server_script.js
+++ b/kubejs/server_scripts/main_server_script.js
@@ -6,6 +6,7 @@
 ServerEvents.tags('item', event => {
     registerTFCItemTags(event)
     registerFirmaLifeItemTags(event)
+    registerSmallShipsItemTags(event)
     // registerMinecraftItemTags(event)
     registerCreateItemTags(event)
     registerAdAstraItemTags(event)
@@ -60,6 +61,7 @@ ServerEvents.recipes(event => {
     registerFirmaLifeRecipes(event)
     registerWaterFlasksRecipes(event)
     registerTreeTapRecipes(event)
+    registerSmallShipsRecipes(event)
     // registerMinecraftRecipes(event)
     // registerGTCEURecipes(event)
     registerCreateRecipes(event)
@@ -68,7 +70,6 @@ ServerEvents.recipes(event => {
     registerAdAstraRecipes(event)
     // registerMoreRedRecipes(event)
     // registerSophisticatedBackpacksRecipes(event)
-    registerSmallShipsRecipes(event)
     registerToolBeltRecipes(event)
 })
 
diff --git a/kubejs/server_scripts/small_ships/recipes.js b/kubejs/server_scripts/small_ships/recipes.js
index 79551ef9e..f329557c5 100644
--- a/kubejs/server_scripts/small_ships/recipes.js
+++ b/kubejs/server_scripts/small_ships/recipes.js
@@ -3,9 +3,14 @@
 const registerSmallShipsRecipes = (event) => {
     
     // Удаление рецептов ванильных кораблей
-    global.VANILLA_WOOD_TYPES.forEach(woodTypeName => {
-        global.SHIP_TYPES.forEach(shipTypeName => {
-            event.remove({ id: `smallships:${woodTypeName}_${shipTypeName}` })
+    global.SMALL_SHIPS_DISABLED_ITEMS.forEach(item => {
+        event.remove({ output: item })
+    })
+
+    // Удаление конверсии ванильных кораблей в тфк
+    global.SHIP_TYPES.forEach(shipType => {
+        global.VANILLA_WOOD_TYPES.forEach(woodType => {
+            event.remove({ id: `tfships:${woodType}_${shipType}_conversion` })
         })
     })
 
diff --git a/kubejs/server_scripts/small_ships/tags.js b/kubejs/server_scripts/small_ships/tags.js
new file mode 100644
index 000000000..9b6b90759
--- /dev/null
+++ b/kubejs/server_scripts/small_ships/tags.js
@@ -0,0 +1,8 @@
+// priority: 0
+
+const registerSmallShipsItemTags = (event) => {
+    // Удаление тегов у отключенных предметов
+    global.SMALL_SHIPS_DISABLED_ITEMS.forEach(item => {
+        event.removeAllTagsFrom(item)
+    })
+}
\ No newline at end of file
diff --git a/kubejs/startup_scripts/small_ships/constants.js b/kubejs/startup_scripts/small_ships/constants.js
index 8a9fb75a1..98fee44f3 100644
--- a/kubejs/startup_scripts/small_ships/constants.js
+++ b/kubejs/startup_scripts/small_ships/constants.js
@@ -1,7 +1,37 @@
 // priority: 0
 
+global.SMALL_SHIPS_DISABLED_ITEMS = [
+    'smallships:oak_cog', 
+    'smallships:oak_brigg', 
+    'smallships:oak_galley', 
+    'smallships:spruce_cog', 
+    'smallships:spruce_brigg', 
+    'smallships:spruce_galley', 
+    'smallships:birch_cog', 
+    'smallships:birch_brigg', 
+    'smallships:birch_galley', 
+    'smallships:jungle_cog', 
+    'smallships:jungle_brigg', 
+    'smallships:jungle_galley', 
+    'smallships:acacia_cog', 
+    'smallships:acacia_brigg', 
+    'smallships:acacia_galley', 
+    'smallships:cherry_cog', 
+    'smallships:cherry_brigg', 
+    'smallships:cherry_galley', 
+    'smallships:dark_oak_cog', 
+    'smallships:dark_oak_brigg', 
+    'smallships:dark_oak_galley', 
+    'smallships:mangrove_cog', 
+    'smallships:mangrove_brigg', 
+    'smallships:mangrove_galley', 
+    'smallships:bamboo_cog', 
+    'smallships:bamboo_brigg', 
+    'smallships:bamboo_galley'
+];
+
 global.SHIP_TYPES = [
-    "cog",
-    "brigg",
-    "galley"
+    'cog',
+    'brigg',
+    'galley'
 ];
\ No newline at end of file