From 18dbb8ceadaa60c78312ebdcc9b55bf9ee68233e Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 26 Nov 2023 01:09:38 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BA=D1=83=D1=87=D0=B0=20qol=20=D0=BC=D1=83?= =?UTF-8?q?=D1=81=D0=BE=D1=80=D0=B0,=20=D0=B2=20=D0=BE=D1=81=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BD=D0=BE=D0=BC=20=D0=B2=D1=8B=D1=80=D1=83=D0=B1=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B0=D0=BD=D0=B8=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D1=80=D0=B5=D1=86=D0=B5=D0=BF=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/almostunified/debug.json | 7 - config/almostunified/duplicates.json | 31 ----- config/almostunified/startup.json | 3 - config/almostunified/unify.json | 79 ----------- config/ftbquests/quests/chapters/first.snbt | 33 ++++- kubejs/assets/gtceu/lang/en_us.json | 0 kubejs/client_scripts/gregtech/constants.js | 3 +- kubejs/client_scripts/mainClientScript.js | 1 + kubejs/client_scripts/minecraft/constants.js | 74 ++++++---- kubejs/client_scripts/moreRed/constants.js | 6 + kubejs/client_scripts/moreRed/rei.js | 4 +- kubejs/server_scripts/gregtech/recipes.js | 138 +++++++++++++++++-- 12 files changed, 220 insertions(+), 159 deletions(-) delete mode 100644 config/almostunified/debug.json delete mode 100644 config/almostunified/duplicates.json delete mode 100644 config/almostunified/startup.json delete mode 100644 config/almostunified/unify.json create mode 100644 kubejs/assets/gtceu/lang/en_us.json create mode 100644 kubejs/client_scripts/moreRed/constants.js diff --git a/config/almostunified/debug.json b/config/almostunified/debug.json deleted file mode 100644 index f163e52a6..000000000 --- a/config/almostunified/debug.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "dumpTagMap": false, - "dumpDuplicates": false, - "dumpUnification": false, - "dumpOverview": false, - "dumpRecipes": false -} \ No newline at end of file diff --git a/config/almostunified/duplicates.json b/config/almostunified/duplicates.json deleted file mode 100644 index 43613aa0d..000000000 --- a/config/almostunified/duplicates.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "ignoredRecipeTypes": [ - "cucumber:shaped_tag" - ], - "ignoredRecipes": [], - "defaultDuplicateRules": { - "ignoredFields": [ - "conditions", - "group" - ], - "rules": { - "cookingtime": "HigherRule", - "energy": "HigherRule", - "experience": "HigherRule" - }, - "shouldSanitize": false - }, - "overrideDuplicateRules": { - "minecraft:crafting_shaped": { - "ignoredFields": [ - "pattern", - "conditions", - "key", - "group" - ], - "rules": {}, - "shouldSanitize": false - } - }, - "strictMode": false -} \ No newline at end of file diff --git a/config/almostunified/startup.json b/config/almostunified/startup.json deleted file mode 100644 index 448a42c41..000000000 --- a/config/almostunified/startup.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "serverOnly": false -} \ No newline at end of file diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json deleted file mode 100644 index 630b4bb69..000000000 --- a/config/almostunified/unify.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "modPriorities": [ - "gtceu", - "tfc", - "minecraft", - "kubejs", - "create" - ], - "stoneStrata": [ - "stone", - "nether", - "deepslate", - "granite", - "diorite", - "andesite" - ], - "tags": [ - "forge:nuggets/{material}", - "forge:dusts/{material}", - "forge:gears/{material}", - "forge:gems/{material}", - "forge:ingots/{material}", - "forge:raw_materials/{material}", - "forge:ores/{material}", - "forge:rods/{material}", - "forge:wires/{material}", - "forge:storage_blocks/{material}", - "forge:storage_blocks/raw_{material}", - "forge:double_ingots/{material}", - "forge:double_sheets/{material}", - "forge:sheets/{material}" - ], - "materials": [ - "bismuth", - "bismuth_bronze", - "black_bronze", - "bronze", - "brass", - "copper", - "gold", - "nickel", - "rose_gold", - "silver", - "tin", - "zinc", - "sterling_silver", - "wrought_iron", - "iron", - "pig_iron", - "steel", - "black_steel", - "blue_steel", - "red_steel", - "weak_steel", - "weak_blue_steel", - "weak_red_steel", - "high_carbon_steel", - "high_carbon_black_steel", - "high_carbon_blue_steel", - "high_carbon_red_steel", - "unknown" - ], - "priorityOverrides": {}, - "customTags": {}, - "tagOwnerships": {}, - "itemTagInheritanceMode": "ALLOW", - "itemTagInheritance": {}, - "blockTagInheritanceMode": "ALLOW", - "blockTagInheritance": {}, - "ignoredTags": [], - "ignoredItems": [], - "ignoredRecipeTypes": [ - "cucumber:shaped_tag", - "tfc:collapse", - "tfc:landslide" - ], - "ignoredRecipes": [], - "itemsHidingJeiRei": true -} \ No newline at end of file diff --git a/config/ftbquests/quests/chapters/first.snbt b/config/ftbquests/quests/chapters/first.snbt index 78c4c9c62..5419fb930 100644 --- a/config/ftbquests/quests/chapters/first.snbt +++ b/config/ftbquests/quests/chapters/first.snbt @@ -2044,7 +2044,7 @@ type: "item" }] title: "Charcoal?" - x: 3.5d + x: 2.0d y: -4.0d } { @@ -3370,6 +3370,37 @@ x: 21.0d y: 1.0d } + { + dependencies: ["4946FC5BCA4CCA88"] + id: "4342A0F6BDCF1159" + tasks: [ + { + count: 10L + id: "41DB0E544D2FF121" + item: { Count: 10b, id: "gtceu:pump_deck" } + type: "item" + } + { + count: 10L + id: "686024A6FC92B015" + item: { Count: 10b, id: "gtceu:treated_wood_frame" } + type: "item" + } + { + id: "634C3DBAE2F6BAE9" + item: "gtceu:primitive_pump" + type: "item" + } + { + id: "0B568D4E97785F08" + item: "gtceu:pump_hatch" + type: "item" + } + ] + title: "Primitive Pump" + x: 14.5d + y: -21.5d + } ] title: "First Age" } diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json new file mode 100644 index 000000000..e69de29bb diff --git a/kubejs/client_scripts/gregtech/constants.js b/kubejs/client_scripts/gregtech/constants.js index a946d19e5..a88b3e7c2 100644 --- a/kubejs/client_scripts/gregtech/constants.js +++ b/kubejs/client_scripts/gregtech/constants.js @@ -5,7 +5,8 @@ const gtItemsToHide = [ 'gtceu:flint_knife', 'gtceu:firebrick', 'gtceu:firebricks', - 'gtceu:wood_drum' + 'gtceu:wood_drum', + 'gtceu:primitive_blast_furnace' ] const stoneTypesToHide = [ diff --git a/kubejs/client_scripts/mainClientScript.js b/kubejs/client_scripts/mainClientScript.js index afc6b8017..1d91474ee 100644 --- a/kubejs/client_scripts/mainClientScript.js +++ b/kubejs/client_scripts/mainClientScript.js @@ -7,6 +7,7 @@ REIEvents.hide('item', event => { hideMinecraftStuff(event) hideExtendedCraftingStuff(event) hideSBStuff(event) + hideMoreRedStuff(event) }) diff --git a/kubejs/client_scripts/minecraft/constants.js b/kubejs/client_scripts/minecraft/constants.js index 6ceb60b8e..90a23dafd 100644 --- a/kubejs/client_scripts/minecraft/constants.js +++ b/kubejs/client_scripts/minecraft/constants.js @@ -2,6 +2,7 @@ const minecraftItemsToHide = [ // Regular blocks + /* 'minecraft:dark_oak_planks', 'minecraft:mangrove_planks', @@ -149,11 +150,18 @@ const minecraftItemsToHide = [ 'minecraft:prismarine_brick_slab', 'minecraft:dark_prismarine_slab', 'minecraft:smooth_stone',*/ - - //'minecraft:blast_furnace', - //'minecraft:furnace', - //'minecraft:furnace_minecart', + 'minecraft:barrel', + 'minecraft:blast_furnace', + 'minecraft:furnace', + 'minecraft:furnace_minecart', + + 'minecraft:anvil', + 'minecraft:chipped_anvil', + 'minecraft:damaged_anvil', + + // Ores + // Скрыты, но рецепты не удалены, потому что, а зачем, лол 'minecraft:netherite_scrap', 'minecraft:netherite_ingot', 'minecraft:netherite_block', @@ -180,38 +188,48 @@ const minecraftItemsToHide = [ '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:wooden_shovel', + 'minecraft:wooden_hoe', + + 'minecraft:stone_sword', + 'minecraft:stone_pickaxe', 'minecraft:stone_axe', - 'minecraft:golden_axe', + 'minecraft:stone_shovel', + 'minecraft:stone_hoe', + + 'minecraft:iron_sword', + 'minecraft:iron_pickaxe', 'minecraft:iron_axe', + 'minecraft:iron_shovel', + 'minecraft:iron_hoe', + + 'minecraft:golden_sword', + 'minecraft:golden_pickaxe', + 'minecraft:golden_axe', + 'minecraft:golden_shovel', + 'minecraft:golden_hoe', + + 'minecraft:diamond_sword', + 'minecraft:diamond_pickaxe', 'minecraft:diamond_axe', - 'minecraft:netherite_axe', + 'minecraft:diamond_shovel', + 'minecraft:diamond_hoe', + + 'minecraft:netherite_sword', + 'minecraft:netherite_pickaxe', + 'minecraft:netherite_axe', + 'minecraft:netherite_shovel', + 'minecraft:netherite_hoe', // Armor + // Horse + 'minecraft:iron_horse_armor', + 'minecraft:golden_horse_armor', + 'minecraft:diamond_horse_armor', + // Player 'minecraft:netherite_helmet', 'minecraft:netherite_chestplate', 'minecraft:netherite_leggings', diff --git a/kubejs/client_scripts/moreRed/constants.js b/kubejs/client_scripts/moreRed/constants.js new file mode 100644 index 000000000..91738b2bd --- /dev/null +++ b/kubejs/client_scripts/moreRed/constants.js @@ -0,0 +1,6 @@ +// priority: 199 + +const moreRedItemsToHide = [ + 'jumbofurnace:jumbo_furnace', + 'jumbofurnace:jumbo_furnace_jei' +] \ No newline at end of file diff --git a/kubejs/client_scripts/moreRed/rei.js b/kubejs/client_scripts/moreRed/rei.js index 70999b373..413aaf2ec 100644 --- a/kubejs/client_scripts/moreRed/rei.js +++ b/kubejs/client_scripts/moreRed/rei.js @@ -1,7 +1,9 @@ // priority: 0 const hideMoreRedStuff = (event) => { - + moreRedItemsToHide.forEach(itemToHide => { + event.hide(itemToHide) + }) } const registerMoreRedCategories = (event) => { diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4ccc06f18..d3d385a99 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1,7 +1,7 @@ // priority: 0 const registerGTRecipes = (event) => { - // Отключение рецептов раскрафта ванильной наковальни + // Удаление рецептов связанных с наковальней event.remove({id: 'gtceu:arc_furnace/arc_anvil'}) event.remove({id: 'gtceu:macerator/macerate_anvil'}) event.remove({id: 'gtceu:alloy_smelter/anvil'}) @@ -12,18 +12,140 @@ const registerGTRecipes = (event) => { event.remove({id: 'gtceu:arc_furnace/arc_chipped_anvil'}) event.remove({id: 'gtceu:macerator/macerate_chipped_anvil'}) + // Удаление рецептов связанных с печкой + event.remove({id: 'gtceu:assembler/furnace'}) + event.remove({id: 'gtceu:macerator/macerate_furnace'}) + event.remove({id: 'gtceu:assembler/furnace_minecart'}) - // Отключение других рецептов + // Удаление рецептов связанных с вагонеткой с печкой + event.remove({id: 'gtceu:arc_furnace/arc_furnace_minecart'}) + event.remove({id: 'gtceu:macerate/macerate_furnace_minecart'}) + + // Удаление рецептов связанных с Primitive Blast Furnace + event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'}) + event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'}) + + // Удаление рецептов связанных с Barrel + event.remove({id: 'gtceu:shaped/wooden_barrel'}) + event.remove({id: 'gtceu:assembler/wood_barrel'}) + event.remove({id: 'gtceu:arc_furnace/arc_wood_drum'}) + event.remove({id: 'gtceu:macerator/macerate_wood_drum'}) + + // Удаление рецептов связанных с FireBricks + event.remove({id: 'gtceu:shaped/casing_primitive_bricks'}) + event.remove({id: 'gtceu:macerator/macerate_firebricks'}) + event.remove({id: 'gtceu:extractor/extract_primitive_bricks'}) + + // Удаление рецептов связанных с FireBrick + event.remove({id: 'gtceu:smelting/fireclay_brick'}) + event.remove({id: 'gtceu:macerator/macerate_firebrick'}) + + // Удаление рецептов связанных с Кольчугой 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'}) - event.remove({id: 'gtceu:shaped/bronze_primitive_blast_furnace'}) - event.remove({id: 'gtceu:shaped/casing_primitive_bricks'}) - event.remove({id: 'gtceu:assembler/furnace'}) - event.remove({id: 'gtceu:shaped/wooden_barrel'}) - event.remove({id: 'gtceu:assembler/wood_barrel'}) + event.remove({id: 'gtceu:arc_furnace/arc_chainmail_boots'}) + event.remove({id: 'gtceu:arc_furnace/arc_chainmail_leggings'}) + event.remove({id: 'gtceu:arc_furnace/arc_chainmail_chestplate'}) + event.remove({id: 'gtceu:arc_furnace/arc_chainmail_helmet'}) + event.remove({id: 'gtceu:macerator/macerate_chainmail_boots'}) + event.remove({id: 'gtceu:macerator/macerate_chainmail_leggings'}) + event.remove({id: 'gtceu:macerator/macerate_chainmail_chestplate'}) + event.remove({id: 'gtceu:macerator/macerate_chainmail_helmet'}) + event.remove({id: 'minecraft:iron_nugget_from_smelting'}) + event.remove({id: 'minecraft:iron_nugget_from_blasting'}) + // Удаление рецептов связанных с Железной броней + event.remove({id: 'gtceu:arc_furnace/arc_iron_boots'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_leggings'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_chestplate'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_helmet'}) + event.remove({id: 'gtceu:macerator/macerate_iron_boots'}) + event.remove({id: 'gtceu:macerator/macerate_iron_leggings'}) + event.remove({id: 'gtceu:macerator/macerate_iron_chestplate'}) + event.remove({id: 'gtceu:macerator/macerate_iron_helmet'}) + event.remove({id: 'gtceu:shaped/iron_horse_armor'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_horse_armor'}) + event.remove({id: 'gtceu:macerator/macerate_iron_horse_armor'}) + + // Удаление рецептов связанных с Золотой броней + event.remove({id: 'gtceu:arc_furnace/arc_golden_boots'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_leggings'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_chestplate'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_helmet'}) + event.remove({id: 'gtceu:macerator/macerate_golden_boots'}) + event.remove({id: 'gtceu:macerator/macerate_golden_leggings'}) + event.remove({id: 'gtceu:macerator/macerate_golden_chestplate'}) + event.remove({id: 'gtceu:macerator/macerate_golden_helmet'}) + event.remove({id: 'gtceu:shaped/golden_horse_armor'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_horse_armor'}) + event.remove({id: 'gtceu:macerator/macerate_golden_horse_armor'}) + event.remove({id: 'minecraft:gold_nugget_from_smelting'}) + event.remove({id: 'minecraft:gold_nugget_from_blasting'}) + + // Удаление рецептов связанных с Алмазной броней + event.remove({id: 'gtceu:macerator/macerate_diamond_boots'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_leggings'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_chestplate'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_helmet'}) + event.remove({id: 'gtceu:shaped/diamond_horse_armor'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_horse_armor'}) + + // Удаление рецептов связанных с Деревянными инструментами + event.remove({id: 'gtceu:macerator/macerate_wooden_sword'}) + event.remove({id: 'gtceu:macerator/macerate_wooden_pickaxe'}) + event.remove({id: 'gtceu:macerator/macerate_wooden_axe'}) + event.remove({id: 'gtceu:macerator/macerate_wooden_shovel'}) + event.remove({id: 'gtceu:macerator/macerate_wooden_hoe'}) + + // Удаление рецептов связанных с Каменными инструментами + event.remove({id: 'gtceu:macerator/macerate_stone_sword'}) + event.remove({id: 'gtceu:macerator/macerate_stone_pickaxe'}) + event.remove({id: 'gtceu:macerator/macerate_stone_axe'}) + event.remove({id: 'gtceu:macerator/macerate_stone_shovel'}) + event.remove({id: 'gtceu:macerator/macerate_stone_hoe'}) + + // Удаление рецептов связанных с Железными инструментами + event.remove({id: 'gtceu:macerator/macerate_iron_sword'}) + event.remove({id: 'gtceu:macerator/macerate_iron_pickaxe'}) + event.remove({id: 'gtceu:macerator/macerate_iron_axe'}) + event.remove({id: 'gtceu:macerator/macerate_iron_shovel'}) + event.remove({id: 'gtceu:macerator/macerate_iron_hoe'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_sword'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_pickaxe'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_axe'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_shovel'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_hoe'}) + + // Удаление рецептов связанных с Золотыми инструментами + event.remove({id: 'gtceu:macerator/macerate_golden_sword'}) + event.remove({id: 'gtceu:macerator/macerate_golden_pickaxe'}) + event.remove({id: 'gtceu:macerator/macerate_golden_axe'}) + event.remove({id: 'gtceu:macerator/macerate_golden_shovel'}) + event.remove({id: 'gtceu:macerator/macerate_golden_hoe'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_sword'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_pickaxe'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_axe'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_shovel'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_hoe'}) + + // Удаление рецептов связанных с Алмазными инструментами + event.remove({id: 'gtceu:macerator/macerate_diamond_sword'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_pickaxe'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_axe'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_shovel'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_hoe'}) + event.remove({id: 'gtceu:arc_furnace/arc_diamond_sword'}) + event.remove({id: 'gtceu:arc_furnace/arc_diamond_pickaxe'}) + event.remove({id: 'gtceu:arc_furnace/arc_diamond_axe'}) + event.remove({id: 'gtceu:arc_furnace/arc_diamond_shovel'}) + event.remove({id: 'gtceu:arc_furnace/arc_diamond_hoe'}) + + + // Удаление других рецептов + // + // Low Pressure Steam Forge Hammer event.shaped('gtceu:lp_steam_forge_hammer', [ 'ABA', @@ -141,7 +263,7 @@ const registerGTRecipes = (event) => { }).id('gtceu:shaped/uv_forge_hammer') // Fire Brick - event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay').id('gtceu:smelting/fireclay_brick') + event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay').id('tfg:smelting/fireclay_brick') // TFC FireBrick -> FireBrick dust event.recipes.gtceu.macerator('macerator/macerate_firebrick')