diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index f79aafcc8..1bc00fa5b 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -10,7 +10,6 @@ REIEvents.hide('item', event => { hideAdAstraStuff(event) hideSophisticatedBackpacksStuff(event) hideMoreRedStuff(event) - hideSmallShipsStuff(event) }) diff --git a/kubejs/client_scripts/mods/small_ships.js b/kubejs/client_scripts/mods/small_ships.js deleted file mode 100644 index 6a97082e2..000000000 --- a/kubejs/client_scripts/mods/small_ships.js +++ /dev/null @@ -1,9 +0,0 @@ -// priority: 0 - -const hideSmallShipsStuff = (event) => { - global.VANILLA_WOOD_TYPES.forEach(woodTypeName => { - global.SHIP_TYPES.forEach(shipTypeName => { - event.hide(`smallships:${woodTypeName}_${shipTypeName}`) - }) - }) -} \ 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 4847d55f4..47e40861a 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -6,7 +6,6 @@ ServerEvents.tags('item', event => { registerTFCItemTags(event) registerFirmaLifeItemTags(event) - registerSmallShipsItemTags(event) registerMinecraftItemTags(event) registerGTCEUItemTags(event) registerAE2ItemTags(event) @@ -66,7 +65,6 @@ ServerEvents.recipes(event => { registerFirmaLifeRecipes(event) registerWaterFlasksRecipes(event) registerTreeTapRecipes(event) - registerSmallShipsRecipes(event) registerMinecraftRecipes(event) registerGTCEURecipes(event) registerCreateRecipes(event) diff --git a/kubejs/server_scripts/small_ships/recipes.js b/kubejs/server_scripts/small_ships/recipes.js deleted file mode 100644 index f329557c5..000000000 --- a/kubejs/server_scripts/small_ships/recipes.js +++ /dev/null @@ -1,39 +0,0 @@ -// priority: 0 - -const registerSmallShipsRecipes = (event) => { - - // Удаление рецептов ванильных кораблей - 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` }) - }) - }) - - // Cannon - event.remove({ id: 'smallships:cannon' }) - - event.shaped('smallships:cannon', [ - ' A', - 'BBB', - ' CC' - ], { - A: '#forge:string', - B: '#forge:double_plates/wrought_iron', - C: '#minecraft:logs' - }).id('tfships:cannon') - - // Cannon Ball - event.remove({ id: 'smallships:cannon_ball' }) - - event.shaped('4x smallships:cannon_ball', [ - 'AB' - ], { - A: '#forge:dusts/gunpowder', - B: '#forge:plates/wrought_iron' - }).id('tfships:cannon_ball') -} \ No newline at end of file diff --git a/kubejs/server_scripts/small_ships/tags.js b/kubejs/server_scripts/small_ships/tags.js deleted file mode 100644 index 9b6b90759..000000000 --- a/kubejs/server_scripts/small_ships/tags.js +++ /dev/null @@ -1,8 +0,0 @@ -// 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 deleted file mode 100644 index 98fee44f3..000000000 --- a/kubejs/startup_scripts/small_ships/constants.js +++ /dev/null @@ -1,37 +0,0 @@ -// 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' -]; \ No newline at end of file