From df3f3f28d327bfedb032d144f8f048dcc273cab6 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 11 Dec 2023 14:17:32 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=82=D0=B8=D1=80=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B7=D0=B0=20=D1=80=D0=B0=D0=B7=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D0=BC=20=D1=82=D1=84=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/client_scripts/main_client_script.js | 1 - .../client_scripts/mods/extended_crafting.js | 7 ---- kubejs/client_scripts/mods/tfc.js | 1 - kubejs/data/forge/tags/items/dusts.json | 5 +++ .../data/forge/tags/items/dusts/copper.json | 5 +++ kubejs/data/forge/tags/items/dusts/iron.json | 5 +++ .../vein/normal_sylvite.json | 35 ------------------- .../placed_feature/vein/normal_sylvite.json | 4 --- kubejs/server_scripts/create/tags.js | 3 -- kubejs/server_scripts/tfc/recipes.js | 18 +++++----- kubejs/server_scripts/tfc/tags.js | 4 ++- kubejs/startup_scripts/create/items.js | 8 ----- kubejs/startup_scripts/main_startup_script.js | 2 -- kubejs/startup_scripts/minecraft/constants.js | 3 +- kubejs/startup_scripts/tfc/constants.js | 2 -- 15 files changed, 28 insertions(+), 75 deletions(-) delete mode 100644 kubejs/client_scripts/mods/extended_crafting.js create mode 100644 kubejs/data/forge/tags/items/dusts.json create mode 100644 kubejs/data/forge/tags/items/dusts/copper.json create mode 100644 kubejs/data/forge/tags/items/dusts/iron.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/vein/normal_sylvite.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/vein/normal_sylvite.json delete mode 100644 kubejs/startup_scripts/create/items.js diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index f81706804..47cc1bee3 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -6,7 +6,6 @@ REIEvents.hide('item', event => { hideTFCStuff(event) hideGTCEUStuff(event) hideCreateStuff(event) - hideExtendedCraftingStuff(event) hideAdAstraStuff(event) hideSophisticatedBackpacksStuff(event) hideMoreRedStuff(event) diff --git a/kubejs/client_scripts/mods/extended_crafting.js b/kubejs/client_scripts/mods/extended_crafting.js deleted file mode 100644 index 8d9f5193b..000000000 --- a/kubejs/client_scripts/mods/extended_crafting.js +++ /dev/null @@ -1,7 +0,0 @@ -// priority: 0 - -const hideExtendedCraftingStuff = (event) => { - global.EXTENDED_CRAFTING_DISABLED_ITEMS.forEach(item => { - event.hide(item) - }) -} \ No newline at end of file diff --git a/kubejs/client_scripts/mods/tfc.js b/kubejs/client_scripts/mods/tfc.js index 859c97213..4fa0081a4 100644 --- a/kubejs/client_scripts/mods/tfc.js +++ b/kubejs/client_scripts/mods/tfc.js @@ -38,7 +38,6 @@ const hideTFCFluids = (event) => { event.hide('tfc:metal/zinc') event.hide('tfc:metal/sterling_silver') event.hide('tfc:metal/wrought_iron') - event.hide('tfc:metal/cast_iron') event.hide('tfc:metal/steel') event.hide('tfc:metal/black_steel') event.hide('tfc:metal/red_steel') diff --git a/kubejs/data/forge/tags/items/dusts.json b/kubejs/data/forge/tags/items/dusts.json new file mode 100644 index 000000000..e2ad84af9 --- /dev/null +++ b/kubejs/data/forge/tags/items/dusts.json @@ -0,0 +1,5 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": true, + "values": [] +} \ No newline at end of file diff --git a/kubejs/data/forge/tags/items/dusts/copper.json b/kubejs/data/forge/tags/items/dusts/copper.json new file mode 100644 index 000000000..284813adc --- /dev/null +++ b/kubejs/data/forge/tags/items/dusts/copper.json @@ -0,0 +1,5 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": true, + "values": [] +} \ No newline at end of file diff --git a/kubejs/data/forge/tags/items/dusts/iron.json b/kubejs/data/forge/tags/items/dusts/iron.json new file mode 100644 index 000000000..284813adc --- /dev/null +++ b/kubejs/data/forge/tags/items/dusts/iron.json @@ -0,0 +1,5 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": true, + "values": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sylvite.json b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sylvite.json deleted file mode 100644 index 8ef3dfebf..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_sylvite.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "tfc:cluster_vein", - "config": { - "rarity": 190, - "density": 0.3, - "min_y": 32, - "max_y": 100, - "size": 26, - "random_name": "normal_sylvite", - "blocks": [ - { - "replace": [ - "tfc:rock/raw/shale" - ], - "with": [ - { - "block": "gtceu:tfc_shale_sylvite_ore", - "weight": 100 - } - ] - }, - { - "replace": [ - "tfc:rock/raw/claystone" - ], - "with": [ - { - "block": "gtceu:tfc_claystone_sylvite_ore", - "weight": 100 - } - ] - } - ] - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/vein/normal_sylvite.json b/kubejs/data/tfg/worldgen/placed_feature/vein/normal_sylvite.json deleted file mode 100644 index a54b1e7c9..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/vein/normal_sylvite.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "feature": "tfg:vein/normal_sylvite", - "placement": [] -} \ No newline at end of file diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index fbc428f2c..a78b56cdf 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -6,7 +6,4 @@ const registerCreateItemTags = (event) => { global.CREATE_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) }) - - // TODO: move to TFG-MOD - event.add('forge:ingots/galvanized_iron', 'kubejs:galvanized_iron'); } diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 7c4720d58..bb9c1ab03 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -908,39 +908,39 @@ const registerTFCRecipes = (event) => { // 2x Amethyst Powder event.recipes.tfc.quern('2x tfc:powder/amethyst', '#forge:raw_materials/amethyst') - .id('tfc:quern/amethyst') + .id('tfc:quern/amethyst_cut') // 2x Diamond Powder event.recipes.tfc.quern('2x tfc:powder/diamond', '#forge:raw_materials/diamond') - .id('tfc:quern/diamond') + .id('tfc:quern/diamond_cut') // 2x Emerald Powder event.recipes.tfc.quern('2x tfc:powder/emerald', '#forge:raw_materials/emerald') - .id('tfc:quern/emerald') + .id('tfc:quern/emerald_cut') // 2x Lapis Lazuli Powder event.recipes.tfc.quern('2x tfc:powder/lapis_lazuli', '#forge:raw_materials/lapis') - .id('tfc:quern/lapis_lazuli') + .id('tfc:quern/lapis_lazuli_cut') // 2x Opal Powder event.recipes.tfc.quern('2x tfc:powder/opal', '#forge:raw_materials/opal') - .id('tfc:quern/opal') + .id('tfc:quern/opal_cut') // 2x Pyrite Powder event.recipes.tfc.quern('2x tfc:powder/pyrite', '#forge:raw_materials/pyrite') - .id('tfc:quern/pyrite') + .id('tfc:quern/pyrite_cut') // 2x Ruby Powder event.recipes.tfc.quern('2x tfc:powder/ruby', '#forge:raw_materials/ruby') - .id('tfc:quern/ruby') + .id('tfc:quern/ruby_cut') // 2x Sapphire Powder event.recipes.tfc.quern('2x tfc:powder/sapphire', '#forge:raw_materials/sapphire') - .id('tfc:quern/sapphire') + .id('tfc:quern/sapphire_cut') // 2x Topaz Powder event.recipes.tfc.quern('2x tfc:powder/topaz', '#forge:raw_materials/topaz') - .id('tfc:quern/topaz') + .id('tfc:quern/topaz_cut') // 1x Gold Powder event.recipes.tfc.quern('1x tfc:powder/native_gold', 'tfc:ore/small_native_gold') diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index d5d05a3c6..cda757d34 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -7,6 +7,9 @@ const registerTFCItemTags = (event) => { event.removeAllTagsFrom(item) }) + // Порошки + event.remove('forge:dusts', 'tfc:powder/amethyst') + // Тэги для возможности использования разных углей в кузне event.add('tfc:forge_fuel', 'minecraft:coal') event.add('tfc:forge_fuel', 'gtceu:coke_gem') @@ -217,7 +220,6 @@ const registerTFCPlacedFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:vein/normal_silver') event.add('tfc:in_biome/veins', 'tfg:vein/normal_sphalerite') event.add('tfc:in_biome/veins', 'tfg:vein/normal_sulfur') - event.add('tfc:in_biome/veins', 'tfg:vein/normal_sylvite') event.add('tfc:in_biome/veins', 'tfg:vein/normal_tetrahedrite') event.add('tfc:in_biome/veins', 'tfg:vein/surface_bismuthinite') event.add('tfc:in_biome/veins', 'tfg:vein/surface_cassiterite') diff --git a/kubejs/startup_scripts/create/items.js b/kubejs/startup_scripts/create/items.js deleted file mode 100644 index 3ebfa36d0..000000000 --- a/kubejs/startup_scripts/create/items.js +++ /dev/null @@ -1,8 +0,0 @@ -// priority: 0 - -const registerCreateItems = (event) => { - event.create('galvanized_iron') - .displayName('Galvanized Iron') - .maxStackSize(16) - .texture("kubejs:item/galvanized_iron") -}; \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 2417a6f2a..d2dd8786e 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -6,14 +6,12 @@ const $SimpleTieredMachine = Java.loadClass('com.gregtechceu.gtceu.api.machine.S * Событие регистрации предметов. */ StartupEvents.registry('item', (event) => { - //registerCreateItems(event); }) /** * Событие регистрации блоков. */ StartupEvents.registry('block', (event) => { - }) GTCEuStartupEvents.registry('gtceu:recipe_type', event => { diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 927e73283..54436bae1 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -6,7 +6,6 @@ */ global.MINECRAFT_DISABLED_ITEMS = [ - /* // Дерево // Дуб 'minecraft:oak_wood', @@ -291,7 +290,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:diamond_helmet', 'minecraft:diamond_chestplate', 'minecraft:diamond_leggings', - 'minecraft:diamond_boots',*/ + 'minecraft:diamond_boots', ]; global.VANILLA_WOOD_TYPES = [ diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 375b3b472..4c3f92554 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -1135,7 +1135,6 @@ global.TFC_DISABLED_ITEMS = [ 'tfc:metal/scythe/blue_steel', 'tfc:metal/scythe_blade/blue_steel', - /* // Ores 'tfc:ore/poor_native_copper', 'tfc:ore/normal_native_copper', @@ -1204,7 +1203,6 @@ global.TFC_DISABLED_ITEMS = [ 'tfc:ore/bituminous_coal', 'tfc:ore/lignite', 'tfc:ore/halite', - */ ]; global.TFC_SIMPLE_MATERIALS = [