From 2c0d2cbd2446b3701dfcadf8b7eef5377b0c08e9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 5 May 2025 17:41:36 +0100 Subject: [PATCH] big rock naming overhaul -- keeping to the ad astra naming scheme, then using lang files to give them funny rock names --- kubejs/assets/ad_astra/lang/en_us.json | 93 ++++++++- .../entries/tfg_ores/moon_ore_index.json | 6 +- .../entries/tfg_ores/moon_vein_index.json | 176 +++++++++--------- .../entries/tfg_ores/moon_ore_index.json | 4 +- .../entries/tfg_ores/moon_vein_index.json | 174 ++++++++--------- .../entries/tfg_ores/moon_ore_index.json | 4 +- .../entries/tfg_ores/moon_vein_index.json | 174 ++++++++--------- .../tfg/blockstates/loose/anorthosite.json | 55 ------ .../tfg/blockstates/loose/mars_stone.json | 55 ++++++ .../tfg/blockstates/loose/moon_deepslate.json | 55 ++++++ .../tfg/blockstates/loose/moon_stone.json | 55 ++++++ .../assets/tfg/blockstates/loose/syenite.json | 55 ------ .../rock/hardened_anorthosite.json | 7 - .../blockstates/rock/hardened_mars_stone.json | 7 + .../rock/hardened_moon_deepslate.json | 7 + .../blockstates/rock/hardened_moon_stone.json | 7 + .../blockstates/rock/hardened_syenite.json | 7 - .../tfg/blockstates/rock/raw_anorthosite.json | 7 - .../tfg/blockstates/rock/raw_basanite.json | 7 - .../tfg/blockstates/rock/raw_syenite.json | 7 - kubejs/assets/tfg/lang/en_us.json | 27 +-- .../tfg/models/block/loose/mars_stone_1.json | 6 + .../tfg/models/block/loose/mars_stone_2.json | 6 + .../tfg/models/block/loose/mars_stone_3.json | 6 + .../{syenite_1.json => moon_deepslate_1.json} | 2 +- .../{syenite_2.json => moon_deepslate_2.json} | 2 +- .../{syenite_3.json => moon_deepslate_3.json} | 2 +- .../{anorthosite_1.json => moon_stone_1.json} | 0 .../{anorthosite_2.json => moon_stone_2.json} | 0 .../{anorthosite_3.json => moon_stone_3.json} | 0 ..._syenite.json => hardened_mars_stone.json} | 0 ...site.json => hardened_moon_deepslate.json} | 0 ...rthosite.json => hardened_moon_stone.json} | 0 .../tfg/models/block/rock/raw_basanite.json | 6 - .../tfg/models/block/rock/raw_syenite.json | 6 - .../brick/{anorthosite.png => moon_stone.png} | Bin .../dust/{anorthosite.png => moon_stone.png} | Bin .../loose/{anorthosite.png => moon_stone.png} | Bin .../loot_tables/blocks/moon_deepslate.json | 44 +++++ .../loot_tables/blocks/moon_stone.json} | 4 +- .../tfg/structures/moon/meteors/meteor5.nbt | Bin 69739 -> 69743 bytes .../moon_rabbit_houses/moon_rabbit_house1.nbt | Bin 706 -> 714 bytes .../moon_rabbit_houses/moon_rabbit_house2.nbt | Bin 823 -> 836 bytes .../moon_rabbit_houses/moon_rabbit_house3.nbt | Bin 707 -> 718 bytes .../moon_rabbit_houses/moon_rabbit_house4.nbt | Bin 756 -> 770 bytes .../tfg/worldgen/biome/moon/lunar_plains.json | 2 +- ...rocks.json => loose_moon_stone_rocks.json} | 2 +- .../moon/surface/moon_rock_pile.json | 4 +- .../moon/vein/moon_apatite.json | 16 +- .../moon/vein/moon_bauxite.json | 20 +- .../moon/vein/moon_beryllium.json | 16 +- .../moon/vein/moon_desh.json | 20 +- .../moon/vein/moon_diopside.json | 20 +- .../moon/vein/moon_enstatite.json | 20 +- .../moon/vein/moon_fayalite.json | 20 +- .../moon/vein/moon_magnetite.json | 24 +-- .../moon/vein/moon_mica.json | 68 +------ .../moon/vein/moon_molybdenum.json | 10 +- .../moon/vein/moon_olivine.json | 10 +- .../moon/vein/moon_plutonium.json | 24 +-- .../moon/vein/moon_quartz.json | 24 +-- .../moon/vein/moon_redstone.json | 16 +- .../moon/vein/moon_saltpeter.json | 20 +- .../moon/vein/moon_sapphire.json | 10 +- .../moon/vein/moon_scheelite.json | 16 +- .../moon/vein/moon_sheldonite.json | 20 +- .../moon/vein/moon_silver.json | 16 +- .../data/tfg/worldgen/mars_rock_layers.json | 14 +- .../worldgen/noise_settings/mars_noise.json | 4 +- .../worldgen/noise_settings/moon_noise.json | 6 +- ...rocks.json => loose_moon_stone_rocks.json} | 2 +- kubejs/server_scripts/ad_astra/tags.js | 13 +- kubejs/server_scripts/tfc/recipes.stone.js | 4 +- kubejs/server_scripts/tfg/recipes.collapse.js | 11 +- kubejs/server_scripts/tfg/recipes.rocks.js | 35 ++-- kubejs/startup_scripts/ad_astra/constants.js | 3 - .../ad_astra/dimension_markers.js | 29 +++ kubejs/startup_scripts/gtceu/constants.js | 5 +- kubejs/startup_scripts/main_startup_script.js | 9 +- kubejs/startup_scripts/tfc/tag_prefixes.js | 12 +- kubejs/startup_scripts/tfg/blocks.space.js | 52 ++---- kubejs/startup_scripts/tfg/constants.js | 12 +- kubejs/startup_scripts/tfg/items.js | 16 +- 83 files changed, 914 insertions(+), 784 deletions(-) delete mode 100644 kubejs/assets/tfg/blockstates/loose/anorthosite.json create mode 100644 kubejs/assets/tfg/blockstates/loose/mars_stone.json create mode 100644 kubejs/assets/tfg/blockstates/loose/moon_deepslate.json create mode 100644 kubejs/assets/tfg/blockstates/loose/moon_stone.json delete mode 100644 kubejs/assets/tfg/blockstates/loose/syenite.json delete mode 100644 kubejs/assets/tfg/blockstates/rock/hardened_anorthosite.json create mode 100644 kubejs/assets/tfg/blockstates/rock/hardened_mars_stone.json create mode 100644 kubejs/assets/tfg/blockstates/rock/hardened_moon_deepslate.json create mode 100644 kubejs/assets/tfg/blockstates/rock/hardened_moon_stone.json delete mode 100644 kubejs/assets/tfg/blockstates/rock/hardened_syenite.json delete mode 100644 kubejs/assets/tfg/blockstates/rock/raw_anorthosite.json delete mode 100644 kubejs/assets/tfg/blockstates/rock/raw_basanite.json delete mode 100644 kubejs/assets/tfg/blockstates/rock/raw_syenite.json create mode 100644 kubejs/assets/tfg/models/block/loose/mars_stone_1.json create mode 100644 kubejs/assets/tfg/models/block/loose/mars_stone_2.json create mode 100644 kubejs/assets/tfg/models/block/loose/mars_stone_3.json rename kubejs/assets/tfg/models/block/loose/{syenite_1.json => moon_deepslate_1.json} (62%) rename kubejs/assets/tfg/models/block/loose/{syenite_2.json => moon_deepslate_2.json} (62%) rename kubejs/assets/tfg/models/block/loose/{syenite_3.json => moon_deepslate_3.json} (62%) rename kubejs/assets/tfg/models/block/loose/{anorthosite_1.json => moon_stone_1.json} (100%) rename kubejs/assets/tfg/models/block/loose/{anorthosite_2.json => moon_stone_2.json} (100%) rename kubejs/assets/tfg/models/block/loose/{anorthosite_3.json => moon_stone_3.json} (100%) rename kubejs/assets/tfg/models/block/rock/{hardened_syenite.json => hardened_mars_stone.json} (100%) rename kubejs/assets/tfg/models/block/rock/{hardened_anorthosite.json => hardened_moon_deepslate.json} (100%) rename kubejs/assets/tfg/models/block/rock/{raw_anorthosite.json => hardened_moon_stone.json} (100%) delete mode 100644 kubejs/assets/tfg/models/block/rock/raw_basanite.json delete mode 100644 kubejs/assets/tfg/models/block/rock/raw_syenite.json rename kubejs/assets/tfg/textures/item/brick/{anorthosite.png => moon_stone.png} (100%) rename kubejs/assets/tfg/textures/item/dust/{anorthosite.png => moon_stone.png} (100%) rename kubejs/assets/tfg/textures/item/loose/{anorthosite.png => moon_stone.png} (100%) create mode 100644 kubejs/data/ad_astra/loot_tables/blocks/moon_deepslate.json rename kubejs/data/{tfg/loot_tables/blocks/rock/raw_anorthosite.json => ad_astra/loot_tables/blocks/moon_stone.json} (89%) rename kubejs/data/tfg/worldgen/configured_feature/moon/surface/{loose_anorthosite_rocks.json => loose_moon_stone_rocks.json} (90%) rename kubejs/data/tfg/worldgen/placed_feature/moon/surface/{loose_anorthosite_rocks.json => loose_moon_stone_rocks.json} (82%) create mode 100644 kubejs/startup_scripts/ad_astra/dimension_markers.js diff --git a/kubejs/assets/ad_astra/lang/en_us.json b/kubejs/assets/ad_astra/lang/en_us.json index 1995e0fa3..df168e698 100644 --- a/kubejs/assets/ad_astra/lang/en_us.json +++ b/kubejs/assets/ad_astra/lang/en_us.json @@ -1,9 +1,10 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.ad_astra.moon_sand": "Moon Sand", - "block.ad_astra.moon_cobblestone": "Anorthosite Cobblestone", - "block.ad_astra.moon_cobblestone_slab": "Anorthosite Cobblestone Slab", - "block.ad_astra.moon_cobblestone_stairs": "Anorthosite Cobblestone Stairs", + "block.ad_astra.moon_sand": "Lunar Sand", + "block.ad_astra.moon_stone": "Raw Anorthosite", + "block.ad_astra.moon_cobblestone": "Anorthosite Cobble", + "block.ad_astra.moon_cobblestone_slab": "Anorthosite Cobble Slab", + "block.ad_astra.moon_cobblestone_stairs": "Anorthosite Cobble Stairs", "block.ad_astra.moon_pillar": "Anorthosite Pillar", "block.ad_astra.moon_stone_brick_slab": "Anorthosite Brick Slab", "block.ad_astra.moon_stone_brick_stairs": "Anorthosite Brick Stairs", @@ -18,7 +19,85 @@ "block.ad_astra.polished_moon_stone": "Polished Anorthosite", "block.ad_astra.polished_moon_stone_slab": "Polished Anorthosite Slab", "block.ad_astra.polished_moon_stone_stairs": "Polished Anorthosite Stairs", - "tagprefix.anorthosite": "Anorthosite %s Ore", - "tagprefix.basanite": "Basanite %s Ore", - "tagprefix.syenite": "Syenite %s Ore" + "block.ad_astra.moon_deepslate": "Raw Norite", + "block.ad_astra.moon_cheese_ore": "Anorthosite Cheese Ore", + "block.ad_astra.mars_sand": "Martian Sand", + "block.ad_astra.mars_stone": "Raw Argillite", + "block.ad_astra.mars_cobblestone": "Argillite Cobble", + "block.ad_astra.mars_cobblestone_slab": "Argillite Cobble Slab", + "block.ad_astra.mars_cobblestone_stairs": "Argillite Cobble Stairs", + "block.ad_astra.mars_pillar": "Argillite Pillar", + "block.ad_astra.mars_stone_brick_slab": "Argillite Brick Slab", + "block.ad_astra.mars_stone_brick_stairs": "Argillite Brick Stairs", + "block.ad_astra.mars_stone_brick_wall": "Argillite Brick Wall", + "block.ad_astra.mars_stone_bricks": "Argillite Bricks", + "block.ad_astra.mars_stone_slab": "Argillite Slab", + "block.ad_astra.mars_stone_stairs": "Argillite Stairs", + "block.ad_astra.chiseled_mars_stone_bricks": "Chiseled Argillite Bricks", + "block.ad_astra.chiseled_mars_stone_slab": "Chiseled Argillite Slab", + "block.ad_astra.chiseled_mars_stone_stairs": "Chiseled Argillite Stairs", + "block.ad_astra.cracked_mars_stone_bricks": "Cracked Argillite Bricks", + "block.ad_astra.polished_mars_stone": "Polished Argillite", + "block.ad_astra.polished_mars_stone_slab": "Polished Argillite Slab", + "block.ad_astra.polished_mars_stone_stairs": "Polished Argillite Stairs", + "block.ad_astra.conglomerate": "Martian Conglomerate", + "block.ad_astra.polished_conglomerate": "Polished Martian Conglomerate", + "block.ad_astra.venus_sand": "Venusian Sand", + "block.ad_astra.venus_stone": "Raw Trachyte", + "block.ad_astra.venus_cobblestone": "Trachyte Cobble", + "block.ad_astra.venus_cobblestone_slab": "Trachyte Cobble Slab", + "block.ad_astra.venus_cobblestone_stairs": "Trachyte Cobble Stairs", + "block.ad_astra.venus_pillar": "Trachyte Pillar", + "block.ad_astra.venus_stone_brick_slab": "Trachyte Brick Slab", + "block.ad_astra.venus_stone_brick_stairs": "Trachyte Brick Stairs", + "block.ad_astra.venus_stone_brick_wall": "Trachyte Brick Wall", + "block.ad_astra.venus_stone_bricks": "Trachyte Bricks", + "block.ad_astra.venus_stone_slab": "Trachyte Slab", + "block.ad_astra.venus_stone_stairs": "Trachyte Stairs", + "block.ad_astra.chiseled_venus_stone_bricks": "Chiseled Trachyte Bricks", + "block.ad_astra.chiseled_venus_stone_slab": "Chiseled Trachyte Slab", + "block.ad_astra.chiseled_venus_stone_stairs": "Chiseled Trachyte Stairs", + "block.ad_astra.cracked_venus_stone_bricks": "Cracked Trachyte Bricks", + "block.ad_astra.polished_venus_stone": "Polished Trachyte", + "block.ad_astra.polished_venus_stone_slab": "Polished Trachyte Slab", + "block.ad_astra.polished_venus_stone_stairs": "Polished Trachyte Stairs", + "block.ad_astra.mercury_stone": "Raw Komatiite", + "block.ad_astra.mercury_cobblestone": "Komatiite Cobble", + "block.ad_astra.mercury_cobblestone_slab": "Komatiite Cobble Slab", + "block.ad_astra.mercury_cobblestone_stairs": "Komatiite Cobble Stairs", + "block.ad_astra.mercury_pillar": "Komatiite Pillar", + "block.ad_astra.mercury_stone_brick_slab": "Komatiite Brick Slab", + "block.ad_astra.mercury_stone_brick_stairs": "Komatiite Brick Stairs", + "block.ad_astra.mercury_stone_brick_wall": "Komatiite Brick Wall", + "block.ad_astra.mercury_stone_bricks": "Komatiite Bricks", + "block.ad_astra.mercury_stone_slab": "Komatiite Slab", + "block.ad_astra.mercury_stone_stairs": "Komatiite Stairs", + "block.ad_astra.chiseled_mercury_stone_bricks": "Chiseled Komatiite Bricks", + "block.ad_astra.chiseled_mercury_stone_slab": "Chiseled Komatiite Slab", + "block.ad_astra.chiseled_mercury_stone_stairs": "Chiseled Komatiite Stairs", + "block.ad_astra.cracked_mercury_stone_bricks": "Cracked Komatiite Bricks", + "block.ad_astra.polished_mercury_stone": "Polished Komatiite", + "block.ad_astra.polished_mercury_stone_slab": "Polished Komatiite Slab", + "block.ad_astra.polished_mercury_stone_stairs": "Polished Komatiite Stairs", + "block.ad_astra.glacio_stone": "Raw Sylvinite", + "block.ad_astra.glacio_cobblestone": "Sylvinite Cobble", + "block.ad_astra.glacio_cobblestone_slab": "Sylvinite Cobble Slab", + "block.ad_astra.glacio_cobblestone_stairs": "Sylvinite Cobble Stairs", + "block.ad_astra.glacio_pillar": "Sylvinite Pillar", + "block.ad_astra.glacio_stone_brick_slab": "Sylvinite Brick Slab", + "block.ad_astra.glacio_stone_brick_stairs": "Sylvinite Brick Stairs", + "block.ad_astra.glacio_stone_brick_wall": "Sylvinite Brick Wall", + "block.ad_astra.glacio_stone_bricks": "Sylvinite Bricks", + "block.ad_astra.glacio_stone_slab": "Sylvinite Slab", + "block.ad_astra.glacio_stone_stairs": "Sylvinite Stairs", + "block.ad_astra.chiseled_glacio_stone_bricks": "Chiseled Sylvinite Bricks", + "block.ad_astra.chiseled_glacio_stone_slab": "Chiseled Sylvinite Slab", + "block.ad_astra.chiseled_glacio_stone_stairs": "Chiseled Sylvinite Stairs", + "block.ad_astra.cracked_glacio_stone_bricks": "Cracked Sylvinite Bricks", + "block.ad_astra.polished_glacio_stone": "Polished Sylvinite", + "block.ad_astra.polished_glacio_stone_slab": "Polished Sylvinite Slab", + "block.ad_astra.polished_glacio_stone_stairs": "Polished Sylvinite Stairs", + "tagprefix.moon_stone": "Anorthosite %s Ore", + "tagprefix.moon_deepslate": "Norite %s Ore", + "tagprefix.mars_stone": "Argillite %s Ore" } \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json index c8f8a258e..d4415de53 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Aluminium: $(l:tfg_ores/moon_vein_index#moon_bauxite)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Apatite: $(l:tfg_ores/moon_vein_index#moon_apatite)25%$(/l)$()$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_plutonium)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_bauxite)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barite: $(l:tfg_ores/moon_vein_index#moon_quartz)15%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/moon_vein_index#moon_monazite)50%$(/l)$()$(li)Bauxite: $(l:tfg_ores/moon_vein_index#moon_bauxite)29%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)25%$(/l)$()$(li)Beryllium: $(l:tfg_ores/moon_vein_index#moon_beryllium)35%$(/l)$()$(li)Bornite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l)$()$(li)Certus Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)50%$(/l)$()$(li)Chromite: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)30%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/moon_vein_index#moon_redstone)20%$(/l)$()$(li)Cobalt: $(l:tfg_ores/moon_vein_index#moon_diopside)22%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/moon_vein_index#moon_garnierite)20%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Aluminium: $(l:tfg_ores/moon_vein_index#moon_bauxite)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Apatite: $(l:tfg_ores/moon_vein_index#moon_apatite)25%$(/l)$()$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_plutonium)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_bauxite)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barite: $(l:tfg_ores/moon_vein_index#moon_quartz)15%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/moon_vein_index#moon_monazite)50%$(/l)$()$(li)Bauxite: $(l:tfg_ores/moon_vein_index#moon_bauxite)29%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)25%$(/l)$()$(li)Beryllium: $(l:tfg_ores/moon_vein_index#moon_beryllium)35%$(/l)$()$(li)Bornite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l)$()$(li)Certus Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)50%$(/l)$()$(li)Chromite: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)30%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/moon_vein_index#moon_redstone)20%$(/l)$()$(li)Cobalt: $(l:tfg_ores/moon_vein_index#moon_diopside)22%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/moon_vein_index#moon_garnierite)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_plutonium)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l)$()$(li)Diopside: $(l:tfg_ores/moon_vein_index#moon_diopside)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/moon_vein_index#moon_saltpeter)25%$(/l)$()$(li)Emerald: $(l:tfg_ores/moon_vein_index#moon_beryllium)50%$(/l)$()$(li)Enstatite: $(l:tfg_ores/moon_vein_index#moon_enstatite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_fayalite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Fayalite: $(l:tfg_ores/moon_vein_index#moon_fayalite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)30%$(/l)$()$(li)Garnierite: $(l:tfg_ores/moon_vein_index#moon_garnierite)30%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Ilmenite: $(l:tfg_ores/moon_vein_index#moon_bauxite)33%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)15%$(/l)$()$(li)Kyanite: $(l:tfg_ores/moon_vein_index#moon_mica)35%$(/l)$()$(li)Lead: $(l:tfg_ores/moon_vein_index#moon_silver)25%$(/l)$()$(li)Lithium: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()", + "text": "$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l)$()$(li)Diopside: $(l:tfg_ores/moon_vein_index#moon_diopside)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/moon_vein_index#moon_saltpeter)25%$(/l)$()$(li)Emerald: $(l:tfg_ores/moon_vein_index#moon_beryllium)50%$(/l)$()$(li)Enstatite: $(l:tfg_ores/moon_vein_index#moon_enstatite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_fayalite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Fayalite: $(l:tfg_ores/moon_vein_index#moon_fayalite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)30%$(/l)$()$(li)Garnierite: $(l:tfg_ores/moon_vein_index#moon_garnierite)30%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Ilmenite: $(l:tfg_ores/moon_vein_index#moon_bauxite)33%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)15%$(/l)$()$(li)Kyanite: $(l:tfg_ores/moon_vein_index#moon_mica)35%$(/l)$()$(li)Lead: $(l:tfg_ores/moon_vein_index#moon_silver)25%$(/l)$()$(li)Lithium: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()", "type": "patchouli:text" }, { @@ -34,7 +34,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_diopside)13%$(/l)$()$(li)Thorium: $(l:tfg_ores/moon_vein_index#moon_beryllium)15%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_diopside)22%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)40%$(/l)$()", + "text": "$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_diopside)13%$(/l)$()$(li)Thorium: $(l:tfg_ores/moon_vein_index#moon_beryllium)15%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_diopside)22%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l), $(l:tfg_ores/moon_vein_index#moon_plutonium)35%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)40%$(/l)$()", "type": "patchouli:text" } ] diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json index 340d0260c..56b3e34cc 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "The Moon Vein Index", - "icon": "gtceu:anorthosite_certus_quartz_ore", + "icon": "gtceu:moon_stone_certus_quartz_ore", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxite & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Certus Quartz$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_plutonium)Desh & Plutonium$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_diopside)Diopside$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_enstatite)Enstatite & Chromite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_fayalite)Fayalite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Kyanite, Mica, & Bauxite$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxite & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Certus Quartz$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_diopside)Diopside$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_enstatite)Enstatite & Chromite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_fayalite)Fayalite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_olivine)Olivine$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_olivine)Olivine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_plutonium)Plutonium & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -29,7 +29,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Size$(): 25$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basanite, Diorite", + "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Size$(): 25$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Norite", "title": "Apatite & Pyrochlore", "type": "patchouli:text", "anchor": "moon_apatite" @@ -163,7 +163,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 120$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 70$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basanite", + "text": "$(thing)Rarity$(): 120$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 70$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Norite", "title": "Bauxite & Ilmenite", "type": "patchouli:text", "anchor": "moon_bauxite" @@ -255,7 +255,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 200$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 100$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basanite, Diorite, Gabbro", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 100$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 80$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Diorite, Gabbro, Norite", "title": "Certus Quartz", "type": "patchouli:text", "anchor": "moon_quartz" @@ -347,7 +347,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 30$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basanite, Diorite, Gabbro", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 30$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Gabbro, Norite", "title": "Chromite & Magnetite", "type": "patchouli:text", "anchor": "moon_magnetite" @@ -454,7 +454,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 0$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basanite", + "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 0$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Norite", "title": "Cooperite & Bornite", "type": "patchouli:text", "anchor": "moon_sheldonite" @@ -546,7 +546,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 70$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basanite", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 70$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Norite", "title": "Desh & Ilmenite", "type": "patchouli:text", "anchor": "moon_desh" @@ -638,74 +638,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 310$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — -20$(br)$(thing)Size$(): 15$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Basanite", - "title": "Desh & Plutonium", - "type": "patchouli:text", - "anchor": "moon_plutonium" - }, - { - "Type": "patchouli:multiblock", - "name": "Desh", - "multiblock": { - "mapping": { - "0": "#forge:ores/desh" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Percentage$(): 45%$(br)$(thing)Source of$(): Iron, Titanium, Nitrogen$(br)$(thing)Formula$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "Armalcolite", - "multiblock": { - "mapping": { - "0": "#forge:ores/armalcolite" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Percentage$(): 30%$(br)$(thing)Source of$(): Magnesium, Rutile, Titanium$(br)$(thing)Formula$(): TODO", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "Plutonium", - "multiblock": { - "mapping": { - "0": "#forge:ores/plutonium" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Plutonium$(br)$(thing)Formula$(): Pu²³⁹$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -10 — 80$(br)$(thing)Size$(): 36$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basanite, Diorite, Gabbro", + "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -10 — 80$(br)$(thing)Size$(): 36$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Diorite, Gabbro, Norite", "title": "Diopside", "type": "patchouli:text", "anchor": "moon_diopside" @@ -797,7 +730,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 300$(br)$(thing)Density$(): 0.35$(br)$(thing)Type$(): Pipe Vein$(br)$(thing)Y$(): -32 — 50$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 10$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basanite", + "text": "$(thing)Rarity$(): 300$(br)$(thing)Density$(): 0.35$(br)$(thing)Type$(): Pipe Vein$(br)$(thing)Y$(): -32 — 50$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 10$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Norite", "title": "Emerald & Beryllium", "type": "patchouli:text", "anchor": "moon_beryllium" @@ -864,7 +797,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -20 — 90$(br)$(thing)Size$(): 36$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basanite, Diorite, Gabbro", + "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -20 — 90$(br)$(thing)Size$(): 36$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Diorite, Gabbro, Norite", "title": "Enstatite & Chromite", "type": "patchouli:text", "anchor": "moon_enstatite" @@ -956,7 +889,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -40 — 90$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basanite, Diorite, Gabbro", + "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -40 — 90$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Diorite, Gabbro, Norite", "title": "Fayalite & Pyrite", "type": "patchouli:text", "anchor": "moon_fayalite" @@ -1155,7 +1088,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 210$(br)$(thing)Size$(): 25$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basanite, Diorite, Gabbro", + "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 210$(br)$(thing)Size$(): 25$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Gabbro, Norite", "title": "Kyanite, Mica, & Bauxite", "type": "patchouli:text", "anchor": "moon_mica" @@ -1247,7 +1180,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 120$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 20$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Basalt, Basanite, Gabbro", + "text": "$(thing)Rarity$(): 120$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 20$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Basalt, Gabbro, Norite", "title": "Olivine", "type": "patchouli:text", "anchor": "moon_olivine" @@ -1339,7 +1272,74 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 100$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basanite", + "text": "$(thing)Rarity$(): 310$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — -20$(br)$(thing)Size$(): 15$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Norite", + "title": "Plutonium & Tungstate", + "type": "patchouli:text", + "anchor": "moon_plutonium" + }, + { + "Type": "patchouli:multiblock", + "name": "Armalcolite", + "multiblock": { + "mapping": { + "0": "#forge:ores/armalcolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 40%$(br)$(thing)Source of$(): Magnesium, Rutile, Titanium$(br)$(thing)Formula$(): TODO", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Tungstate", + "multiblock": { + "mapping": { + "0": "#forge:ores/tungstate" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Source of$(): Tungsten, Lithium$(br)$(thing)Formula$(): Li₂(WO₃)O", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Plutonium", + "multiblock": { + "mapping": { + "0": "#forge:ores/plutonium" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Plutonium$(br)$(thing)Formula$(): Pu²³⁹$(br)$(thing)Hazard$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 100$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Norite", "title": "Redstone, Cinnabar, & Ruby", "type": "patchouli:text", "anchor": "moon_redstone" @@ -1406,7 +1406,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Size$(): 35$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basanite, Diorite", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Size$(): 35$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Norite", "title": "Saltpeter & Electrotine", "type": "patchouli:text", "anchor": "moon_saltpeter" @@ -1498,7 +1498,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 280$(br)$(thing)Density$(): 0.35$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): -64 — 26$(br)$(thing)Size$(): 28$(br)$(thing)Height$(): 8$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Basalt, Basanite", + "text": "$(thing)Rarity$(): 280$(br)$(thing)Density$(): 0.35$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): -64 — 26$(br)$(thing)Size$(): 28$(br)$(thing)Height$(): 8$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Basalt, Norite", "title": "Sapphire & Almandine", "type": "patchouli:text", "anchor": "moon_sapphire" @@ -1590,7 +1590,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.35$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 0$(br)$(thing)Size$(): 20$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basanite, Diorite, Gabbro", + "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.35$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 0$(br)$(thing)Size$(): 20$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Gabbro, Norite", "title": "Scheelite & Tungstate", "type": "patchouli:text", "anchor": "moon_scheelite" @@ -1657,7 +1657,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 75$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basanite", + "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 75$(br)$(thing)Size$(): 30$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Norite", "title": "Silver, Galena, & Lead", "type": "patchouli:text", "anchor": "moon_silver" @@ -1724,7 +1724,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Rarity$(): 245$(br)$(thing)Density$(): 0.45$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 10$(br)$(thing)Size$(): 26$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Basalt, Basanite, Diorite, Gabbro", + "text": "$(thing)Rarity$(): 245$(br)$(thing)Density$(): 0.45$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -64 — 10$(br)$(thing)Size$(): 26$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Basalt, Diorite, Gabbro, Norite", "title": "Wulfenite & Molybdenite", "type": "patchouli:text", "anchor": "moon_molybdenum" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json index d01862c8b..cdfd15fd5 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_plutonium)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_bauxite)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_plutonium)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l)$()$(li)Diopside: $(l:tfg_ores/moon_vein_index#moon_diopside)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)15%$(/l)$()$(li)Enstatite: $(l:tfg_ores/moon_vein_index#moon_enstatite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_fayalite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Fayalite: $(l:tfg_ores/moon_vein_index#moon_fayalite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Альмандин: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюминий: $(l:tfg_ores/moon_vein_index#moon_bauxite)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)25%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)15%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)50%$(/l)$()$(li)Бериллий: $(l:tfg_ores/moon_vein_index#moon_beryllium)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)29%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)25%$(/l)$()$(li)Борнит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l)$()$(li)Ванадий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()", + "text": "$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_plutonium)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_bauxite)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l)$()$(li)Diopside: $(l:tfg_ores/moon_vein_index#moon_diopside)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)15%$(/l)$()$(li)Enstatite: $(l:tfg_ores/moon_vein_index#moon_enstatite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_fayalite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Fayalite: $(l:tfg_ores/moon_vein_index#moon_fayalite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Альмандин: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюминий: $(l:tfg_ores/moon_vein_index#moon_bauxite)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)25%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)15%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)50%$(/l)$()$(li)Бериллий: $(l:tfg_ores/moon_vein_index#moon_beryllium)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)29%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)25%$(/l)$()$(li)Борнит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l)$()$(li)Ванадий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Вольфрамат: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)40%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/moon_vein_index#moon_garnierite)30%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/moon_vein_index#moon_beryllium)50%$(/l)$()$(li)Ильменит: $(l:tfg_ores/moon_vein_index#moon_bauxite)33%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)15%$(/l)$()$(li)Истинный кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)50%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)10%$(/l)$()$(li)Киноварь: $(l:tfg_ores/moon_vein_index#moon_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_diopside)22%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)15%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_garnierite)20%$(/l)$()$(li)Литий: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()", + "text": "$(li)Вольфрамат: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l), $(l:tfg_ores/moon_vein_index#moon_plutonium)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)40%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/moon_vein_index#moon_garnierite)30%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/moon_vein_index#moon_beryllium)50%$(/l)$()$(li)Ильменит: $(l:tfg_ores/moon_vein_index#moon_bauxite)33%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)15%$(/l)$()$(li)Истинный кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)50%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)10%$(/l)$()$(li)Киноварь: $(l:tfg_ores/moon_vein_index#moon_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_diopside)22%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)15%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_garnierite)20%$(/l)$()$(li)Литий: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json index 307fb1155..812b99c24 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "The Moon Vein Index", - "icon": "gtceu:anorthosite_certus_quartz_ore", + "icon": "gtceu:moon_stone_certus_quartz_ore", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_plutonium)_ и Плутоний$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_diopside)Diopside$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_enstatite)Enstatite & Chromite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_fayalite)Fayalite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит и Ильменит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Истинный кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_olivine)Оливин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Киноварь и Рубин$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_diopside)Diopside$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_enstatite)Enstatite & Chromite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_fayalite)Fayalite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_plutonium)Plutonium & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит и Ильменит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Истинный кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_olivine)Оливин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Киноварь и Рубин$()$()", "type": "patchouli:text" }, { @@ -29,74 +29,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 310$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — -20$(br)$(thing)Размер$(): 15$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Базанит", - "title": "_ и Плутоний", - "type": "patchouli:text", - "anchor": "moon_plutonium" - }, - { - "Type": "patchouli:multiblock", - "name": "Desh", - "multiblock": { - "mapping": { - "0": "#forge:ores/desh" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Процент руды$(): 45%$(br)$(thing)Source of$(): Iron, Titanium, Nitrogen$(br)$(thing)Формула$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "Armalcolite", - "multiblock": { - "mapping": { - "0": "#forge:ores/armalcolite" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Процент руды$(): 30%$(br)$(thing)Source of$(): Magnesium, Rutile, Titanium$(br)$(thing)Формула$(): TODO", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "Плутоний", - "multiblock": { - "mapping": { - "0": "#forge:ores/plutonium" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Процент руды$(): 25%$(br)$(thing)Хромит$(): Плутоний$(br)$(thing)Формула$(): Pu²³⁹$(br)$(thing)Ядовит$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 70$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базанит", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 70$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Норит", "title": "Desh & Ilmenite", "type": "patchouli:text", "anchor": "moon_desh" @@ -188,7 +121,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -10 — 80$(br)$(thing)Размер$(): 36$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базанит, Габбро, Диорит", + "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -10 — 80$(br)$(thing)Размер$(): 36$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Габбро, Диорит, Норит", "title": "Diopside", "type": "patchouli:text", "anchor": "moon_diopside" @@ -280,7 +213,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -20 — 90$(br)$(thing)Размер$(): 36$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базанит, Габбро, Диорит", + "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -20 — 90$(br)$(thing)Размер$(): 36$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Габбро, Диорит, Норит", "title": "Enstatite & Chromite", "type": "patchouli:text", "anchor": "moon_enstatite" @@ -372,7 +305,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -40 — 90$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базанит, Габбро, Диорит", + "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -40 — 90$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Габбро, Диорит, Норит", "title": "Fayalite & Pyrite", "type": "patchouli:text", "anchor": "moon_fayalite" @@ -464,7 +397,74 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 60$(br)$(thing)Размер$(): 25$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базанит, Диорит", + "text": "$(thing)Редкость$(): 310$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — -20$(br)$(thing)Размер$(): 15$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Норит", + "title": "Plutonium & Tungstate", + "type": "patchouli:text", + "anchor": "moon_plutonium" + }, + { + "Type": "patchouli:multiblock", + "name": "Armalcolite", + "multiblock": { + "mapping": { + "0": "#forge:ores/armalcolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 40%$(br)$(thing)Source of$(): Magnesium, Rutile, Titanium$(br)$(thing)Формула$(): TODO", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Вольфрамат", + "multiblock": { + "mapping": { + "0": "#forge:ores/tungstate" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Хромит$(): Вольфрам, Литий$(br)$(thing)Формула$(): Li₂(WO₃)O", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Плутоний", + "multiblock": { + "mapping": { + "0": "#forge:ores/plutonium" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 25%$(br)$(thing)Хромит$(): Плутоний$(br)$(thing)Формула$(): Pu²³⁹$(br)$(thing)Ядовит$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 60$(br)$(thing)Размер$(): 25$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Диорит, Норит", "title": "Апатит и Пирохлор", "type": "patchouli:text", "anchor": "moon_apatite" @@ -598,7 +598,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 120$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 70$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базанит", + "text": "$(thing)Редкость$(): 120$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 70$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Норит", "title": "Боксит и Ильменит", "type": "patchouli:text", "anchor": "moon_bauxite" @@ -690,7 +690,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 245$(br)$(thing)Плотность$(): 0.45$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 10$(br)$(thing)Размер$(): 26$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Базальт, Базанит, Габбро, Диорит", + "text": "$(thing)Редкость$(): 245$(br)$(thing)Плотность$(): 0.45$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 10$(br)$(thing)Размер$(): 26$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Базальт, Габбро, Диорит, Норит", "title": "Вульфенит & Молибденит", "type": "patchouli:text", "anchor": "moon_molybdenum" @@ -889,7 +889,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 300$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): трубчатая жила$(br)$(thing)Y-уровень$(): -32 — 50$(br)$(thing)Высота$(): 60$(br)$(thing)Радиус$(): 10$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базанит", + "text": "$(thing)Редкость$(): 300$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): трубчатая жила$(br)$(thing)Y-уровень$(): -32 — 50$(br)$(thing)Высота$(): 60$(br)$(thing)Радиус$(): 10$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Норит", "title": "Изумруд и Бериллий", "type": "patchouli:text", "anchor": "moon_beryllium" @@ -956,7 +956,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 200$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 100$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базанит, Габбро, Диорит", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 100$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 80$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Габбро, Диорит, Норит", "title": "Истинный кварц", "type": "patchouli:text", "anchor": "moon_quartz" @@ -1048,7 +1048,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 120$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 20$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Базальт, Базанит, Габбро", + "text": "$(thing)Редкость$(): 120$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 20$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Базальт, Габбро, Норит", "title": "Оливин", "type": "patchouli:text", "anchor": "moon_olivine" @@ -1140,7 +1140,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 100$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базанит", + "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 100$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Норит", "title": "Редстоун, Киноварь и Рубин", "type": "patchouli:text", "anchor": "moon_redstone" @@ -1207,7 +1207,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 280$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): -64 — 26$(br)$(thing)Размер$(): 28$(br)$(thing)Высота$(): 8$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Базальт, Базанит", + "text": "$(thing)Редкость$(): 280$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): -64 — 26$(br)$(thing)Размер$(): 28$(br)$(thing)Высота$(): 8$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Базальт, Норит", "title": "Сапфир и Альмандин", "type": "patchouli:text", "anchor": "moon_sapphire" @@ -1299,7 +1299,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 60$(br)$(thing)Размер$(): 35$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базанит, Диорит", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 60$(br)$(thing)Размер$(): 35$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Диорит, Норит", "title": "Селитра и Электротин", "type": "patchouli:text", "anchor": "moon_saltpeter" @@ -1391,7 +1391,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 210$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 75$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базанит", + "text": "$(thing)Редкость$(): 210$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -32 — 75$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Норит", "title": "Серебро, Галена и Свинец", "type": "patchouli:text", "anchor": "moon_silver" @@ -1458,7 +1458,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 30$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базанит, Габбро, Диорит", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 30$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Габбро, Диорит, Норит", "title": "Хромит и Магнетит", "type": "patchouli:text", "anchor": "moon_magnetite" @@ -1565,7 +1565,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 0 — 210$(br)$(thing)Размер$(): 25$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базанит, Габбро, Диорит", + "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 0 — 210$(br)$(thing)Размер$(): 25$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Габбро, Диорит, Норит", "title": "Ционит, Слюда и Боксит", "type": "patchouli:text", "anchor": "moon_mica" @@ -1657,7 +1657,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 0$(br)$(thing)Размер$(): 20$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базанит, Габбро, Диорит", + "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 0$(br)$(thing)Размер$(): 20$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Габбро, Диорит, Норит", "title": "Шеелит и Вольфрамат", "type": "patchouli:text", "anchor": "moon_scheelite" @@ -1724,7 +1724,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 0$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базанит", + "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -64 — 0$(br)$(thing)Размер$(): 30$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Норит", "title": "Шелдонит и Борнит", "type": "patchouli:text", "anchor": "moon_sheldonite" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json index 8210ea175..78af17196 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_plutonium)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_bauxite)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_plutonium)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l)$()$(li)Diopside: $(l:tfg_ores/moon_vein_index#moon_diopside)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)15%$(/l)$()$(li)Enstatite: $(l:tfg_ores/moon_vein_index#moon_enstatite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_fayalite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Fayalite: $(l:tfg_ores/moon_vein_index#moon_fayalite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Алмандін: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюмінію: $(l:tfg_ores/moon_vein_index#moon_bauxite)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)25%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)15%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)50%$(/l)$()$(li)Берилій: $(l:tfg_ores/moon_vein_index#moon_beryllium)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)29%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)25%$(/l)$()$(li)Борніт: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l)$()$(li)Ванадієвий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()", + "text": "$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_plutonium)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_bauxite)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l)$()$(li)Diopside: $(l:tfg_ores/moon_vein_index#moon_diopside)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)15%$(/l)$()$(li)Enstatite: $(l:tfg_ores/moon_vein_index#moon_enstatite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_fayalite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Fayalite: $(l:tfg_ores/moon_vein_index#moon_fayalite)45%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_olivine)10%$(/l)$()$(li)Алмандін: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюмінію: $(l:tfg_ores/moon_vein_index#moon_bauxite)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)25%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)15%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)50%$(/l)$()$(li)Берилій: $(l:tfg_ores/moon_vein_index#moon_beryllium)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)29%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)25%$(/l)$()$(li)Борніт: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l)$()$(li)Ванадієвий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Вольфрам: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)40%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/moon_vein_index#moon_garnierite)30%$(/l)$()$(li)Електротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)25%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Ільменіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)33%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)15%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/moon_vein_index#moon_quartz)25%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)10%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/moon_vein_index#moon_mica)35%$(/l)$()$(li)Кіновар: $(l:tfg_ores/moon_vein_index#moon_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_diopside)22%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)15%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_garnierite)20%$(/l)$()$(li)Літій: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()", + "text": "$(li)Вольфрам: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l), $(l:tfg_ores/moon_vein_index#moon_plutonium)35%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)40%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/moon_vein_index#moon_garnierite)30%$(/l)$()$(li)Електротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)25%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Ільменіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)33%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_enstatite)15%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/moon_vein_index#moon_quartz)25%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)10%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/moon_vein_index#moon_mica)35%$(/l)$()$(li)Кіновар: $(l:tfg_ores/moon_vein_index#moon_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_diopside)22%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)15%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_garnierite)20%$(/l)$()$(li)Літій: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json index b9966f2c7..2e41f5975 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json @@ -1,7 +1,7 @@ { "__credits__": "This page was automatically generated by OresToFieldGuide.", "name": "The Moon Vein Index", - "icon": "gtceu:anorthosite_certus_quartz_ore", + "icon": "gtceu:moon_stone_certus_quartz_ore", "category": "tfc:tfg_ores", "read_by_default": true, "secret": false, @@ -14,7 +14,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_plutonium)_ і Плутоній$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_diopside)Diopside$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_enstatite)Enstatite & Chromite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_fayalite)Fayalite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_olivine)Олівін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Поклади Істинного Кварцу$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Кіновар і Рубін$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_diopside)Diopside$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_enstatite)Enstatite & Chromite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_fayalite)Fayalite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_plutonium)Plutonium & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_olivine)Олівін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Поклади Істинного Кварцу$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Кіновар і Рубін$()$()", "type": "patchouli:text" }, { @@ -29,74 +29,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 310$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — -20$(br)$(thing)Розмір$(): 15$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Базаніт", - "title": "_ і Плутоній", - "type": "patchouli:text", - "anchor": "moon_plutonium" - }, - { - "Type": "patchouli:multiblock", - "name": "Desh", - "multiblock": { - "mapping": { - "0": "#forge:ores/desh" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Відсоток$(): 45%$(br)$(thing)Source of$(): Iron, Titanium, Nitrogen$(br)$(thing)Формула$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "Armalcolite", - "multiblock": { - "mapping": { - "0": "#forge:ores/armalcolite" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Відсоток$(): 30%$(br)$(thing)Source of$(): Magnesium, Rutile, Titanium$(br)$(thing)Формула$(): TODO", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:multiblock", - "name": "Плутоній", - "multiblock": { - "mapping": { - "0": "#forge:ores/plutonium" - }, - "pattern": [ - [ - "0" - ], - [ - " " - ] - ] - }, - "enable_visualize": false, - "text": "$(thing)Відсоток$(): 25%$(br)$(thing)Джерело$(): Плутонію$(br)$(thing)Формула$(): Pu²³⁹$(br)$(thing)Небезпечний$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", - "type": "patchouli:multiblock" - }, - { - "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 70$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базаніт", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 70$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Норит", "title": "Desh & Ilmenite", "type": "patchouli:text", "anchor": "moon_desh" @@ -188,7 +121,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -10 — 80$(br)$(thing)Розмір$(): 36$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базаніт, Габро, Діорит", + "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -10 — 80$(br)$(thing)Розмір$(): 36$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Габро, Діорит, Норит", "title": "Diopside", "type": "patchouli:text", "anchor": "moon_diopside" @@ -280,7 +213,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -20 — 90$(br)$(thing)Розмір$(): 36$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базаніт, Габро, Діорит", + "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -20 — 90$(br)$(thing)Розмір$(): 36$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Габро, Діорит, Норит", "title": "Enstatite & Chromite", "type": "patchouli:text", "anchor": "moon_enstatite" @@ -372,7 +305,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -40 — 90$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базаніт, Габро, Діорит", + "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -40 — 90$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Габро, Діорит, Норит", "title": "Fayalite & Pyrite", "type": "patchouli:text", "anchor": "moon_fayalite" @@ -464,7 +397,74 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Розмір$(): 25$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базаніт, Діорит", + "text": "$(thing)Рідкість$(): 310$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — -20$(br)$(thing)Розмір$(): 15$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Норит", + "title": "Plutonium & Tungstate", + "type": "patchouli:text", + "anchor": "moon_plutonium" + }, + { + "Type": "patchouli:multiblock", + "name": "Armalcolite", + "multiblock": { + "mapping": { + "0": "#forge:ores/armalcolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 40%$(br)$(thing)Source of$(): Magnesium, Rutile, Titanium$(br)$(thing)Формула$(): TODO", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Вольфрам", + "multiblock": { + "mapping": { + "0": "#forge:ores/tungstate" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Джерело$(): Вольфраму, Літію$(br)$(thing)Формула$(): Li₂(WO₃)O", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Плутоній", + "multiblock": { + "mapping": { + "0": "#forge:ores/plutonium" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 25%$(br)$(thing)Джерело$(): Плутонію$(br)$(thing)Формула$(): Pu²³⁹$(br)$(thing)Небезпечний$(): $(c)$(t:Requires Full Protection)Carcinogenic (Any Contact)$(/t)$()", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Розмір$(): 25$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Діорит, Норит", "title": "Апатит і Пірохлор", "type": "patchouli:text", "anchor": "moon_apatite" @@ -598,7 +598,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 120$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 70$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базаніт", + "text": "$(thing)Рідкість$(): 120$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 70$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Норит", "title": "Боксит і Ільменіт", "type": "patchouli:text", "anchor": "moon_bauxite" @@ -690,7 +690,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 245$(br)$(thing)Щільність$(): 0.45$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 10$(br)$(thing)Розмір$(): 26$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Базальт, Базаніт, Габро, Діорит", + "text": "$(thing)Рідкість$(): 245$(br)$(thing)Щільність$(): 0.45$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 10$(br)$(thing)Розмір$(): 26$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Базальт, Габро, Діорит, Норит", "title": "Вульфеніт і Молібденіт", "type": "patchouli:text", "anchor": "moon_molybdenum" @@ -889,7 +889,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 210$(br)$(thing)Розмір$(): 25$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базаніт, Габро, Діорит", + "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 210$(br)$(thing)Розмір$(): 25$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Габро, Діорит, Норит", "title": "Кіаніт, Слюда та Боксити", "type": "patchouli:text", "anchor": "moon_mica" @@ -981,7 +981,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 120$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 20$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Базальт, Базаніт, Габро", + "text": "$(thing)Рідкість$(): 120$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 20$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Базальт, Габро, Норит", "title": "Олівін", "type": "patchouli:text", "anchor": "moon_olivine" @@ -1073,7 +1073,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 200$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 100$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базаніт, Габро, Діорит", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 100$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 80$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Габро, Діорит, Норит", "title": "Поклади Істинного Кварцу", "type": "patchouli:text", "anchor": "moon_quartz" @@ -1165,7 +1165,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 100$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базаніт", + "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 100$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Норит", "title": "Редстоун, Кіновар і Рубін", "type": "patchouli:text", "anchor": "moon_redstone" @@ -1232,7 +1232,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 280$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): -64 — 26$(br)$(thing)Розмір$(): 28$(br)$(thing)Висота$(): 8$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Базальт, Базаніт", + "text": "$(thing)Рідкість$(): 280$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): -64 — 26$(br)$(thing)Розмір$(): 28$(br)$(thing)Висота$(): 8$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Базальт, Норит", "title": "Сапфір і Альмадін", "type": "patchouli:text", "anchor": "moon_sapphire" @@ -1324,7 +1324,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Розмір$(): 35$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базаніт, Діорит", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Розмір$(): 35$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Діорит, Норит", "title": "Селітра та Електротин", "type": "patchouli:text", "anchor": "moon_saltpeter" @@ -1416,7 +1416,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 300$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Трубна вена$(br)$(thing)Y$(): -32 — 50$(br)$(thing)Висота$(): 60$(br)$(thing)Радіус$(): 10$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базаніт", + "text": "$(thing)Рідкість$(): 300$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Трубна вена$(br)$(thing)Y$(): -32 — 50$(br)$(thing)Висота$(): 60$(br)$(thing)Радіус$(): 10$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Норит", "title": "Смарагд і Берилій", "type": "patchouli:text", "anchor": "moon_beryllium" @@ -1483,7 +1483,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 210$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 75$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базаніт", + "text": "$(thing)Рідкість$(): 210$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -32 — 75$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Норит", "title": "Срібло, Гален і Свинець", "type": "patchouli:text", "anchor": "moon_silver" @@ -1550,7 +1550,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 30$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базаніт, Габро, Діорит", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 30$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Габро, Діорит, Норит", "title": "Хроміт і Магнетит", "type": "patchouli:text", "anchor": "moon_magnetite" @@ -1657,7 +1657,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 0$(br)$(thing)Розмір$(): 20$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базаніт, Габро, Діорит", + "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 0$(br)$(thing)Розмір$(): 20$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Габро, Діорит, Норит", "title": "Шеєліт та Вольфрам", "type": "patchouli:text", "anchor": "moon_scheelite" @@ -1724,7 +1724,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 0$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базаніт", + "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -64 — 0$(br)$(thing)Розмір$(): 30$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Норит", "title": "Шелдоніт і Борніт", "type": "patchouli:text", "anchor": "moon_sheldonite" diff --git a/kubejs/assets/tfg/blockstates/loose/anorthosite.json b/kubejs/assets/tfg/blockstates/loose/anorthosite.json deleted file mode 100644 index 2e82d3ebb..000000000 --- a/kubejs/assets/tfg/blockstates/loose/anorthosite.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "variants": { - "count=1": [ - { - "model": "tfg:block/loose/anorthosite_1", - "y": 90 - }, - { - "model": "tfg:block/loose/anorthosite_1" - }, - { - "model": "tfg:block/loose/anorthosite_1", - "y": 180 - }, - { - "model": "tfg:block/loose/anorthosite_1", - "y": 270 - } - ], - "count=2": [ - { - "model": "tfg:block/loose/anorthosite_2", - "y": 90 - }, - { - "model": "tfg:block/loose/anorthosite_2" - }, - { - "model": "tfg:block/loose/anorthosite_2", - "y": 180 - }, - { - "model": "tfg:block/loose/anorthosite_2", - "y": 270 - } - ], - "count=3": [ - { - "model": "tfg:block/loose/anorthosite_3", - "y": 90 - }, - { - "model": "tfg:block/loose/anorthosite_3" - }, - { - "model": "tfg:block/loose/anorthosite_3", - "y": 180 - }, - { - "model": "tfg:block/loose/anorthosite_3", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/loose/mars_stone.json b/kubejs/assets/tfg/blockstates/loose/mars_stone.json new file mode 100644 index 000000000..bc2f65392 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/loose/mars_stone.json @@ -0,0 +1,55 @@ +{ + "variants": { + "count=1": [ + { + "model": "tfg:block/loose/mars_stone_1", + "y": 90 + }, + { + "model": "tfg:block/loose/mars_stone_1" + }, + { + "model": "tfg:block/loose/mars_stone_1", + "y": 180 + }, + { + "model": "tfg:block/loose/mars_stone_1", + "y": 270 + } + ], + "count=2": [ + { + "model": "tfg:block/loose/mars_stone_2", + "y": 90 + }, + { + "model": "tfg:block/loose/mars_stone_2" + }, + { + "model": "tfg:block/loose/mars_stone_2", + "y": 180 + }, + { + "model": "tfg:block/loose/mars_stone_2", + "y": 270 + } + ], + "count=3": [ + { + "model": "tfg:block/loose/mars_stone_3", + "y": 90 + }, + { + "model": "tfg:block/loose/mars_stone_3" + }, + { + "model": "tfg:block/loose/mars_stone_3", + "y": 180 + }, + { + "model": "tfg:block/loose/mars_stone_3", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/loose/moon_deepslate.json b/kubejs/assets/tfg/blockstates/loose/moon_deepslate.json new file mode 100644 index 000000000..fd7011681 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/loose/moon_deepslate.json @@ -0,0 +1,55 @@ +{ + "variants": { + "count=1": [ + { + "model": "tfg:block/loose/moon_deepslate_1", + "y": 90 + }, + { + "model": "tfg:block/loose/moon_deepslate_1" + }, + { + "model": "tfg:block/loose/moon_deepslate_1", + "y": 180 + }, + { + "model": "tfg:block/loose/moon_deepslate_1", + "y": 270 + } + ], + "count=2": [ + { + "model": "tfg:block/loose/moon_deepslate_2", + "y": 90 + }, + { + "model": "tfg:block/loose/moon_deepslate_2" + }, + { + "model": "tfg:block/loose/moon_deepslate_2", + "y": 180 + }, + { + "model": "tfg:block/loose/moon_deepslate_2", + "y": 270 + } + ], + "count=3": [ + { + "model": "tfg:block/loose/moon_deepslate_3", + "y": 90 + }, + { + "model": "tfg:block/loose/moon_deepslate_3" + }, + { + "model": "tfg:block/loose/moon_deepslate_3", + "y": 180 + }, + { + "model": "tfg:block/loose/moon_deepslate_3", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/loose/moon_stone.json b/kubejs/assets/tfg/blockstates/loose/moon_stone.json new file mode 100644 index 000000000..7171ce448 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/loose/moon_stone.json @@ -0,0 +1,55 @@ +{ + "variants": { + "count=1": [ + { + "model": "tfg:block/loose/moon_stone_1", + "y": 90 + }, + { + "model": "tfg:block/loose/moon_stone_1" + }, + { + "model": "tfg:block/loose/moon_stone_1", + "y": 180 + }, + { + "model": "tfg:block/loose/moon_stone_1", + "y": 270 + } + ], + "count=2": [ + { + "model": "tfg:block/loose/moon_stone_2", + "y": 90 + }, + { + "model": "tfg:block/loose/moon_stone_2" + }, + { + "model": "tfg:block/loose/moon_stone_2", + "y": 180 + }, + { + "model": "tfg:block/loose/moon_stone_2", + "y": 270 + } + ], + "count=3": [ + { + "model": "tfg:block/loose/moon_stone_3", + "y": 90 + }, + { + "model": "tfg:block/loose/moon_stone_3" + }, + { + "model": "tfg:block/loose/moon_stone_3", + "y": 180 + }, + { + "model": "tfg:block/loose/moon_stone_3", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/loose/syenite.json b/kubejs/assets/tfg/blockstates/loose/syenite.json deleted file mode 100644 index f669c176a..000000000 --- a/kubejs/assets/tfg/blockstates/loose/syenite.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "variants": { - "count=1": [ - { - "model": "tfg:block/loose/syenite_1", - "y": 90 - }, - { - "model": "tfg:block/loose/syenite_1" - }, - { - "model": "tfg:block/loose/syenite_1", - "y": 180 - }, - { - "model": "tfg:block/loose/syenite_1", - "y": 270 - } - ], - "count=2": [ - { - "model": "tfg:block/loose/syenite_2", - "y": 90 - }, - { - "model": "tfg:block/loose/syenite_2" - }, - { - "model": "tfg:block/loose/syenite_2", - "y": 180 - }, - { - "model": "tfg:block/loose/syenite_2", - "y": 270 - } - ], - "count=3": [ - { - "model": "tfg:block/loose/syenite_3", - "y": 90 - }, - { - "model": "tfg:block/loose/syenite_3" - }, - { - "model": "tfg:block/loose/syenite_3", - "y": 180 - }, - { - "model": "tfg:block/loose/syenite_3", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_anorthosite.json b/kubejs/assets/tfg/blockstates/rock/hardened_anorthosite.json deleted file mode 100644 index bb672340d..000000000 --- a/kubejs/assets/tfg/blockstates/rock/hardened_anorthosite.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tfg:block/rock/hardened_anorthosite" - } - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_mars_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_mars_stone.json new file mode 100644 index 000000000..195ba8628 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/hardened_mars_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/hardened_mars_stone" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/hardened_moon_deepslate.json new file mode 100644 index 000000000..7a7e2cfb0 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/hardened_moon_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/hardened_moon_deepslate" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_moon_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_moon_stone.json new file mode 100644 index 000000000..b553dca3e --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/hardened_moon_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/hardened_moon_stone" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_syenite.json b/kubejs/assets/tfg/blockstates/rock/hardened_syenite.json deleted file mode 100644 index 9d6728ed9..000000000 --- a/kubejs/assets/tfg/blockstates/rock/hardened_syenite.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tfg:block/rock/hardened_syenite" - } - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/raw_anorthosite.json b/kubejs/assets/tfg/blockstates/rock/raw_anorthosite.json deleted file mode 100644 index 7638b9b12..000000000 --- a/kubejs/assets/tfg/blockstates/rock/raw_anorthosite.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tfg:block/rock/raw_anorthosite" - } - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/raw_basanite.json b/kubejs/assets/tfg/blockstates/rock/raw_basanite.json deleted file mode 100644 index 6a6652475..000000000 --- a/kubejs/assets/tfg/blockstates/rock/raw_basanite.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tfg:block/rock/raw_basanite" - } - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/raw_syenite.json b/kubejs/assets/tfg/blockstates/rock/raw_syenite.json deleted file mode 100644 index 0282f16bf..000000000 --- a/kubejs/assets/tfg/blockstates/rock/raw_syenite.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tfg:block/rock/raw_syenite" - } - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 8574bf2a6..459d986b3 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -130,13 +130,12 @@ "block.tfg.spike.dripstone_spike": "Travertine Spike", "block.tfg.loose.deepslate": "Loose Migmatite Rock", "block.tfg.loose.dripstone": "Loose Travertine Rock", - "block.tfg.rock.hardened_anorthosite": "Hardened Anorthosite", - "block.tfg.rock.raw_anorthosite": "Raw Anorthosite", - "block.tfg.loose.anorthosite": "Loose Anorthosite Rock", - "block.tfg.rock.raw_basanite": "Raw Basanite", - "block.tfg.rock.raw_syenite": "Raw Syenite", - "block.tfg.rock.hardened_syenite": "Hardened Syenite", - "block.tfg.loose.syenite": "Loose Syenite Rock", + "block.tfg.rock.hardened_moon_stone": "Hardened Anorthosite", + "block.tfg.loose.moon_stone": "Loose Anorthosite Rock", + "block.tfg.rock.hardened_moon_deepslate": "Hardened Norite", + "block.tfg.loose.moon_deepslate": "Loose Norite Rock", + "block.tfg.rock.hardened_mars_stone": "Hardened Argillite", + "block.tfg.loose.mars_stone": "Loose Argillite Rock", "item.tfg.antipoison_pill": "Antipoison Pill", "item.tfg.haste_pill": "Haste Pill", "item.tfg.night_vision_pill": "Night Vision Pill", @@ -184,12 +183,14 @@ "item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)", "item.tfg.unfired_chalk": "Unfired Chalk Stick", "item.tfg.brick.deepslate": "Migmatite Brick", - "item.tfg.loose.anorthosite": "Loose Anorthosite", - "item.tfg.brick.anorthosite": "Anorthosite Brick", - "item.tfg.dust.anorthosite": "Anorthosite Dust", - "item.tfg.loose.syenite": "Loose Syenite", - "item.tfg.brick.syenite": "Syenite Brick", - "item.tfg.dust.syenite": "Syenite Dust", + "item.tfg.loose.moon_stone": "Loose Anorthosite", + "item.tfg.brick.moon_stone": "Anorthosite Brick", + "item.tfg.dust.moon_stone": "Anorthosite Dust", + "item.tfg.loose.moon_deepslate": "Loose Norite", + "item.tfg.dust.moon_deepslate": "Norite Dust", + "item.tfg.loose.mars_stone": "Loose Argillite", + "item.tfg.brick.mars_stone": "Argillite Brick", + "item.tfg.dust.mars_stone": "Argillite Dust", "item.tfg.terra_firma_greg": "TerraFirmaGreg", "item.tfg.scaffolding_frame": "Scaffolding Frame", "item.tfg.airship_hull": "Airship Hull", diff --git a/kubejs/assets/tfg/models/block/loose/mars_stone_1.json b/kubejs/assets/tfg/models/block/loose/mars_stone_1.json new file mode 100644 index 000000000..0af44bf56 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/mars_stone_1.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_sedimentary_1", + "textures": { + "texture": "ad_astra:block/mars_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/mars_stone_2.json b/kubejs/assets/tfg/models/block/loose/mars_stone_2.json new file mode 100644 index 000000000..5082a0a94 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/mars_stone_2.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_sedimentary_2", + "textures": { + "texture": "ad_astra:block/mars_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/mars_stone_3.json b/kubejs/assets/tfg/models/block/loose/mars_stone_3.json new file mode 100644 index 000000000..0889aec61 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/mars_stone_3.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_sedimentary_3", + "textures": { + "texture": "ad_astra:block/mars_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/syenite_1.json b/kubejs/assets/tfg/models/block/loose/moon_deepslate_1.json similarity index 62% rename from kubejs/assets/tfg/models/block/loose/syenite_1.json rename to kubejs/assets/tfg/models/block/loose/moon_deepslate_1.json index c44fa06da..e80679a6c 100644 --- a/kubejs/assets/tfg/models/block/loose/syenite_1.json +++ b/kubejs/assets/tfg/models/block/loose/moon_deepslate_1.json @@ -1,6 +1,6 @@ { "parent": "tfc:block/rock/loose_igneous_intrusive_1", "textures": { - "texture": "ad_astra:block/mars_stone" + "texture": "ad_astra:block/moon_deepslate" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/syenite_2.json b/kubejs/assets/tfg/models/block/loose/moon_deepslate_2.json similarity index 62% rename from kubejs/assets/tfg/models/block/loose/syenite_2.json rename to kubejs/assets/tfg/models/block/loose/moon_deepslate_2.json index b2df88e75..367ddde23 100644 --- a/kubejs/assets/tfg/models/block/loose/syenite_2.json +++ b/kubejs/assets/tfg/models/block/loose/moon_deepslate_2.json @@ -1,6 +1,6 @@ { "parent": "tfc:block/rock/loose_igneous_intrusive_2", "textures": { - "texture": "ad_astra:block/mars_stone" + "texture": "ad_astra:block/moon_deepslate" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/syenite_3.json b/kubejs/assets/tfg/models/block/loose/moon_deepslate_3.json similarity index 62% rename from kubejs/assets/tfg/models/block/loose/syenite_3.json rename to kubejs/assets/tfg/models/block/loose/moon_deepslate_3.json index 4583503f2..db5e10109 100644 --- a/kubejs/assets/tfg/models/block/loose/syenite_3.json +++ b/kubejs/assets/tfg/models/block/loose/moon_deepslate_3.json @@ -1,6 +1,6 @@ { "parent": "tfc:block/rock/loose_igneous_intrusive_3", "textures": { - "texture": "ad_astra:block/mars_stone" + "texture": "ad_astra:block/moon_deepslate" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/anorthosite_1.json b/kubejs/assets/tfg/models/block/loose/moon_stone_1.json similarity index 100% rename from kubejs/assets/tfg/models/block/loose/anorthosite_1.json rename to kubejs/assets/tfg/models/block/loose/moon_stone_1.json diff --git a/kubejs/assets/tfg/models/block/loose/anorthosite_2.json b/kubejs/assets/tfg/models/block/loose/moon_stone_2.json similarity index 100% rename from kubejs/assets/tfg/models/block/loose/anorthosite_2.json rename to kubejs/assets/tfg/models/block/loose/moon_stone_2.json diff --git a/kubejs/assets/tfg/models/block/loose/anorthosite_3.json b/kubejs/assets/tfg/models/block/loose/moon_stone_3.json similarity index 100% rename from kubejs/assets/tfg/models/block/loose/anorthosite_3.json rename to kubejs/assets/tfg/models/block/loose/moon_stone_3.json diff --git a/kubejs/assets/tfg/models/block/rock/hardened_syenite.json b/kubejs/assets/tfg/models/block/rock/hardened_mars_stone.json similarity index 100% rename from kubejs/assets/tfg/models/block/rock/hardened_syenite.json rename to kubejs/assets/tfg/models/block/rock/hardened_mars_stone.json diff --git a/kubejs/assets/tfg/models/block/rock/hardened_anorthosite.json b/kubejs/assets/tfg/models/block/rock/hardened_moon_deepslate.json similarity index 100% rename from kubejs/assets/tfg/models/block/rock/hardened_anorthosite.json rename to kubejs/assets/tfg/models/block/rock/hardened_moon_deepslate.json diff --git a/kubejs/assets/tfg/models/block/rock/raw_anorthosite.json b/kubejs/assets/tfg/models/block/rock/hardened_moon_stone.json similarity index 100% rename from kubejs/assets/tfg/models/block/rock/raw_anorthosite.json rename to kubejs/assets/tfg/models/block/rock/hardened_moon_stone.json diff --git a/kubejs/assets/tfg/models/block/rock/raw_basanite.json b/kubejs/assets/tfg/models/block/rock/raw_basanite.json deleted file mode 100644 index d758f032e..000000000 --- a/kubejs/assets/tfg/models/block/rock/raw_basanite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "ad_astra:block/moon_deepslate" - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/raw_syenite.json b/kubejs/assets/tfg/models/block/rock/raw_syenite.json deleted file mode 100644 index 275c2a6ab..000000000 --- a/kubejs/assets/tfg/models/block/rock/raw_syenite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "ad_astra:block/mars_stone" - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/brick/anorthosite.png b/kubejs/assets/tfg/textures/item/brick/moon_stone.png similarity index 100% rename from kubejs/assets/tfg/textures/item/brick/anorthosite.png rename to kubejs/assets/tfg/textures/item/brick/moon_stone.png diff --git a/kubejs/assets/tfg/textures/item/dust/anorthosite.png b/kubejs/assets/tfg/textures/item/dust/moon_stone.png similarity index 100% rename from kubejs/assets/tfg/textures/item/dust/anorthosite.png rename to kubejs/assets/tfg/textures/item/dust/moon_stone.png diff --git a/kubejs/assets/tfg/textures/item/loose/anorthosite.png b/kubejs/assets/tfg/textures/item/loose/moon_stone.png similarity index 100% rename from kubejs/assets/tfg/textures/item/loose/anorthosite.png rename to kubejs/assets/tfg/textures/item/loose/moon_stone.png diff --git a/kubejs/data/ad_astra/loot_tables/blocks/moon_deepslate.json b/kubejs/data/ad_astra/loot_tables/blocks/moon_deepslate.json new file mode 100644 index 000000000..5e092fc48 --- /dev/null +++ b/kubejs/data/ad_astra/loot_tables/blocks/moon_deepslate.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "ad_astra:moon_deepslate", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/moon_deepslate", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/raw_anorthosite.json b/kubejs/data/ad_astra/loot_tables/blocks/moon_stone.json similarity index 89% rename from kubejs/data/tfg/loot_tables/blocks/rock/raw_anorthosite.json rename to kubejs/data/ad_astra/loot_tables/blocks/moon_stone.json index 40de6701f..d8a2a84e9 100644 --- a/kubejs/data/tfg/loot_tables/blocks/rock/raw_anorthosite.json +++ b/kubejs/data/ad_astra/loot_tables/blocks/moon_stone.json @@ -10,7 +10,7 @@ "children": [ { "type": "minecraft:item", - "name": "tfg:rock/raw_anorthosite", + "name": "ad_astra:moon_stone", "conditions": [ { "condition": "tfc:is_isolated" @@ -19,7 +19,7 @@ }, { "type": "minecraft:item", - "name": "tfg:loose/anorthosite", + "name": "tfg:loose/moon_stone", "functions": [ { "function": "minecraft:set_count", diff --git a/kubejs/data/tfg/structures/moon/meteors/meteor5.nbt b/kubejs/data/tfg/structures/moon/meteors/meteor5.nbt index 20310995885d21f604f82878897cde5c71d77dbb..d265a37220fdccaff139bd1a80ea7ca1b338c827 100644 GIT binary patch delta 5825 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 InDx*69~PJga{vGU delta 5843 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 literal 706 zcmV;z0zLg7iwFQ7#+qjU|HW0oj+-zL9c+>XcK6astt$1@?YYMuxNcRcmujU-y&?w; zSZi!#J59HL(7)~w!fwbq1hrBcDIvBW^WMA}h6Esn(28H20zmf-hieSWmDKsYO>lKX zVPPF}9RK4TwAFUFA%Olv;5dftFu@GWC{FO4iyX!wV+=fM+QU#kW)vs%W5^6Hx{p~r z*ZfQm@nfd)3VeE&e$12};?uMAV@7c<#u)0;d;~M)A@y;2d?qJ695APPgUqNYIiV-; z>52T9DXw4!7x8h$e#|KM#E+TMLuTlqK0QY;Q?;No^iZFkOaJ@{5}<130=QVW1tJTY zKrGY`uADXx6vA&fBIGNc!7Eo*Y0V6V<3+}lHm(+3G65t) zIi@PHlDu0PE>x*a&I_c8KWkI*Th`j0xOXF}evw&}%UxzMO;&Ntzmj?*R5h;9mH!Ff zx#qVj9IWa+?loMwGEWt^E?eoJb12BaQp9l4GRd9eUCFLbnL3=mWw>jdVQH(Sur-1j ztyO1~dO}@4)td?Pxc#OSreRW)JhdFjiwpy`h1Mp48>y=bOSUMP zv|ZI}CQE#OYUgwlp?tmJX8#=TSJ*ygjf-W;@~&Lr1~Z1UDi~HrBz$B=A)L^P$yTzQ zH&{KJ4z_;q*qT|%R&(?Xj0>yRu0Aj2wo}eZdEo2KRA=HZHlqEDB99Y{(A%2fe2O|I zQPt-Yuub&$`bgoUDaRFLaDo z?;@CKLk+|4_(ar5-8~S%?k|MvHQ`fH`t&e0)V7 z8Zx2@T+GC+2|Vl!m}hRy7<1raKDkMwYvI-m^0Rbn#$t~=c!)>r z#KjZ4HDf(SJeY|GGeCC^r!`|e)@i2BML5CSX{OG_6mzE;FrT_LW6XgEbKt=ox|q-0 zngR12w`Pnd^x%nHJlALjJa^riu^dJo%#jB(@n9w{=4&)l=WB|YxR~#`cU%}lRIg0{ z^G%bXGK*qZ^7=cgjZ~KrkgvFrQTJ*IvrmRq?G6s???M`DU;!b|;7P@6mMWT?RUt*j z>LjH~NwhmVmz&z4%NR&XE4ct-E*l09b44qb?H2p0{fPIpDEW-{;IYYzRY?_^V_8CL zsZ7ajFagB8HncAIS}=R17_W1wQkJ2c+MRa>E`q^+(7fYBoR4`+h?TQCo z-JaRHDNOd8zIc_Cwas?30_`=Klq!b!i;@jfhBLi@(=BE~30V}_BD0(dZM&?bBFA@2X^gBE7>nF8_4j>z zzV5G1a+=!yAX|(ddW82h%edjPrlJuvWfdk;ue#V?H&Sq24r9ZzaHV|+=hmck8e6AH zdjb|%*OKB1T383XD31@L<;IkWMH+*7`wuXJu6Y85w~G1+;P3^Gd3Cci9!#BKE05*#wgD!m%Pj+tse$6L#}C|N zQU$IpV$=rxK5Fn5Es#hj`r=Zw*7x`N^?z9Q;mTXW0=t-7>%s1Y@ALyT^czze8y(+@ Of5C4S>oj%A5C8zY@tLCl literal 823 zcmV-71IYXziwFP!00000|HYO|kJB&^$DP>SHreGZfjIIwa|G1uA|x&d35jduCQf3l zV@I~jvU~%+HRH4ir0Y#AR$D4nZQ_4se)F&=DMAS%hW}(3A>_V`{x?A<8=>+Glfuzz2O_ll#OP*Cyw^kl8a$!FK3~ywJMp0=9&6CRJ+B!tW4|WE7Y@*n z2~FfYjsti|Keoy$M*+-H0CVhPKJ#lv z%=i47DV{ih2m5$#(2RKQ`!!QJ!~x7WfSCj^6Cd*pnz{Wo$4q?85BxJOP7#(H8=>X4 zEkIe|6eV1KXVNNtg%SA*6B%@`6SVkbS<}tn$lVvpIs+>d^8!6)s8rh4 z+yxV%luJux#W#YvE6unpmCjiKZjz5mSL~d&W)JsrBU>_S!-zouc%M zRxQ((GqXacmyiQ3R8>K9EJ`Yj>#v%M65cA6wW?V`6zY=czt`b;Ib5BTG zAiSqV!7W#kidN8^HIPEH?qhq?D#1-XjtvUJwFx0yI+M<6>YQd>4p&gon!?^$IS0I| zj}K$i*4CLrnu2-z4={pmLQwizEIN|oy6lQ@^ptmAGe)OVek2%&k#(v6&-Fjpi!X*F zCD8b82n{EI#~1RPSGP;!!KpKD<*9t$HNfoYa>oEZ__{!hR0ux(5E2qsYh#a{ zRoA=L?uJnQ0sp$QNo?wLu`Q4qDRFGSp7)s#jWd8H#D@RE2mstS?v6`1TMJd(n2gS@ zB1nv77U@4d5w*&64+L=d1Td`$M>L^N6AU%b$C}m*ctXEsj#o6I34A<}UlYuTGvJB+ zngLJpu!d9h31@hPKChEFkbap>sK^`C-U)R{{0hV5XrR-V6kmWQkGE$OD=z) zv`XJb5Pzd>NxG{gB%dud`~4WW>q1!9>+)$dVM#{eyYR6?g?9jP?Qyi=2FIC)? z>aZ^k3>UU4RuYZP*XpNx87x{R&{}l$yy!B1=`z-Y`L0j9QA#>WiO{Jo{}h{X-CurD zaosS%D_j|*;AL(#YfGhc2H97wTGW=KN#T4)$!VeLn(CEQOc+=44HFf;1eLX_NeNHw zP~X2#&&&SotYU>LR=lH>phx(?%92~IBonP*1vXS0vtradLo9DwCAirPlA>SA!OS6C zxRA~?bEf%z98zl4hS4~s&VbjOdob_+0YC|Lf<; z#Px1S!TY{ulr8F9V0Dk+)i}Y!^bRYhxANdTT6)Rk+|F26C;l`Of_6-7^_GmEwsect zgk*Aab1U}IkN5g5cbfHZKP@4pG2$+IaCm2(e`J<@M{Q`*04{&S9q&kc%}fgb06ha` A%m4rY literal 707 zcmV;!0zCa6iwFP!00000|Gkw>kJB&^h9_U!B)eQd0&xWP%n_kp7a?&$NJv~GH<_f? zI(B5cl;t1ruNk*Z*mO-2fwYy{)bX2npBaxPIY0)n;Xg3~0QZgiYX%n^p~_p6)9N~c z#8_sL{?ijtr%eAq0LM=N^O|r%6Z$m4SOY_>dCiC?^lO%QMH8C9#}oNA!Gbs=p4hJ$ z@gxsxI9H!=fmi7BI*Sweye|BjV1Z`pETRQGF!a#8X6h_@&0KGU3wmRYC-CvC{F*7A zU;$6)<4OIR5l`mVO!0&Zcp@LqUo=za6)oV2d_1{-{scKha$^Hn?YfGTRg^=<<#&`; z>AMKxuQV-5cb!4<$zpq$kAb@{lyw182zdoBS}w8FthVb$i3(*=GOZQGO>Wdq(iL)u zOV+9sVtdyiJgqfru{sXj_2H7AXi4&!_Tag#oAs7y3Wrs}q|$cFT`~dWTv{d@z7gnF z8o8{MF0mq;?4!~R-muP`;9ifcj*G$&F51FSnyf*}zY%KBWivjZOaG)eRn1?jxG&YQ z!bgTHTbFBz#ugj(!@Uev9TR9Rx_VyCW!&#S`BP@b^>F)T&2`HJuW@aV!d8XVtgDpL zIpklo>QGybCWXsArKN>x8md%MGhtk@w@lRZ`cu}bHYG5%M}2>vo|nVwqGqKlQ@p2S zU_f}!s)}2#Bom!rCAL%*vu2cpA(pqD65MPFtW`?7qD!P-%E2rlT)B|WG3lyYof3mEixjcGHYg=@gQZw5K*xer}j!wCQ7MtTA)qxQL2hwlSc31UJb0; zi%cUfHJQdXNky^$ipwn%)o_I_-Mj66YVJ{m-Kg6At7W(_WxftoLvh z!RajSJ*Wg04dK)nYJ>Nvi^dBZ4TbCZw$Dc`rLfB>D0HgJKdB^4^>05fnW_nAC0%NY z#f!`+(iBpv6w)tBHdGl#bqwcQY))}mRT!+OBwX8Ut_d&ko02p})-mGAEmep2@$;g; zIx9(TQx$HpCFl{}lcHdTNkMqSNlt5=jb0K=xki?&MslXtgQoB=_MqnwE^J9_np)Fr z_uRy|RBM9IU2F|lwLXA(_a88vtmdF}?MFL^(^_h|IkY^*s)t5xMi5TW^-<1Vcg2_Y zi_}s3y&J{iW6^qG|8~G*058V@?oPKooq8t+&FQ+Ed~#=;Y)Ae$F^;?JKB!L`yhSQR z(wV-w<-6+pd;NiU-1TsWP9VkU`g0Bd0AL|| ASpWb4 literal 756 zcmVY9}ng={)EO~5GVKt&B)6eYhYlS*NnV;w`Pe~Fro2WJb_y? z;tAcFkymuT&U3lwQ2oeCq>Z2;j{+$m7^Hi77qq0N48@a%OijSUck z&q{dFFhL7NDwEZcmsI2hQA%Rm=vr=tL8KJIf;2LQ(A>5Zo>q!9v^;D$+5V7rv?%$E zWANNmb+#c2!_hJ)LMpRiHW?36CJYfZTXSm96lJ24s-Pv>Bp;=!={0F}2lskpbvVg2 z;!=}qOq0|U^RKzwF;S0a=+eE~c2#qiD(p*jsPKW|!c;{js5bdp{+P1p7g_J|EP~Tn zJh)H^tXjgUG1NBRleyOD$1nf%BVlT|{IX)IA)Hk-(-gy&xlyDorBo@TUzBXAGK}gN z&UcuW;rJ{;(ZM$+qc!lps(iqvq2qt$_-5tmK#c+03k;3* { event.add('tfc:breaks_when_isolated', rock) event.add('tfc:rock/raw', rock) event.add('minecraft:mineable/pickaxe', rock) + event.add('tfc:can_carve', rock) // Collapse tags also require a collapse recipe to work. // Don't add the recipe if you don't want them to actually collapse! event.add('tfc:can_collapse', rock) @@ -65,12 +66,13 @@ const registerAdAstraBlockTags = (event) => { event.add('tfc:bloomery_insulation', rock) event.add('firmalife:oven_insulation', rock) event.add('tfc:forge_insulation', rock) + event.add('tfc:can_carve', rock) }) // Moon - event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/raw_anorthosite') - event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/hardened_anorthosite') - event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/raw_basanite') + event.add('minecraft:rabbits_spawnable_on', 'ad_astra:moon_stone') + event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/hardened_moon_stone') + event.add('minecraft:rabbits_spawnable_on', 'ad_astra:moon_deepslate') event.add('minecraft:rabbits_spawnable_on', 'ad_astra:moon_sand') event.add('minecraft:rabbits_spawnable_on', 'tfc:sand/black') event.add('minecraft:rabbits_spawnable_on', 'tfc:sand/white') @@ -81,9 +83,8 @@ const registerAdAstraBlockTags = (event) => { event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/gabbro') event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/basalt') - event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/raw_basanite') - event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/raw_anorthosite') - event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_anorthosite') + event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_moon_stone') + event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_moon_deepslate') event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/raw/basalt') event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/hardened/basalt') event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/raw/gabbro') diff --git a/kubejs/server_scripts/tfc/recipes.stone.js b/kubejs/server_scripts/tfc/recipes.stone.js index dfb0293c7..e5d29b0ff 100644 --- a/kubejs/server_scripts/tfc/recipes.stone.js +++ b/kubejs/server_scripts/tfc/recipes.stone.js @@ -757,10 +757,10 @@ function registerTFCStoneRecipes(event) { // Space - event.recipes.gtceu.centrifuge('anorthosite_dust_separation') + event.recipes.gtceu.centrifuge('moon_stone_dust_separation') .EUt(GTValues.VA[GTValues.MV]) .duration(480) - .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('anorthosite'), 1)) + .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('moon_stone'), 1)) .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 3700, 700) .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnetite, 1), 3700, 700) .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Ilmenite, 1), 1700, 700) diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index ed52c7a3f..c19ce1a9a 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -20,15 +20,16 @@ function registerTFGCollapseRecipes(event) { // #endregion Nether // #region Space - event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:rock/raw_anorthosite') - event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:rock/hardened_anorthosite') - event.recipes.tfc.collapse('tfg:raw_basanite', 'tfg:rock/raw_basanite') + event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'ad_astra:moon_stone') + event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:rock/hardened_moon_stone') + event.recipes.tfc.collapse('ad_astra:moon_deepslate', 'ad_astra:moon_deepslate') + event.recipes.tfc.collapse('ad_astra:moon_deepslate', 'tfg:rock/hardened_moon_deepslate') event.recipes.tfc.landslide('ad_astra:moon_cobblestone', 'ad_astra:moon_cobblestone') event.recipes.tfc.landslide('ad_astra:moon_sand', 'ad_astra:moon_sand') - event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:rock/raw_syenite') - event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:rock/hardened_syenite') + event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'ad_astra:mars_stone') + event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:rock/hardened_mars_stone') event.recipes.tfc.landslide('ad_astra:mars_cobblestone', 'ad_astra:mars_cobblestone') event.recipes.tfc.landslide('ad_astra:mars_sand', 'ad_astra:mars_sand') diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index ee37661b4..81fd5c3d1 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -11,8 +11,8 @@ function registerTFGRockRecipes(event) { { loose: 'beneath:blackstone_pebble', block: 'minecraft:blackstone' }, { loose: 'tfg:brick/deepslate', block: '4x minecraft:deepslate_bricks' }, { loose: 'tfg:loose/dripstone', block: 'minecraft:dripstone_block' }, - { loose: 'tfg:loose/anorthosite', block: 'ad_astra:moon_cobblestone' }, - { loose: 'tfg:loose/syenite', block: 'ad_astra:mars_cobblestone' } + { loose: 'tfg:loose/moon_stone', block: 'ad_astra:moon_cobblestone' }, + { loose: 'tfg:loose/mars_stone', block: 'ad_astra:mars_cobblestone' } ] GLUEING_TOGETHER.forEach(x => { @@ -38,8 +38,8 @@ function registerTFGRockRecipes(event) { const LOOSE_TO_BRICKS = [ { loose: 'tfg:loose/deepslate', brick: 'tfg:brick/deepslate' }, - { loose: 'tfg:loose/anorthosite', brick: 'tfg:brick/anorthosite' }, - { loose: 'tfg:loose/syenite', brick: 'tfg:brick/syenite' } + { loose: 'tfg:loose/moon_stone', brick: 'tfg:brick/moon_stone' }, + { loose: 'tfg:loose/mars_stone', brick: 'tfg:brick/mars_stone' } ] LOOSE_TO_BRICKS.forEach(x => { @@ -114,9 +114,12 @@ function registerTFGRockRecipes(event) { { raw: 'minecraft:blackstone', hammered: 'tfc:sand/black' }, { raw: 'beneath:crackrack', hammered: 'tfc:sand/pink' }, { raw: 'minecraft:dripstone_block', hammered: 'tfc:sand/brown' }, - { raw: 'tfg:rock/raw_anorthosite', hammered: 'ad_astra:moon_cobblestone' }, - { raw: 'tfg:rock/hardened_anorthosite', hammered: 'ad_astra:moon_cobblestone' }, - { raw: 'ad_astra:moon_cobblestone', hammered: 'tfc:sand/white' } + + { raw: 'ad_astra:moon_stone', hammered: 'ad_astra:moon_cobblestone' }, + { raw: 'tfg:rock/hardened_moon_stone', hammered: 'ad_astra:moon_cobblestone' }, + { raw: 'ad_astra:moon_cobblestone', hammered: 'ad_astra:moon_sand' }, + { raw: 'ad_astra:moon_deepslate', hammered: 'ad_astra:moon_sand' }, + { raw: 'tfg:rock/hardened_moon_deepslate', hammered: 'ad_astra:moon_sand' } ] HAMMERING.forEach(x => { @@ -262,23 +265,23 @@ function registerTFGRockRecipes(event) { .EUt(7) }) - event.recipes.gtceu.rock_breaker('tfg:anorthosite') - .notConsumable('tfg:rock/raw_anorthosite') - .itemOutputs('tfg:rock/raw_anorthosite') + event.recipes.gtceu.rock_breaker('tfg:moon_stone') + .notConsumable('ad_astra:moon_stone') + .itemOutputs('ad_astra:moon_stone') .duration(16) .EUt(7) .dimension('ad_astra:moon') - event.recipes.gtceu.rock_breaker('tfg:basanite') - .notConsumable('tfg:rock/raw_basanite') - .itemOutputs('tfg:rock/raw_basanite') + event.recipes.gtceu.rock_breaker('tfg:moon_deepslate') + .notConsumable('ad_astra:moon_deepslate') + .itemOutputs('ad_astra:moon_deepslate') .duration(16) .EUt(7) .dimension('ad_astra:moon') - event.recipes.gtceu.rock_breaker('tfg:syenite') - .notConsumable('tfg:rock/raw_syenite') - .itemOutputs('tfg:rock/raw_syenite') + event.recipes.gtceu.rock_breaker('tfg:mars_stone') + .notConsumable('ad_astra:mars_stone') + .itemOutputs('ad_astra:mars_stone') .duration(16) .EUt(7) .dimension('ad_astra:mars') diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index 736f42ea5..6e07a7ef6 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -41,9 +41,6 @@ global.AD_ASTRA_DISABLED_ITEMS = 'ad_astra:oil_bucket', 'ad_astra:fuel_bucket', 'ad_astra:cryo_fuel_bucket', - 'ad_astra:moon_stone', - 'ad_astra:moon_deepslate', - 'ad_astra:mars_stone', 'ad_astra_giselle_addon:gravity_normalizer', 'ad_astra:steel_block', 'ad_astra:raw_desh_block', diff --git a/kubejs/startup_scripts/ad_astra/dimension_markers.js b/kubejs/startup_scripts/ad_astra/dimension_markers.js new file mode 100644 index 000000000..7d8b7d73c --- /dev/null +++ b/kubejs/startup_scripts/ad_astra/dimension_markers.js @@ -0,0 +1,29 @@ +// priority: 0 + +function registerAdAstraDimensionMarkers(event) { + + event.create('ad_astra:earth_orbit') + .iconSupplier(() => Item.of('ad_astra:earth_globe').getItem()) + .tier(1) + .overrideName('Earth Orbit') + + event.create('ad_astra:moon') + .iconSupplier(() => Item.of('ad_astra:moon_globe').getItem()) + .tier(1) + .overrideName('The Moon') + + event.create('ad_astra:mars') + .iconSupplier(() => Item.of('ad_astra:mars_globe').getItem()) + .tier(2) + .overrideName('Mars') + + event.create('ad_astra:venus') + .iconSupplier(() => Item.of('ad_astra:venus_globe').getItem()) + .tier(3) + .overrideName('Venus') + + event.create('ad_astra:mercury') + .iconSupplier(() => Item.of('ad_astra:mercury_globe').getItem()) + .tier(3) + .overrideName('Mercury') +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 0d5611ff2..29e2d5d64 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -190,7 +190,8 @@ global.ORE_BEARING_STONES = [ 'pyroxenite', 'dripstone', - 'anorthosite', - 'basanite' + 'moon_stone', + 'moon_deepslate', + 'mars_stone' ]; diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 98f728a81..ee2fd3d2e 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -80,12 +80,9 @@ GTCEuStartupEvents.materialModification(event => { }) -//GTCEuStartupEvents.registry('gtceu:dimension_marker', event => { -// event.create('ad_astra:earth_orbit') -// .iconSupplier(() => Item.of('ad_astra:earth_globe').getItem()) -// .tier(0) -// .overrideName('Earth Orbit') -//}) +GTCEuStartupEvents.registry('gtceu:dimension_marker', event => { + registerAdAstraDimensionMarkers(event) +}) Platform.mods.kaolinclayze.name = "Primitive Creatures"; diff --git a/kubejs/startup_scripts/tfc/tag_prefixes.js b/kubejs/startup_scripts/tfc/tag_prefixes.js index 23bab9be2..9df1a02be 100644 --- a/kubejs/startup_scripts/tfc/tag_prefixes.js +++ b/kubejs/startup_scripts/tfc/tag_prefixes.js @@ -61,22 +61,22 @@ const registerTFCTagPrefixes = (event) => { .generationCondition(ItemGenerationCondition.hasOreProperty) .materialSupplier(() => GTMaterials.Deepslate) - event.create('anorthosite', 'ore') - .stateSupplier(() => Block.getBlock('tfg:rock/raw_anorthosite').defaultBlockState()) + event.create('moon_stone', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_moon_stone').defaultBlockState()) .baseModelLocation('ad_astra:block/moon_stone') .unificationEnabled(true) .materialIconType(GTMaterialIconType.ore) .generationCondition(ItemGenerationCondition.hasOreProperty) - event.create('basanite', 'ore') - .stateSupplier(() => Block.getBlock('tfg:rock/raw_basanite').defaultBlockState()) + event.create('moon_deepslate', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_moon_deepslate').defaultBlockState()) .baseModelLocation('ad_astra:block/moon_deepslate') .unificationEnabled(true) .materialIconType(GTMaterialIconType.ore) .generationCondition(ItemGenerationCondition.hasOreProperty) - event.create('syenite', 'ore') - .stateSupplier(() => Block.getBlock('tfg:rock/raw_syenite').defaultBlockState()) + event.create('mars_stone', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_mars_stone').defaultBlockState()) .baseModelLocation('ad_astra:block/mars_stone') .unificationEnabled(true) .materialIconType(GTMaterialIconType.ore) diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 93d7c02ba..1d8b01238 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -9,21 +9,7 @@ function registerTFGSpaceBlocks(event) { event.createCustom(`tfg:lunar_warped_roots`, () => new $SproutsBlock($Properties.copy($Blocks.DEAD_TUBE_CORAL_BLOCK))) event.createCustom(`tfg:lunar_sprouts`, () => new $SproutsBlock( $Properties.copy($Blocks.DEAD_TUBE_CORAL_BLOCK))) - event.create('tfg:rock/raw_anorthosite') - .stoneSoundType() - .requiresTool(true) - .item(item => { - item.modelJson({ parent: 'ad_astra:item/moon_stone' }) - }) - .tagBlock('tfc:can_carve') - .tagBoth('forge:stone') - .tagBoth('tfc:rock/raw') - .tagBlock('minecraft:mineable/pickaxe') - .mapColor('terracotta_cyan') - .fullBlock(true) - .opaque(true) - - event.create('tfg:rock/hardened_anorthosite') + event.create('tfg:rock/hardened_moon_stone') .stoneSoundType() .requiresTool(true) .item(item => { @@ -37,7 +23,7 @@ function registerTFGSpaceBlocks(event) { .fullBlock(true) .opaque(true) - event.create('tfg:rock/raw_basanite') + event.create('tfg:rock/hardened_moon_deepslate') .stoneSoundType() .requiresTool(true) .item(item => { @@ -45,35 +31,25 @@ function registerTFGSpaceBlocks(event) { }) .tagBlock('tfc:can_carve') .tagBoth('forge:stone') - .tagBoth('tfc:rock/raw') + .tagBoth('tfc:rock/hardened') .tagBlock('minecraft:mineable/pickaxe') .mapColor('terracotta_cyan') .fullBlock(true) .opaque(true) - event.create('tfg:loose/anorthosite', 'tfc:loose_rock') - .itemTexture('tfg:item/loose_anorthosite') - .rockTypeModel('igneous_intrusive') + event.create('tfg:loose/moon_stone', 'tfc:loose_rock') + .itemTexture('tfg:item/loose/moon_stone') + .rockTypeModel('igneous_extrusive') + + event.create('tfg:loose/moon_deepslate', 'tfc:loose_rock') + .itemTexture('tfg:item/loose/moon_deepslate') + .rockTypeModel('igneous_extrusive') // #endregion // #region Mars blocks - event.create('tfg:rock/raw_syenite') - .stoneSoundType() - .requiresTool(true) - .item(item => { - item.modelJson({ parent: 'ad_astra:item/mars_stone' }) - }) - .tagBlock('tfc:can_carve') - .tagBoth('forge:stone') - .tagBoth('tfc:rock/raw') - .tagBlock('minecraft:mineable/pickaxe') - .mapColor('terracotta_orange') - .fullBlock(true) - .opaque(true) - - event.create('tfg:rock/hardened_syenite') + event.create('tfg:rock/hardened_mars_stone') .stoneSoundType() .requiresTool(true) .item(item => { @@ -87,8 +63,8 @@ function registerTFGSpaceBlocks(event) { .fullBlock(true) .opaque(true) - event.create('tfg:loose/syenite', 'tfc:loose_rock') - .itemTexture('tfg:item/loose_syenite') - .rockTypeModel('igneous_intrusive') + event.create('tfg:loose/mars_stone', 'tfc:loose_rock') + .itemTexture('tfg:item/loose/mars_stone') + .rockTypeModel('sedimentary') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 9faaaac77..8df128eb3 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -20,14 +20,16 @@ global.AIRCRAFT_UPGRADES = [ ] global.EXTRATERRESTRIAL_RAW_ROCKS = [ - 'tfg:rock/raw_anorthosite', - 'tfg:rock/raw_basanite', - 'tfg:rock/raw_syenite' + 'ad_astra:moon_stone', + 'ad_astra:moon_deepslate', + 'ad_astra:mars_stone', + 'ad_astra:venus_stone', + 'ad_astra:mercury_stone' ] global.EXTRATERRESTRIAL_HARDENED_ROCKS = [ - 'tfg:rock/hardened_anorthosite', - 'tfg:rock/hardened_syenite' + 'tfg:rock/hardened_moon_stone', + 'tfg:rock/hardened_mars_stone' ] global.MOON_BIOMES = [ diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 0b011bd52..eecaf8231 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -50,17 +50,17 @@ const registerTFGItems = (event) => { event.create('tfg:brick/deepslate') .translationKey('item.tfg.brick.deepslate') - event.create('tfg:brick/anorthosite') - .translationKey('item.tfg.brick.anorthosite') + event.create('tfg:brick/moon_stone') + .translationKey('item.tfg.brick.moon_stone') - event.create('tfg:brick/syenite') - .translationKey('item.tfg.brick.syenite') + event.create('tfg:brick/mars_stone') + .translationKey('item.tfg.brick.mars_stone') - event.create('tfg:dust/anorthosite') - .translationKey('item.tfg.dust.anorthosite') + event.create('tfg:dust/moon_stone') + .translationKey('item.tfg.dust.moon_stone') - event.create('tfg:dust/syenite') - .translationKey('item.tfg.dust.syenite') + event.create('tfg:dust/mars_stone') + .translationKey('item.tfg.dust.mars_stone') // #endregion // #region Primitive rubber gloves