From 78b98c3690ce95bd2b62388e0f7cd7b41a9de596 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 27 Nov 2023 16:53:01 +0700 Subject: [PATCH] =?UTF-8?q?=D0=B8=20=D0=B5=D1=89=D0=B5=20=D1=80=D0=B5?= =?UTF-8?q?=D1=86=D0=B5=D0=BF=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/client_scripts/mainClientScript.js | 1 + kubejs/client_scripts/minecraft/constants.js | 3 +++ kubejs/client_scripts/smallShips/constants.js | 1 + kubejs/client_scripts/smallShips/rei.js | 9 +++++++++ kubejs/server_scripts/gregtech/recipes.js | 7 +++++++ kubejs/server_scripts/mainServerScript.js | 2 ++ kubejs/server_scripts/minecraft/constants.js | 7 +++++++ kubejs/server_scripts/minecraft/recipes.js | 12 ++++++++++++ kubejs/server_scripts/minecraft/tags.js | 7 +++++++ kubejs/server_scripts/smallShips/constants.js | 19 +++++++++++++++++++ kubejs/server_scripts/smallShips/recipes.js | 11 +++++++++++ kubejs/server_scripts/tfc/constants.js | 2 +- kubejs/server_scripts/tfc/recipes.js | 3 +++ kubejs/server_scripts/tfc/tags.js | 2 +- 14 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 kubejs/client_scripts/smallShips/constants.js create mode 100644 kubejs/client_scripts/smallShips/rei.js create mode 100644 kubejs/server_scripts/minecraft/constants.js create mode 100644 kubejs/server_scripts/minecraft/tags.js create mode 100644 kubejs/server_scripts/smallShips/constants.js create mode 100644 kubejs/server_scripts/smallShips/recipes.js diff --git a/kubejs/client_scripts/mainClientScript.js b/kubejs/client_scripts/mainClientScript.js index e5f2e858e..198c90f9f 100644 --- a/kubejs/client_scripts/mainClientScript.js +++ b/kubejs/client_scripts/mainClientScript.js @@ -8,6 +8,7 @@ REIEvents.hide('item', event => { hideExtendedCraftingStuff(event) hideSBStuff(event) hideMoreRedStuff(event) + hideSmallShipsStuff(event) }) diff --git a/kubejs/client_scripts/minecraft/constants.js b/kubejs/client_scripts/minecraft/constants.js index 3823e83cc..dc865ee33 100644 --- a/kubejs/client_scripts/minecraft/constants.js +++ b/kubejs/client_scripts/minecraft/constants.js @@ -150,6 +150,9 @@ const minecraftItemsToHide = [ 'minecraft:prismarine_brick_slab', 'minecraft:dark_prismarine_slab', 'minecraft:smooth_stone',*/ + + 'minecraft:bookshelf', + 'minecraft:chiseled_bookshelf', 'minecraft:sand', 'minecraft:suspicious_sand', 'minecraft:red_sand', diff --git a/kubejs/client_scripts/smallShips/constants.js b/kubejs/client_scripts/smallShips/constants.js new file mode 100644 index 000000000..70924666b --- /dev/null +++ b/kubejs/client_scripts/smallShips/constants.js @@ -0,0 +1 @@ +// priority: 199 diff --git a/kubejs/client_scripts/smallShips/rei.js b/kubejs/client_scripts/smallShips/rei.js new file mode 100644 index 000000000..0079f7090 --- /dev/null +++ b/kubejs/client_scripts/smallShips/rei.js @@ -0,0 +1,9 @@ +// priority: 0 + +const hideSmallShipsStuff = (event) => { + global.vanillaWoodTypes.forEach(woodTypeName => { + global.shipTypes.forEach(shipTypeName => { + event.hide(`smallships:${woodTypeName}_${shipTypeName}`) + }) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index be84bfe22..a3506dbcd 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -40,6 +40,13 @@ const registerGTRecipes = (event) => { // Удаление других рецептов // + // Декрафт сундуков в пыль + event.recipes.gtceu.macerator('macerate_chest') + .itemInputs('#forge:chests/wooden') + .itemOutputs('8x gtceu:wood_dust') + .duration(100) + .EUt(4) + // Quartz Sand Dust event.shaped('gtceu:quartz_sand_dust', [ 'A', diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index e700500a4..a3cc9aec6 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -21,6 +21,7 @@ ServerEvents.tags('block', event => { ServerEvents.tags('item', event => { registerCreateTags(event) registerTFCItemTags(event) + registerMinecraftItemTags(event) }) /** @@ -38,6 +39,7 @@ ServerEvents.recipes(event => { registerExtendedCraftingRecipes(event) registerTreeTapRecipes(event) registerMCWRecipes(event) + registerSmallShipsRecipes(event) }) /** diff --git a/kubejs/server_scripts/minecraft/constants.js b/kubejs/server_scripts/minecraft/constants.js new file mode 100644 index 000000000..95ff37357 --- /dev/null +++ b/kubejs/server_scripts/minecraft/constants.js @@ -0,0 +1,7 @@ +// priority: 0 + +const removeAllTagMinecraftItems = [ + 'minecraft:sand', + 'minecraft:chest', + 'minecraft:trapped_chest', +] \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 7187149bd..ffd9b9f25 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -220,6 +220,18 @@ const registerMinecraftRecipes = (event) => { event.remove({id: 'gtceu:rock_breaker/andesite'}) event.remove({id: 'gtceu:rock_breaker/cobblestone'}) + // Удаление рецептов связанных с книжными полками + event.remove({id: 'minecraft:chiseled_bookshelf'}) + event.remove({id: 'gtceu:assembler/bookshelf'}) + event.remove({id: 'gtceu:arc_furnace/arc_bookshelf'}) + event.remove({id: 'gtceu:macerator/macerate_bookshelf'}) + event.remove({id: 'gtceu:extractor/bookshelf_extraction'}) + + // Удаление рецептов связанных с сундуками + event.remove({id: 'gtceu:assembler/chest'}) + event.remove({id: 'gtceu:arc_furnace/arc_trapped_chest'}) + event.remove({id: 'gtceu:macerator/macerate_trapped_chest'}) + // Удаление других рецептов event.remove({id: 'minecraft:blast_furnace'}) event.remove({id: 'minecraft:fire_charge'}) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js new file mode 100644 index 000000000..de3297df0 --- /dev/null +++ b/kubejs/server_scripts/minecraft/tags.js @@ -0,0 +1,7 @@ +// priority: 0 + +const registerMinecraftItemTags = (event) => { + removeAllTagMinecraftItems.forEach(item => { + event.removeAllTagsFrom(item) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/smallShips/constants.js b/kubejs/server_scripts/smallShips/constants.js new file mode 100644 index 000000000..3aa2b88f7 --- /dev/null +++ b/kubejs/server_scripts/smallShips/constants.js @@ -0,0 +1,19 @@ +// priority: 0 + +global.vanillaWoodTypes = [ + "oak", + "spruce", + "birch", + "jungle", + "acacia", + "cherry", + "dark_oak", + "mangrove", + "bamboo" +] + +global.shipTypes = [ + "cog", + "brigg", + "galley" +] \ No newline at end of file diff --git a/kubejs/server_scripts/smallShips/recipes.js b/kubejs/server_scripts/smallShips/recipes.js new file mode 100644 index 000000000..1c7329acf --- /dev/null +++ b/kubejs/server_scripts/smallShips/recipes.js @@ -0,0 +1,11 @@ +// priority: 0 + +const registerSmallShipsRecipes = (event) => { + + // Удаление рецептов мода + global.vanillaWoodTypes.forEach(woodTypeName => { + global.shipTypes.forEach(shipTypeName => { + event.remove({ id: `smallships:${woodTypeName}_${shipTypeName}` }) + }) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/constants.js b/kubejs/server_scripts/tfc/constants.js index c18b24c85..157aaf768 100644 --- a/kubejs/server_scripts/tfc/constants.js +++ b/kubejs/server_scripts/tfc/constants.js @@ -437,7 +437,7 @@ const Metals = { "goethite" : { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", tier: 3, props: [].concat(dustGen, oreGen) } } -const removeAllTagsItems = [ +const removeAllTagTFCItems = [ // Ingots 'tfc:metal/ingot/bismuth', 'tfc:metal/ingot/bismuth_bronze', diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index fb7dfeabf..cf4a47490 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -958,6 +958,9 @@ const registerTFCRecipes = (event) => { .duration(16) .EUt(7) }) + + + } const registerAutoTFCHeatingRecipes = (event) => { diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index e660db436..67bb2b554 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -1,7 +1,7 @@ // priority: 0 const registerTFCItemTags = (event) => { - removeAllTagsItems.forEach(item => { + removeAllTagTFCItems.forEach(item => { event.removeAllTagsFrom(item) })