From 5ae7465777c48c81c05c41a57d6c9d0424b914ed Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 8 Dec 2023 21:27:02 +0700 Subject: [PATCH] finish ore gen --- config/fml.toml | 4 +- config/ftbquests/quests/chapters/first.snbt | 17 ++++ .../quests/chapters/large_turbines.snbt | 11 +-- .../quests/chapters/the_cleanroom.snbt | 11 +-- config/kubejs-tfc.toml | 14 +++ kubejs/server_scripts/firmalife/tags.js | 6 ++ kubejs/server_scripts/main_server_script.js | 14 ++- kubejs/server_scripts/tfc/data.js | 3 +- kubejs/server_scripts/tfc/tags.js | 98 +++++++++++++++++++ 9 files changed, 152 insertions(+), 26 deletions(-) create mode 100644 config/kubejs-tfc.toml create mode 100644 kubejs/server_scripts/firmalife/tags.js diff --git a/config/fml.toml b/config/fml.toml index 58fc19a9c..f843a0bd1 100644 --- a/config/fml.toml +++ b/config/fml.toml @@ -1,5 +1,5 @@ #Early window height -earlyWindowHeight = 768 +earlyWindowHeight = 480 #Early window framebuffer scale earlyWindowFBScale = 1 #Enable forge global version checking @@ -7,7 +7,7 @@ versionCheck = true #Early window provider earlyWindowProvider = "fmlearlywindow" #Early window width -earlyWindowWidth = 1024 +earlyWindowWidth = 854 #Early window starts maximized earlyWindowMaximized = false #Default config path for servers diff --git a/config/ftbquests/quests/chapters/first.snbt b/config/ftbquests/quests/chapters/first.snbt index 3f7b83625..1e22d97f6 100644 --- a/config/ftbquests/quests/chapters/first.snbt +++ b/config/ftbquests/quests/chapters/first.snbt @@ -3549,6 +3549,23 @@ x: -3.0d y: -2.0d } + { + id: "7668BF4D3ED118AB" + tasks: [{ + id: "19A2382177043109" + item: { + Count: 1b + id: "itemfilters:tag" + tag: { + value: "tfc:foods/raw_meats" + } + } + title: "Any #tfc:foods/raw_meats" + type: "item" + }] + x: 0.0d + y: 7.0d + } ] title: "Rock and Stick Age" } diff --git a/config/ftbquests/quests/chapters/large_turbines.snbt b/config/ftbquests/quests/chapters/large_turbines.snbt index 34b08cabb..ad79c7824 100644 --- a/config/ftbquests/quests/chapters/large_turbines.snbt +++ b/config/ftbquests/quests/chapters/large_turbines.snbt @@ -146,16 +146,7 @@ "" "&9-&r A little bit of Math is required to get the expected results." ] - icon: { - Count: 1b - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } - id: "minecraft:barrier" - } + icon: "minecraft:barrier" id: "33F0EA149F3705CF" size: 0.76d tasks: [{ diff --git a/config/ftbquests/quests/chapters/the_cleanroom.snbt b/config/ftbquests/quests/chapters/the_cleanroom.snbt index 5b665c8ac..c9932b369 100644 --- a/config/ftbquests/quests/chapters/the_cleanroom.snbt +++ b/config/ftbquests/quests/chapters/the_cleanroom.snbt @@ -145,16 +145,7 @@ { dependencies: ["6177B1FCB7B40394"] description: ["Placing &3Generators&r or &3Mufflers&r inside is &cnot allowed&r. The Cleanroom will unform."] - icon: { - Count: 1b - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } - } - id: "minecraft:barrier" - } + icon: "minecraft:barrier" id: "5A3AC1DD5EC6E4C3" shape: "rsquare" size: 0.75d diff --git a/config/kubejs-tfc.toml b/config/kubejs-tfc.toml new file mode 100644 index 000000000..462bfe181 --- /dev/null +++ b/config/kubejs-tfc.toml @@ -0,0 +1,14 @@ +#KubeJS TFC common configuration +#Automatically disables KubeJS' async recipes as it occasionally breaks TFC's knapping and alloying recipe types +# +#This only applies at instance start, using commands to reload KubeJS' common.properties file will set the value back to whatever is defined in the file +# +#This option, and the functionality it possesses, will be removed after TFC releases a version which safeguards against this (theoretically 3.1.3-beta) +# +disableAsyncRecipes = true +#If true: +# Virtual json files created in the 'TFCEvents.data' and 'TFCEvents.worldgenData' events will be printed to the log +# Important (and potentially unstable) events will be printed to the log +# +debugMode = false + diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js new file mode 100644 index 000000000..ca3a8b3d4 --- /dev/null +++ b/kubejs/server_scripts/firmalife/tags.js @@ -0,0 +1,6 @@ +// priority: 0 + +const registerFirmaLifePlacedFeatures = (event) => { + event.remove('tfc:in_biome/veins', 'firmalife:vein/normal_chromite') + event.remove('tfc:in_biome/veins', 'firmalife:vein/deep_chromite') +} diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 5a6255c42..e165d1586 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -23,12 +23,20 @@ ServerEvents.tags('fluid', event => { registerTFCFluidTags(event) }) +/** + * Событие регистрации установки структур. + */ +ServerEvents.tags('worldgen/placed_feature', event => { + registerTFCPlacedFeatures(event) + registerFirmaLifePlacedFeatures(event) +}) + /** * Здесь регистрируются файлы датапаков общие. * Срабатывает до инициализации рецептов. */ ServerEvents.highPriorityData(event => { - //registerTFCDataPacks(event) + // registerTFCDataPacks(event) }) /** @@ -65,4 +73,6 @@ ServerEvents.recipes(event => { */ LootJS.modifiers((event) => { //modifyLootGT(event) -}); \ No newline at end of file +}); + + diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index da149ac75..3945d9982 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -119,5 +119,4 @@ const registerTFCFertilizers = (event) => { event.fertilizer('gtceu:phosphorus_tiny_dust', null, 0.016, null) event.fertilizer('gtceu:phosphorus_small_dust', null, 0.037, null) event.fertilizer('gtceu:phosphorus_dust', null, 0.15, null) -} - +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 65024c424..216b106f6 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -93,4 +93,102 @@ const registerTFCFluidTags = (event) => { event.add('tfc:usable_in_wooden_bucket', 'gtceu:creosote') event.add('tfc:usable_in_red_steel_bucket', 'gtceu:creosote') event.add('tfc:usable_in_blue_steel_bucket', 'gtceu:creosote') +} + +const registerTFCPlacedFeatures = (event) => { + + // Удаление гена гемов из биомов + event.remove('tfc:in_biome/large_features/highlands', 'tfc:random_empty_hot_spring') + event.remove('tfc:in_biome/large_features/low_canyons', 'tfc:random_empty_hot_spring') + event.remove('tfc:in_biome/large_features/plateau', 'tfc:random_empty_hot_spring') + + // Удаление + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_native_copper') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_malachite') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_tetrahedrite') + event.remove('tfc:in_biome/veins', 'tfc:vein/normal_malachite') + event.remove('tfc:in_biome/veins', 'tfc:vein/normal_tetrahedrite') + event.remove('tfc:in_biome/veins', 'tfc:vein/normal_native_gold') + event.remove('tfc:in_biome/veins', 'tfc:vein/rich_native_gold') + event.remove('tfc:in_biome/veins', 'tfc:vein/fake_native_gold') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_native_silver') + event.remove('tfc:in_biome/veins', 'tfc:vein/normal_native_silver') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_cassiterite') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_bismuthinite') + event.remove('tfc:in_biome/veins', 'tfc:vein/normal_bismuthinite') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_sphalerite') + event.remove('tfc:in_biome/veins', 'tfc:vein/normal_sphalerite') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_hematite') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_magnetite') + event.remove('tfc:in_biome/veins', 'tfc:vein/surface_limonite') + event.remove('tfc:in_biome/veins', 'tfc:vein/normal_garnierite') + event.remove('tfc:in_biome/veins', 'tfc:vein/gabbro_garnierite') + event.remove('tfc:in_biome/veins', 'tfc:vein/graphite') + event.remove('tfc:in_biome/veins', 'tfc:vein/lignite') + event.remove('tfc:in_biome/veins', 'tfc:vein/bituminous_coal') + event.remove('tfc:in_biome/veins', 'tfc:vein/sulfur') + event.remove('tfc:in_biome/veins', 'tfc:vein/cryolite') + event.remove('tfc:in_biome/veins', 'tfc:vein/cinnabar') + event.remove('tfc:in_biome/veins', 'tfc:vein/saltpeter') + event.remove('tfc:in_biome/veins', 'tfc:vein/sylvite') + event.remove('tfc:in_biome/veins', 'tfc:vein/borax') + event.remove('tfc:in_biome/veins', 'tfc:vein/gypsum') + event.remove('tfc:in_biome/veins', 'tfc:vein/halite') + event.remove('tfc:in_biome/veins', 'tfc:vein/lapis_lazuli') + event.remove('tfc:in_biome/veins', 'tfc:vein/diamond') + event.remove('tfc:in_biome/veins', 'tfc:vein/emerald') + event.remove('tfc:in_biome/veins', 'tfc:vein/amethyst') + event.remove('tfc:in_biome/veins', 'tfc:vein/opal') + event.remove('tfc:in_biome/veins', 'tfc:geode') + + // Добавление + event.add('tfc:in_biome/veins', 'tfg:vein/deep_garnet_amethyst') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_garnet_opal') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_gold') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_hematite') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_limonite') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_magnetite') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_molybdenum') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_naquadah') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_pitchblende') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_sapphire') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_scheelite') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_sheldonite') + event.add('tfc:in_biome/veins', 'tfg:vein/deep_topaz') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_apatite_') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_basaltic_sands') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_bauxite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_beryllium') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_bismuthinite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_cassiterite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_certus_quartz') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_coal') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_copper') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_garnet_tin') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_garnierite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_gold') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_graphite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_hematite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_lapis') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_limonite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_lubricant') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_magnetite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_manganese') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_mica') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_monazite') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_olivine') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_redstone') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_salt') + event.add('tfc:in_biome/veins', 'tfg:vein/normal_saltpeter') + 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') + event.add('tfc:in_biome/veins', 'tfg:vein/surface_copper') + event.add('tfc:in_biome/veins', 'tfg:vein/surface_sphalerite') + event.add('tfc:in_biome/veins', 'tfg:vein/surface_tetrahedrite') + event.add('tfc:in_biome/veins', 'tfg:geode') } \ No newline at end of file