From eca06faf351ac0e97a6aada7fe03f525fdfed81f Mon Sep 17 00:00:00 2001 From: SpeeeDCraft <52341158+SpeeeDCraft@users.noreply.github.com> Date: Sun, 12 Nov 2023 13:54:03 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=86=D0=B5=D0=BF=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BA=D1=80=D0=B0=D1=81=D0=B8=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9=20=D0=B8=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=80?= =?UTF-8?q?=D0=B5=D1=86=D0=B5=D0=BF=D1=82=D0=BE=D0=B2=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/client_scripts/minecraft/constants.js | 246 +++++++++++++++++-- kubejs/server_scripts/gregtech/recipes.js | 117 +++++++++ kubejs/server_scripts/minecraft/recipes.js | 11 + kubejs/server_scripts/tfc/recipes.js | 8 +- 4 files changed, 358 insertions(+), 24 deletions(-) create mode 100644 kubejs/server_scripts/gregtech/recipes.js diff --git a/kubejs/client_scripts/minecraft/constants.js b/kubejs/client_scripts/minecraft/constants.js index 1a695d234..d869d6a52 100644 --- a/kubejs/client_scripts/minecraft/constants.js +++ b/kubejs/client_scripts/minecraft/constants.js @@ -1,27 +1,227 @@ // priority: 199 const minecraftItemsToHide = [ - "minecraft:coal_ore", - "minecraft:deepslate_coal_ore", - "minecraft:iron_ore", - "minecraft:deepslate_iron_ore", - "minecraft:copper_ore", - "minecraft:deepslate_copper_ore", - "minecraft:gold_ore", - "minecraft:deepslate_gold_ore", - "minecraft:redstone_ore", - "minecraft:deepslate_redstone_ore", - "minecraft:emerald_ore", - "minecraft:deepslate_emerald_ore", - "minecraft:lapis_ore", - "minecraft:deepslate_lapis_ore", - "minecraft:diamond_ore", - "minecraft:deepslate_diamond_ore", - "minecraft:nether_gold_ore", - "minecraft:nether_quartz_ore", - "minecraft:ancient_debris", - "minecraft:netherite_helmet", - "minecraft:netherite_chestplate", - "minecraft:netherite_leggings", - "minecraft:netherite_boots", + // Regular blocks + /* + 'minecraft:dark_oak_planks', + 'minecraft:mangrove_planks', + 'minecraft:crimson_planks', + 'minecraft:warped_planks', + 'minecraft:stone', + 'minecraft:granite', + 'minecraft:polished_granite', + 'minecraft:diorite', + 'minecraft:polished_diorite', + 'minecraft:andesite', + 'minecraft:polished_andesite', + 'minecraft:deepslate', + 'minecraft:cobbled_deepslate', + 'minecraft:polished_deepslate', + 'minecraft:calcite', + 'minecraft:tuff', + 'minecraft:dripstone_block', + 'minecraft:grass_block', + 'minecraft:dirt', + 'minecraft:coarse_dirt', + 'minecraft:podzol', + 'minecraft:rooted_dirt', + 'minecraft:crimson_nylium', + 'minecraft:warped_nylium', + 'minecraft:cobblestone', + 'minecraft:oak_planks', + 'minecraft:spruce_planks', + 'minecraft:birch_planks', + 'minecraft:jungle_planks', + 'minecraft:acacia_planks', + 'minecraft:cherry_planks', + 'minecraft:stripped_cherry_log', + 'minecraft:stripped_dark_oak_log', + 'minecraft:stripped_mangrove_log', + 'minecraft:stripped_crimson_stem', + 'minecraft:stripped_warped_stem', + 'minecraft:stripped_oak_wood', + 'minecraft:stripped_spruce_wood', + 'minecraft:stripped_birch_wood', + 'minecraft:stripped_jungle_wood', + 'minecraft:oak_sapling', + 'minecraft:spruce_sapling', + 'minecraft:birch_sapling', + 'minecraft:jungle_sapling', + 'minecraft:acacia_sapling', + 'minecraft:cherry_sapling', + 'minecraft:dark_oak_sapling', + 'minecraft:mangrove_propagule', + 'minecraft:suspicious_gravel', + 'minecraft:budding_amethyst', + 'minecraft:netherite_block', + 'minecraft:oak_log', + 'minecraft:spruce_log', + 'minecraft:birch_log', + 'minecraft:jungle_log', + 'minecraft:acacia_log', + 'minecraft:cherry_log', + 'minecraft:dark_oak_log', + 'minecraft:mangrove_log', + 'minecraft:mangrove_roots', + 'minecraft:crimson_stem', + 'minecraft:warped_stem', + 'minecraft:stripped_oak_log', + 'minecraft:stripped_spruce_log', + 'minecraft:stripped_birch_log', + 'minecraft:stripped_jungle_log', + 'minecraft:stripped_acacia_log', + 'minecraft:stripped_acacia_wood', + 'minecraft:stripped_cherry_wood', + 'minecraft:stripped_dark_oak_wood', + 'minecraft:stripped_mangrove_wood', + 'minecraft:stripped_crimson_hyphae', + 'minecraft:stripped_warped_hyphae', + 'minecraft:oak_wood', + 'minecraft:spruce_wood', + 'minecraft:birch_wood', + 'minecraft:jungle_wood', + 'minecraft:acacia_wood', + 'minecraft:cherry_wood', + 'minecraft:dark_oak_wood', + 'minecraft:mangrove_wood', + 'minecraft:crimson_hyphae', + 'minecraft:warped_hyphae', + 'minecraft:oak_leaves', + 'minecraft:spruce_leaves', + 'minecraft:birch_leaves', + 'minecraft:jungle_leaves', + 'minecraft:acacia_leaves', + 'minecraft:cherry_leaves', + 'minecraft:dark_oak_leaves', + 'minecraft:mangrove_leaves', + 'minecraft:azalea_leaves', + 'minecraft:flowering_azalea_leaves', + 'minecraft:warped_fungus', + 'minecraft:crimson_fungus', + 'minecraft:dead_bush', + 'minecraft:flowering_azalea', + 'minecraft:azalea', + 'minecraft:fern', + 'minecraft:grass', + 'minecraft:weeping_vines', + 'minecraft:nether_sprouts', + 'minecraft:spore_blossom', + 'minecraft:pitcher_plant', + 'minecraft:oxeye_daisy', + 'minecraft:orange_tulip', + 'minecraft:red_tulip', + 'minecraft:azure_bluet', + 'minecraft:twisting_vines', + 'minecraft:warped_roots', + 'minecraft:brown_mushroom', + 'minecraft:torchflower', + 'minecraft:cornflower', + 'minecraft:white_tulip', + 'minecraft:allium', + 'minecraft:blue_orchid', + 'minecraft:sugar_cane', + 'minecraft:crimson_roots', + 'minecraft:red_mushroom', + 'minecraft:wither_rose', + 'minecraft:lily_of_the_valley', + 'minecraft:pink_tulip', + 'minecraft:poppy', + 'minecraft:dandelion', + 'minecraft:oak_slab', + 'minecraft:spruce_slab', + 'minecraft:birch_slab', + 'minecraft:jungle_slab', + 'minecraft:acacia_slab', + 'minecraft:cherry_slab', + 'minecraft:dark_oak_slab', + 'minecraft:mangrove_slab', + 'minecraft:crimson_slab', + 'minecraft:warped_slab', + 'minecraft:stone_slab', + 'minecraft:smooth_stone_slab', + 'minecraft:petrified_oak_slab', + 'minecraft:cobblestone_slab', + 'minecraft:brick_slab', + 'minecraft:stone_brick_slab', + 'minecraft:nether_brick_slab', + 'minecraft:purpur_slab', + 'minecraft:prismarine_slab', + 'minecraft:prismarine_brick_slab', + 'minecraft:dark_prismarine_slab', + 'minecraft:smooth_stone',*/ + + 'minecraft:smithing_table', + 'minecraft:coal_ore', + 'minecraft:deepslate_coal_ore', + 'minecraft:iron_ore', + 'minecraft:deepslate_iron_ore', + 'minecraft:copper_ore', + 'minecraft:deepslate_copper_ore', + 'minecraft:gold_ore', + 'minecraft:deepslate_gold_ore', + 'minecraft:redstone_ore', + 'minecraft:deepslate_redstone_ore', + 'minecraft:emerald_ore', + 'minecraft:deepslate_emerald_ore', + 'minecraft:lapis_ore', + 'minecraft:deepslate_lapis_ore', + 'minecraft:diamond_ore', + 'minecraft:deepslate_diamond_ore', + 'minecraft:nether_gold_ore', + 'minecraft:nether_quartz_ore', + 'minecraft:ancient_debris', + + // Tools + 'minecraft:wooden_shovel', + 'minecraft:stone_shovel', + 'minecraft:golden_shovel', + 'minecraft:iron_shovel', + 'minecraft:diamond_shovel', + 'minecraft:netherite_shovel', + 'minecraft:wooden_hoe', + 'minecraft:stone_hoe', + 'minecraft:golden_hoe', + 'minecraft:iron_hoe', + 'minecraft:diamond_hoe', + 'minecraft:netherite_hoe', + 'minecraft:wooden_sword', + 'minecraft:stone_sword', + 'minecraft:golden_sword', + 'minecraft:iron_sword', + 'minecraft:diamond_sword', + 'minecraft:netherite_sword', + 'minecraft:wooden_pickaxe', + 'minecraft:stone_pickaxe', + 'minecraft:golden_pickaxe', + 'minecraft:iron_pickaxe', + 'minecraft:diamond_pickaxe', + 'minecraft:netherite_pickaxe', + 'minecraft:wooden_axe', + 'minecraft:stone_axe', + 'minecraft:golden_axe', + 'minecraft:iron_axe', + 'minecraft:diamond_axe', + 'minecraft:netherite_axe', + + // Armor + 'minecraft:netherite_helmet', + 'minecraft:netherite_chestplate', + 'minecraft:netherite_leggings', + 'minecraft:netherite_boots', + 'minecraft:golden_helmet', + 'minecraft:golden_chestplate', + 'minecraft:golden_leggings', + 'minecraft:golden_boots', + 'minecraft:iron_helmet', + 'minecraft:iron_chestplate', + 'minecraft:iron_leggings', + 'minecraft:iron_boots', + 'minecraft:chainmail_helmet', + 'minecraft:chainmail_chestplate', + 'minecraft:chainmail_leggings', + 'minecraft:chainmail_boots', + 'minecraft:diamond_helmet', + 'minecraft:diamond_chestplate', + 'minecraft:diamond_leggings', + 'minecraft:diamond_boots', ] \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js new file mode 100644 index 000000000..16447a077 --- /dev/null +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -0,0 +1,117 @@ +// priority: 0 + +const registerGTRecipes = (event) => { + event.remove({id: 'gtceu:shaped/chainmail_boots'}) + event.remove({id: 'gtceu:shaped/chainmail_leggings'}) + event.remove({id: 'gtceu:shaped/chainmail_chestplate'}) + event.remove({id: 'gtceu:shaped/chainmail_helmet'}) + + // White Dye Recipes + event.remove({id: 'gtceu:extractor/lily_of_the_valley_dye'}) + event.recipes.gtceu.extractor('extractor/red_dye') + .itemInputs('1x #tfc:makes_white_dye') + .itemOutputs('2x minecraft:white_dye') + .duration(200) + .EUt(2) + + // Red Dye Recipes + event.remove({id: 'gtceu:extractor/rose_bush_dye'}) + event.remove({id: 'gtceu:extractor/red_tulip_dye'}) + event.remove({id: 'gtceu:extractor/poppy_dye'}) + event.remove({id: 'gtceu:extractor/beetroot_dye'}) + event.recipes.gtceu.extractor('extractor/red_dye') + .itemInputs('1x #tfc:makes_red_dye') + .itemOutputs('2x minecraft:red_dye') + .duration(200) + .EUt(2) + + // Lime Dye Recipes + event.remove({id: 'gtceu:extractor/rose_bush_dye'}) + event.remove({id: 'gtceu:extractor/red_tulip_dye'}) + event.remove({id: 'gtceu:extractor/poppy_dye'}) + event.remove({id: 'gtceu:extractor/beetroot_dye'}) + event.recipes.gtceu.extractor('extractor/red_dye') + .itemInputs('1x tfc:plant/moss') + .itemOutputs('2x minecraft:lime_dye') + .duration(200) + .EUt(2) + + // Light Blue Dye Recipes + event.remove({id: 'gtceu:extractor/blue_orchid_dye'}) + event.recipes.gtceu.extractor('extractor/light_blue_dye') + .itemInputs('1x #tfc:makes_light_blue_dye') + .itemOutputs('2x minecraft:light_blue_dye') + .duration(200) + .EUt(2) + + // Green Dye Recipes + event.recipes.gtceu.extractor('extractor/green_dye') + .itemInputs('1x #tfc:makes_green_dye') + .itemOutputs('2x minecraft:green_dye') + .duration(200) + .EUt(2) + + // Magenta Dye Recipes + event.remove({id: 'gtceu:extractor/lilac_dye'}) + event.remove({id: 'gtceu:extractor/allium_dye'}) + event.recipes.gtceu.extractor('extractor/magenta_dye') + .itemInputs('1x #tfc:makes_magenta_dye') + .itemOutputs('2x minecraft:magenta_dye') + .duration(200) + .EUt(2) + + // Orange Dye Recipes + event.remove({id: 'gtceu:extractor/orange_tulip_dye'}) + event.recipes.gtceu.extractor('extractor/orange_dye') + .itemInputs('1x #tfc:makes_orange_dye') + .itemOutputs('2x minecraft:orange_dye') + .duration(200) + .EUt(2) + + // Purple Dye Recipes + event.recipes.gtceu.extractor('extractor/purple_dye') + .itemInputs('1x #tfc:makes_purple_dye') + .itemOutputs('2x minecraft:purple_dye') + .duration(200) + .EUt(2) + + // Brown Dye Recipes + event.recipes.gtceu.extractor('extractor/brown_dye') + .itemInputs('1x #tfc:makes_brown_dye') + .itemOutputs('2x minecraft:brown_dye') + .duration(200) + .EUt(2) + + // Light Gray Dye Recipes + event.recipes.gtceu.extractor('extractor/light_gray_dye') + .itemInputs('1x tfc:plant/yucca') + .itemOutputs('2x minecraft:light_gray_dye') + .duration(200) + .EUt(2) + + // Yellow Dye Recipes + event.remove({id: 'gtceu:extractor/sunflower_dye'}) + event.remove({id: 'gtceu:extractor/dandelion_dye'}) + event.recipes.gtceu.extractor('extractor/yellow_dye') + .itemInputs('1x #tfc:makes_yellow_dye') + .itemOutputs('2x minecraft:yellow_dye') + .duration(200) + .EUt(2) + + // Blue Dye Recipes + event.remove({id: 'gtceu:extractor/cornflower_dye'}) + event.recipes.gtceu.extractor('extractor/blue_dye') + .itemInputs('1x #tfc:makes_blue_dye') + .itemOutputs('2x minecraft:blue_dye') + .duration(200) + .EUt(2) + + // Pink Dye Recipes + event.remove({id: 'gtceu:extractor/pink_tulip_dye'}) + event.remove({id: 'gtceu:extractor/peony_dye'}) + event.recipes.gtceu.extractor('extractor/pink_dye') + .itemInputs('1x #tfc:makes_pink_dye') + .itemOutputs('2x minecraft:pink_dye') + .duration(200) + .EUt(2) +} \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 2d6705d63..360a39d47 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -23,5 +23,16 @@ const registerMinecraftRecipes = (event) => { event.smelting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_smelting_raw_gold').xp(0.7) event.blasting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_blasting_raw_gold').xp(0.7) + event.remove({id: 'minecraft:smithing_table'}) event.remove({id: 'minecraft:fire_charge'}) + + event.remove({id: 'minecraft:netherite_sword_smithing'}) + event.remove({id: 'minecraft:netherite_pickaxe_smithing'}) + event.remove({id: 'minecraft:netherite_axe_smithing'}) + event.remove({id: 'minecraft:netherite_shovel_smithing'}) + event.remove({id: 'minecraft:netherite_hoe_smithing'}) + event.remove({id: 'minecraft:netherite_helmet_smithing'}) + event.remove({id: 'minecraft:netherite_chestplate_smithing'}) + event.remove({id: 'minecraft:netherite_leggings_smithing'}) + event.remove({id: 'minecraft:netherite_boots_smithing'}) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 04441850a..dae6d0dc9 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -22,6 +22,12 @@ const registerTFCRecipes = (event) => { event.remove({ id: 'tfc:quern/sylvite' }) event.remove({ id: 'tfc:quern/salt' }) + event.remove({ id: 'tfc:quern/small_magnetite' }) + event.remove({ id: 'tfc:quern/small_tetrahedrite' }) + event.remove({ id: 'tfc:quern/small_malachite' }) + event.remove({ id: 'tfc:quern/small_limonite' }) + event.remove({ id: 'tfc:quern/small_hematite' }) + event.remove({ id: 'tfc:quern/small_native_copper' }) event.remove({ id: 'tfc:quern/small_native_gold' }) event.remove({ id: 'tfc:quern/small_native_silver' }) event.remove({ id: 'tfc:quern/small_cassiterite' }) @@ -63,7 +69,7 @@ const registerTFCRecipes = (event) => { // 4x LapisLazuli Powder addQuernRecipe(event, - { tag: "forge:raw_materials/lapis_lazuli" }, + { tag: "forge:raw_materials/lapis" }, { item: "tfc:powder/lapis_lazuli", count: 4 } )