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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 Aa{vGU delta 5843 zcmaFAfaUc977qDt4u+qt^V2tSTse^Y{oJ(s?DMYIZ&HoaJ$asglkUlB^X1bL8nn0y zL|bj;-pouYKW@5adc%U9lh!RcwszmGx((sGIT=qrV|n7u!^tTa66oq7C@^V4&cvLn z|JYC4zWP1MRO2 zC!S7VF7LlP`QXC{=Do@0lNY@6XH8lac;9|<<4-@9KNmO7p8Vja)#Qe&yv#oy8&CH8 zXctlcy61KKN_6ym@$tu-c~Vw3Uvlh|6R+A#4mifmX}O&9>wOu!vNw|xo+?kydn!6P@2N0Pv7h;?-{R-* z%&7V+G1=f*5L;F5v9%Bn@+YkdJY(6r>iQ15>f~4VR3|??;WN453NPEd-G-(5>XRK# z`b_@thL`h zzR3+ocv+uSC)!m`F1Vk}^7qQd-IEud^_u+Qk~quP%g5hMo_IED@`p?8ELYFVfWx2l zR7kjeHAL|pWW}G673)J3gCZ;5qHOZSBL=Ls5C6*Fo_z6=-sZq_i`i56>o2Q|_lZr0 zBHQ;qVB~*y#;;p#E7uua4PCbDR7m*DS6ac>*`O#kb=7L0(y1$J4Y%qq`*!q->3Il( zD2q+aiuZZjZJ8ebb?e#7=F9%cwoHz@W;40q8Y_FSXe?+P*3 z{es1s6m#9P8}M>`{;8WWeR9H)6y|u#vdJHhm_n0|JagSwU-4%e&jh-%VEhrZ#!O4?U(E<&zD*gfQ29M~(^!mQSF3Z*a_s zx#oY*O1J+Ei3L__vy ze5~B{j5B^oHLP6EIO7&y@wu{B*$wG=XVx0~{H@lT+;B~5a=|raj^eVY|MRL}-)&DL@6M>w<(>TCxY6YJr;;qa&-?FAp7_*Z zvj0dbg%@`tbCtRctks^3gz{N^_K!#6>ejpt=| zPZs=UHhIAhMfNwJ&6k~%h3n;p>OKG6l^IklEPSat+5V_0bL~f@*!G4hvOg-z`p*0P z{~MDZo>1aEW4U(q_3w2*;YoyPU&Z8yZ)2D*ZH%7u+-b7FNimM%sPB6X^yPO?ZoFeO zIpD7HWPvN}EQi<2pbN;M34}v(0Nc!053hrn(TsIqvwM@bPrmrjebRFwmRKiTk$AM<_7vdM;zwI>H0lV^Ll`}jTU;K>u-+p_%re(uKP zXYZ9Je||4qU-Q4``P`K#=x_4z$KShG+H24JwRzG?HG``x%Vr%25uUNDZpN;kU?Aua8~XuWwvxi-N@A{I8`jY0K&OY!2_Wdf~c%ljmQx znVkQTmAURu&*X(4wI^@*z&ZKAM^2X4!s%}&Kl~s)`R_;m$rFBYPu~BLgLS^mx9bxo zZ@j8CIsc^(0u+2EN!Ye+q)u!EGsI_%F|rGwwEJUw~il@Ml7X|~{<|KtttSXo|y(ikNE z#Mq0aLhon){xtc+R}y4=JO}7=7W*B4^`{9`P#%03&UQTHb(~$< z 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 literal 706 zcmb2|=3tOJHY=Us|IyHceX|V&WOF95mVLkEwN~rvmA5;O%k9VuT{%5#sn=d5cAkjr zoD^%{?e!P-zY{o=cfyKgYmk(t;x_ru_x4D(u_&}%=!&1i*u$0S}|u3<5Ls`$0AvPMnaM#f-yRr8q@ znwAUIKfLVxGedJ-0-N~9!lQL(G`=6{pLxkS?ZrYnTX%!ttqY951k9i3{r?ZA(1NU| zOgkdBvnp}Va?rWLziy5hzsR9{i>CtL?b?otAD{g;hI?1-%2;s)CMB+lyBtT04|`1y zixP`TwKR51zH@YKoOXMW5J&N~7aUICFBDY-N?rS~NPgPOZb=mvq`^2Y-ydc5CjAa^+QZ6CATf@kK@g{Z5+|QB^R6j)mHuNwEQ+# Wy8CX&&fR=Enn|(nVPTu}f;e%-LPrme7-jQ9q3pR9 zn_^FW;{9>0=d#*_b>Ae zxXMWxE#izhb7U>2%^RK>>3L@*iXSA|?TqSPY16JZZ)ddewD~8VWN?>0@gb+eh#$!_dW&bQn&+4frIvU9E$2k&GqJ9kv1c)6s({9UHWXBydy z9~_j~HRJr9S&W}$x2N@}e|gXuV{<)&&8GbBtc@~ma%U#88-Gkt(|eX}68t>7Yvzs_ z?{}8RNH~YA_htC(J9(i|cT&WsU)HO8L#7K(SifUp;P))f&HinnZ~6G%ymykyPGD3# z|G@KT_B5?ovqKeKkG)b^>gBn`+IsrzTMJH0cz9{=WJuDJX5%k*)t>fN?Dwj_9pATT z{OtMuVB^W|P*2fW$&pUkD}7Gp8ZaK&W41-_N0dSJQi=7&D}$yjoc+{&C0CiB^xpPr z!-B25Jxm@MP0rw%EXMO#zva%ST@qm*_f`L5-@RsMu;1Y}5G?LJ!#u{8Y1 zK0F~OqY8Dx^!I&UzF#B!?|J{?by`{#=fY+MW;4AtojFCT?ML?{-rzRly$zRj)0{XX zMQ$iGFmw$qzx znD?1J-om-$wXaTCv{q>Dqx!VE&l}V=oj8@+{-;PNKH1m(&)iX6df_MT$%n35_lO+} zI{m=jrZGD87rWAy-$!1g`R=*y!YF04@St7%#Zv2!3)SSZFC4I4FKL*(U+suE--QXB zzE6_X>U>2K(vR%5jcJA_gR#?JyE)f=zDBH{d0YG=PceupKC?INNX@J3K8Eg$X95|D-z3|8 z&UQQV{m(4Tc@_=qzbo=C^i;h2Z5nKOgz=0;!%P+fVfoLzvv&S9J?>L;hX0STo}b_} zY3YSex9K`WJ`hojsY}14Rog1~lS^2#WWDf~A1RTS&ptSDSNxO}v$n`*Cfn>CDLa=f zjScq_@kz718r69B=+0YS+g}cGEL|(U-wnPk-opcxKwqD5K=fy}tw>G2Nfr{V-?8 z+HMxzXssDr&y*frymQyr*XuRzn1)?0jVnIP(jm2U$?DdWn{LG#mlgJXU%px6`r)_F zRj>1k?n%i$yuz6A+bt)}xr@GZhv{CPX1v*H`Sc0Qx*?&C#X4SEJ+If#>JqxAHFfK% zNJo)ZlV0w>{;<+AX6_V|^0|(BibW<0dzQN%)D5516?S2c=>(_E?~LV)?=YF3vi1FVd2I&#Hd@iU-hUxqueCn%umA%C0L|!;1^@s6 diff --git a/kubejs/data/tfg/structures/moon/moon_rabbit_houses/moon_rabbit_house3.nbt b/kubejs/data/tfg/structures/moon/moon_rabbit_houses/moon_rabbit_house3.nbt index 5f4058ae635715673a61ed1c2b285fa903bbb9da..e26e6dd5f9d19a839ea19434b8fb81106e45f61a 100644 GIT binary patch literal 718 zcmb2|=3w~sO(KKg|K6#-`Ij98+K$KfKHeri!NDV@Vcx^GfOW1OF#0`>jzrra3C%5t@Y|Qlz znik0BtyjNbi`RWOf%?U{p1W47s?66l`~6p9$7`oZafQ|i(?9HaD8zkMYxkHhBGrm zZsqOpR%__-KAm#*I@8^mZhG2Fxphva{q%e(wLUVtuV6iUSo`EV0(!UZ1k76Fc51&^ z*6~!^Hy3u+2g|H}rXPA|>Z=XPglH$N>onZN77>i@5wpFHw4&*R|leQ8s4U&SPp_CL64aq#dL zKJDe(KRvLCsyg}P&bf$i^?xS9O=UhgU#IoV-&WFnwI!vfxLEt!#s2TVbjxRbEwI;B kTx$48ud1LTeQtfqv|9Jvj7to9^@nBOdsLtG;bvd}06ha`%m4rY literal 707 zcmb2|=3oGW|9hwU_Fpy-Xj6~Bt+G4DfvJ$?+Zn-yapH=FjvgK{%H}hdT(c@m**)c{ z{D<|D+kJ18_zE>{nR@HW$Jv$hCHvJZ9oRNLv^Qj8_}=?Fn@wDL;i>4!mtR>m9f?Sr z`0uiC;Bue;4h+Zr89vV{a1#Dyaxj9~c}?Zn4)rhD(<)qrXB{{${L}PclZEoU8|x)M zs_rW|V4C1I{)sNEKcxBDD*KVC$sewjoMUVRC zUGcjlTGZivZIwt;^>sy?wWiq{t@!SKeK=`;hUcf5-yZB-JNxUjOs@9OgG(-zosKnP zd=e9-CcRJaMVQpiHB=Oi0fa|*L_Gp@7AG!S!*0m?H9~CpK5Hk z(EI-qi_o+2t9IyL-FV2oO*?vecIPoM>92?P@`T9>XXx&#iaVQn=e_;U;Iw033x21b zEj`V$zA$&fp|IAgYgSLWWceh1%d3FsKDE}3%9mfk*H)RS z8fXW$QJl7YuF#zv&NZQ4 zyB2vbi9dBvM=@sSgmWh4%Z@J8(UiS3El_#sxd!vw)duhXF}iIyD>TLK?-PcPJEpn4 zmAm=r&4l}34qpFXJ}+I?e1{^d{5jL*If3F#ud7+sFXNP3RxV@KJeB?V#Y^64zsn9T zu=>1wo`6Yg((3Y*KWi52UK5z4dFJh03m5yhyr19Ny#APSN@1zlBfVcQb4!0VMtSr6bqXtOxV$T=ZNQ8 z%d(W+Q$F(lxGrPvn_)GXWm)N^YfCGu?>(2^^5;z&p2?i>+~PD z@`0Rs^u{NF2#t%I2&N7s%XY+sX$n)+j#`8O)jgJYR zdBB;zCj7;tpWSI%=gTYf?o_Xz@1ziRtoi6N&45T2O%#6W7 zC1bC(w9Rk3>Bq!64yLo(te&}Gr_$2Muu0+}DVBj=Nq1jF<+V625jiyHic#BzJ7yws z)4Q&0$>5*!^quP6%Zr{E-)mmJY|XUnMH^&vjg*!cWv9*lsE~R{AaJAT@^4;&YF;ag zq89jm3S89{H`(p|!#LhGx4M0l^-O0TGxK!a_`mD4uJF}@R=vBs-_~Wl3v9i+;@02Q zsXGi(_lbne&QY!Ji7c7D=6iwI!IwJkY*(;|@jkpFk=6WtMfWjoY2Mb?KewHC*Il~d zw5CSMs?+u>ReZkY+w0F<#hI=eo7Hu+`;5jVk)Tx~m-M~NLL}Wvd7ek-_!UNmN~~F- z5_3Ce9jE@s*^^A%t{FZ$sTnJ+^MXb5Hmbf5yf=AKLYt>!#bHms>^Z%0 zLOwg)rmc1>T6Vp8*$4e^3!V$;<#=Y#in^Th{mzjcA=ypmV{>>Tw%RpRewR0xv*y`? zlDF>G9halBc3N(+Il8LdE!R!J@50x>b8+QIr+@Fh68L+s^wCGj7poHfmmNrE&_B-j z&TqTz+$weUvoCket|>~NljHu+!mw}m8@m<$QhQvrTrSPrxAW=lSHG+OHdfsETF~yN la7@HF`fm3Advod)+G-YiC13cM@PlU&VY33;BoevH6551rrBpQFnp6PJ#Nsr*>w8RUcZlTv>H65 zlQjMvw{8l1^^c98PoDpo>A#j^@dD~U*w3CgEuEc^Fzb5Ho|^4xo#6%xKgQTJMjJok zygO@Rc**{A#XG;x3XDt7J3A%(!6&Y}vsV6US!bcW{aEyZnX}dxF!DRxU;kMuzcFoH z{U6r9#>XG;tVr6P)^$Akz~kK&Lfg}hOx|T0Z1az4-hrc&cbO{BE8d>gr5Cq4ljILl;}JBCF3vhHlDcTpss*aIROFYg zdTE+j%Kp77rPSi2>7$^@**=r6hT=|S?k2bB_xO7ohLGJD%=Ze<%9+xC;9^p_c54kIQ z{P)p7B3cGZ{J&&yp4a(~I6C(`V{^_uc;c`h5)4_Q(V>Pq>4UwZIlfn{vjX8(6h zwr@|!Yac7DeJk}fvfFuyo66kRv!nO*-|OX#epq$He`yZIsO#Zzimydw~043jZAOHXW diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index 107af9b67..96149fd68 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -29,7 +29,7 @@ "tfc:vein/gabbro_dike", "tfc:vein/diorite_dike", "tfg:moon/surface/moon_rock_pile", - "tfg:moon/surface/loose_anorthosite_rocks" + "tfg:moon/surface/loose_moon_stone_rocks" ], [], "#tfg:moon_veins", diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_anorthosite_rocks.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_moon_stone_rocks.json similarity index 90% rename from kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_anorthosite_rocks.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_moon_stone_rocks.json index f0fb3e7ba..4edb0023f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_anorthosite_rocks.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_moon_stone_rocks.json @@ -14,7 +14,7 @@ "source": { "type": "minecraft:simple_state_provider", "state": { - "Name": "tfg:loose/anorthosite" + "Name": "tfg:loose/moon_stone" } } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json index 5bf7ab068..bac81cf2b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json @@ -25,13 +25,13 @@ { "weight": 20, "data": { - "Name": "tfg:rock/raw_basanite" + "Name": "ad_astra:moon_deepslate" } }, { "weight": 20, "data": { - "Name": "tfg:rock/raw_anorthosite" + "Name": "ad_astra:moon_stone" } } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_apatite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_apatite.json index be427e547..96f8de591 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_apatite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_apatite.json @@ -34,19 +34,19 @@ }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_apatite_ore", + "block": "gtceu:moon_stone_apatite_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_tricalcium_phosphate_ore", + "block": "gtceu:moon_stone_tricalcium_phosphate_ore", "weight": 35 }, { - "block": "gtceu:anorthosite_pyrochlore_ore", + "block": "gtceu:moon_stone_pyrochlore_ore", "weight": 40 }, { @@ -57,19 +57,19 @@ }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_apatite_ore", + "block": "gtceu:moon_deepslate_apatite_ore", "weight": 25 }, { - "block": "gtceu:basanite_tricalcium_phosphate_ore", + "block": "gtceu:moon_deepslate_tricalcium_phosphate_ore", "weight": 35 }, { - "block": "gtceu:basanite_pyrochlore_ore", + "block": "gtceu:moon_deepslate_pyrochlore_ore", "weight": 40 }, { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json index c955ee389..6a765c620 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json @@ -35,46 +35,46 @@ }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:basanite_bauxite_ore", + "block": "gtceu:moon_stone_bauxite_ore", "weight": 35 }, { - "block": "gtceu:basanite_ilmenite_ore", + "block": "gtceu:moon_stone_ilmenite_ore", "weight": 40 }, { - "block": "gtceu:basanite_aluminium_ore", + "block": "gtceu:moon_stone_aluminium_ore", "weight": 25 }, { - "block": "gtceu:basanite_armalcolite_ore", + "block": "gtceu:moon_stone_armalcolite_ore", "weight": 20 } ] }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:anorthosite_bauxite_ore", + "block": "gtceu:moon_deepslate_bauxite_ore", "weight": 35 }, { - "block": "gtceu:anorthosite_ilmenite_ore", + "block": "gtceu:moon_deepslate_ilmenite_ore", "weight": 40 }, { - "block": "gtceu:anorthosite_aluminium_ore", + "block": "gtceu:moon_deepslate_aluminium_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_armalcolite_ore", + "block": "gtceu:moon_deepslate_armalcolite_ore", "weight": 20 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json index 52c336bed..74df125ea 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json @@ -45,11 +45,11 @@ }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_beryllium_ore", + "block": "gtceu:moon_stone_beryllium_ore", "weight": 35 }, { @@ -57,7 +57,7 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_emerald_ore", + "block": "gtceu:moon_stone_emerald_ore", "weight": 50 }, { @@ -65,18 +65,18 @@ "weight": 2 }, { - "block": "gtceu:anorthosite_thorium_ore", + "block": "gtceu:moon_stone_thorium_ore", "weight": 15 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_beryllium_ore", + "block": "gtceu:moon_deepslate_beryllium_ore", "weight": 35 }, { @@ -84,7 +84,7 @@ "weight": 1 }, { - "block": "gtceu:basanite_emerald_ore", + "block": "gtceu:moon_deepslate_emerald_ore", "weight": 50 }, { @@ -92,7 +92,7 @@ "weight": 2 }, { - "block": "gtceu:basanite_thorium_ore", + "block": "gtceu:moon_deepslate_thorium_ore", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json index f43262f4a..7ac3e1b57 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json @@ -11,11 +11,11 @@ "blocks": [ { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_desh_ore", + "block": "gtceu:moon_stone_desh_ore", "weight": 40 }, { @@ -23,7 +23,7 @@ "weight": 2 }, { - "block": "gtceu:anorthosite_ilmenite_ore", + "block": "gtceu:moon_stone_ilmenite_ore", "weight": 25 }, { @@ -31,22 +31,22 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_aluminium_ore", + "block": "gtceu:moon_stone_aluminium_ore", "weight": 20 }, { - "block": "gtceu:anorthosite_armalcolite_ore", + "block": "gtceu:moon_stone_armalcolite_ore", "weight": 15 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_desh_ore", + "block": "gtceu:moon_deepslate_desh_ore", "weight": 40 }, { @@ -54,7 +54,7 @@ "weight": 2 }, { - "block": "gtceu:basanite_ilmenite_ore", + "block": "gtceu:moon_deepslate_ilmenite_ore", "weight": 25 }, { @@ -62,11 +62,11 @@ "weight": 1 }, { - "block": "gtceu:basanite_aluminium_ore", + "block": "gtceu:moon_deepslate_aluminium_ore", "weight": 20 }, { - "block": "gtceu:basanite_armalcolite_ore", + "block": "gtceu:moon_deepslate_armalcolite_ore", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_diopside.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_diopside.json index 13642ce6d..79a3549cf 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_diopside.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_diopside.json @@ -93,11 +93,11 @@ }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_diopside_ore", + "block": "gtceu:moon_stone_diopside_ore", "weight": 45 }, { @@ -105,26 +105,26 @@ "weight": 2 }, { - "block": "gtceu:anorthosite_trona_ore", + "block": "gtceu:moon_stone_trona_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_cobalt_ore", + "block": "gtceu:moon_stone_cobalt_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_tantalite_ore", + "block": "gtceu:moon_stone_tantalite_ore", "weight": 15 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_diopside_ore", + "block": "gtceu:moon_deepslate_diopside_ore", "weight": 45 }, { @@ -132,15 +132,15 @@ "weight": 2 }, { - "block": "gtceu:basanite_trona_ore", + "block": "gtceu:moon_deepslate_trona_ore", "weight": 25 }, { - "block": "gtceu:basanite_cobalt_ore", + "block": "gtceu:moon_deepslate_cobalt_ore", "weight": 25 }, { - "block": "gtceu:basanite_tantalite_ore", + "block": "gtceu:moon_deepslate_tantalite_ore", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_enstatite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_enstatite.json index 7829d220e..20b31c89f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_enstatite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_enstatite.json @@ -105,11 +105,11 @@ }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_enstatite_ore", + "block": "gtceu:moon_stone_enstatite_ore", "weight": 45 }, { @@ -117,7 +117,7 @@ "weight": 2 }, { - "block": "gtceu:anorthosite_chromite_ore", + "block": "gtceu:moon_stone_chromite_ore", "weight": 30 }, { @@ -125,22 +125,22 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_ilmenite_ore", + "block": "gtceu:moon_stone_ilmenite_ore", "weight": 15 }, { - "block": "gtceu:anorthosite_fayalite_ore", + "block": "gtceu:moon_stone_fayalite_ore", "weight": 10 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_enstatite_ore", + "block": "gtceu:moon_deepslate_enstatite_ore", "weight": 45 }, { @@ -148,7 +148,7 @@ "weight": 2 }, { - "block": "gtceu:basanite_chromite_ore", + "block": "gtceu:moon_deepslate_chromite_ore", "weight": 30 }, { @@ -156,11 +156,11 @@ "weight": 1 }, { - "block": "gtceu:basanite_ilmenite_ore", + "block": "gtceu:moon_deepslate_ilmenite_ore", "weight": 15 }, { - "block": "gtceu:basanite_fayalite_ore", + "block": "gtceu:moon_deepslate_fayalite_ore", "weight": 10 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_fayalite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_fayalite.json index f6a40d299..b0c6469b6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_fayalite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_fayalite.json @@ -93,15 +93,15 @@ }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_enstatite_ore", + "block": "gtceu:moon_stone_enstatite_ore", "weight": 10 }, { - "block": "gtceu:anorthosite_pyrite_ore", + "block": "gtceu:moon_stone_pyrite_ore", "weight": 30 }, { @@ -109,26 +109,26 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_pentlandite_ore", + "block": "gtceu:moon_stone_pentlandite_ore", "weight": 15 }, { - "block": "gtceu:anorthosite_fayalite_ore", + "block": "gtceu:moon_stone_fayalite_ore", "weight": 45 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_enstatite_ore", + "block": "gtceu:moon_deepslate_enstatite_ore", "weight": 10 }, { - "block": "gtceu:basanite_pyrite_ore", + "block": "gtceu:moon_deepslate_pyrite_ore", "weight": 30 }, { @@ -136,11 +136,11 @@ "weight": 1 }, { - "block": "gtceu:basanite_pentlandite_ore", + "block": "gtceu:moon_deepslate_pentlandite_ore", "weight": 15 }, { - "block": "gtceu:basanite_fayalite_ore", + "block": "gtceu:moon_deepslate_fayalite_ore", "weight": 45 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_magnetite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_magnetite.json index 48f42b48b..402192036 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_magnetite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_magnetite.json @@ -73,19 +73,19 @@ }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_magnetite_ore", + "block": "gtceu:moon_stone_magnetite_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_vanadium_magnetite_ore", + "block": "gtceu:moon_stone_vanadium_magnetite_ore", "weight": 15 }, { - "block": "gtceu:anorthosite_chromite_ore", + "block": "gtceu:moon_stone_chromite_ore", "weight": 40 }, { @@ -93,30 +93,30 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_gold_ore", + "block": "gtceu:moon_stone_gold_ore", "weight": 15 }, { - "block": "gtceu:anorthosite_sapphire_ore", + "block": "gtceu:moon_stone_sapphire_ore", "weight": 5 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_magnetite_ore", + "block": "gtceu:moon_deepslate_magnetite_ore", "weight": 25 }, { - "block": "gtceu:basanite_vanadium_magnetite_ore", + "block": "gtceu:moon_deepslate_vanadium_magnetite_ore", "weight": 15 }, { - "block": "gtceu:basanite_chromite_ore", + "block": "gtceu:moon_deepslate_chromite_ore", "weight": 40 }, { @@ -124,11 +124,11 @@ "weight": 1 }, { - "block": "gtceu:basanite_gold_ore", + "block": "gtceu:moon_deepslate_gold_ore", "weight": 15 }, { - "block": "gtceu:basanite_sapphire_ore", + "block": "gtceu:moon_deepslate_sapphire_ore", "weight": 5 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json index 63807d823..5af1c5b5b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json @@ -26,25 +26,13 @@ "block": "gtceu:diorite_mica_ore", "weight": 25 }, - { - "block": "gtceu:raw_mica_block", - "weight": 1 - }, { "block": "gtceu:diorite_bauxite_ore", "weight": 25 }, - { - "block": "gtceu:raw_bauxite_block", - "weight": 1 - }, { "block": "gtceu:diorite_pollucite_ore", "weight": 15 - }, - { - "block": "gtceu:raw_pollucite_block", - "weight": 1 } ] }, @@ -65,35 +53,23 @@ "block": "gtceu:gabbro_mica_ore", "weight": 25 }, - { - "block": "gtceu:raw_mica_block", - "weight": 1 - }, { "block": "gtceu:gabbro_bauxite_ore", "weight": 25 }, - { - "block": "gtceu:raw_bauxite_block", - "weight": 1 - }, { "block": "gtceu:gabbro_pollucite_ore", "weight": 15 - }, - { - "block": "gtceu:raw_pollucite_block", - "weight": 1 } ] }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_kyanite_ore", + "block": "gtceu:moon_stone_kyanite_ore", "weight": 35 }, { @@ -101,38 +77,26 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_mica_ore", + "block": "gtceu:moon_stone_mica_ore", "weight": 25 }, { - "block": "gtceu:raw_mica_block", - "weight": 1 - }, - { - "block": "gtceu:anorthosite_bauxite_ore", + "block": "gtceu:moon_stone_bauxite_ore", "weight": 25 }, { - "block": "gtceu:raw_bauxite_block", - "weight": 1 - }, - { - "block": "gtceu:anorthosite_pollucite_ore", + "block": "gtceu:moon_stone_pollucite_ore", "weight": 15 - }, - { - "block": "gtceu:raw_pollucite_block", - "weight": 1 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_kyanite_ore", + "block": "gtceu:moon_deepslate_kyanite_ore", "weight": 35 }, { @@ -140,28 +104,16 @@ "weight": 1 }, { - "block": "gtceu:basanite_mica_ore", + "block": "gtceu:moon_deepslate_mica_ore", "weight": 25 }, { - "block": "gtceu:raw_mica_block", - "weight": 1 - }, - { - "block": "gtceu:basanite_bauxite_ore", + "block": "gtceu:moon_deepslate_bauxite_ore", "weight": 25 }, { - "block": "gtceu:raw_bauxite_block", - "weight": 1 - }, - { - "block": "gtceu:basanite_pollucite_ore", + "block": "gtceu:moon_deepslate_pollucite_ore", "weight": 15 - }, - { - "block": "gtceu:raw_pollucite_block", - "weight": 1 } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json index 38b481688..c8b734472 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json @@ -105,11 +105,11 @@ }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_wulfenite_ore", + "block": "gtceu:moon_deepslate_wulfenite_ore", "weight": 40 }, { @@ -117,7 +117,7 @@ "weight": 1 }, { - "block": "gtceu:basanite_molybdenite_ore", + "block": "gtceu:moon_deepslate_molybdenite_ore", "weight": 30 }, { @@ -125,11 +125,11 @@ "weight": 1 }, { - "block": "gtceu:basanite_molybdenum_ore", + "block": "gtceu:moon_deepslate_molybdenum_ore", "weight": 15 }, { - "block": "gtceu:basanite_powellite_ore", + "block": "gtceu:moon_deepslate_powellite_ore", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_olivine.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_olivine.json index 7c890b63d..f5f438aac 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_olivine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_olivine.json @@ -11,11 +11,11 @@ "blocks": [ { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_diopside_ore", + "block": "gtceu:moon_deepslate_diopside_ore", "weight": 15 }, { @@ -23,11 +23,11 @@ "weight": 1 }, { - "block": "gtceu:basanite_enstatite_ore", + "block": "gtceu:moon_deepslate_enstatite_ore", "weight": 10 }, { - "block": "gtceu:basanite_olivine_ore", + "block": "gtceu:moon_deepslate_olivine_ore", "weight": 65 }, { @@ -35,7 +35,7 @@ "weight": 2 }, { - "block": "gtceu:basanite_fayalite_ore", + "block": "gtceu:moon_deepslate_fayalite_ore", "weight": 10 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_plutonium.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_plutonium.json index de7339764..9dd3bf407 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_plutonium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_plutonium.json @@ -11,23 +11,23 @@ "blocks": [ { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_desh_ore", - "weight": 45 + "block": "gtceu:moon_deepslate_tungstate_ore", + "weight": 35 }, { - "block": "gtceu:raw_desh_block", + "block": "gtceu:moon_deepslate_armalcolite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_armalcolite_block", "weight": 1 }, { - "block": "gtceu:basanite_armalcolite_ore", - "weight": 30 - }, - { - "block": "gtceu:basanite_plutonium_ore", + "block": "gtceu:moon_deepslate_plutonium_ore", "weight": 25 } ] @@ -40,12 +40,12 @@ "underground_count": 200, "blocks": [ { - "block": "gtceu:desh_indicator", - "weight": 45 + "block": "gtceu:tungstate_indicator", + "weight": 35 }, { "block": "gtceu:armalcolite_bud_indicator", - "weight": 30 + "weight": 40 }, { "block": "gtceu:plutonium_indicator", diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json index 72734b4a6..88c1df42e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json @@ -3,7 +3,7 @@ "type": "tfc:cluster_vein", "config": { "size": 40, - "rarity": 200, + "rarity": 180, "density": 0.3, "min_y": -32, "max_y": 100, @@ -43,15 +43,15 @@ }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_quartzite_ore", + "block": "gtceu:moon_deepslate_quartzite_ore", "weight": 10 }, { - "block": "gtceu:basanite_certus_quartz_ore", + "block": "gtceu:moon_deepslate_certus_quartz_ore", "weight": 50 }, { @@ -59,11 +59,11 @@ "weight": 2 }, { - "block": "gtceu:basanite_barite_ore", + "block": "gtceu:moon_deepslate_barite_ore", "weight": 15 }, { - "block": "gtceu:basanite_nether_quartz_ore", + "block": "gtceu:moon_deepslate_nether_quartz_ore", "weight": 25 }, { @@ -105,15 +105,15 @@ }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_quartzite_ore", + "block": "gtceu:moon_stone_quartzite_ore", "weight": 10 }, { - "block": "gtceu:anorthosite_certus_quartz_ore", + "block": "gtceu:moon_stone_certus_quartz_ore", "weight": 50 }, { @@ -121,11 +121,11 @@ "weight": 2 }, { - "block": "gtceu:anorthosite_barite_ore", + "block": "gtceu:moon_stone_barite_ore", "weight": 15 }, { - "block": "gtceu:anorthosite_nether_quartz_ore", + "block": "gtceu:moon_stone_nether_quartz_ore", "weight": 25 }, { @@ -168,7 +168,7 @@ ], "indicator": { "rarity": 15, - "depth": 50, + "depth": 80, "underground_rarity": 40, "underground_count": 200, "blocks": [ diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_redstone.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_redstone.json index ff446a6b6..f0c36a4ce 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_redstone.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_redstone.json @@ -11,11 +11,11 @@ "blocks": [ { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_redstone_ore", + "block": "gtceu:moon_stone_redstone_ore", "weight": 45 }, { @@ -23,22 +23,22 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_ruby_ore", + "block": "gtceu:moon_stone_ruby_ore", "weight": 35 }, { - "block": "gtceu:anorthosite_cinnabar_ore", + "block": "gtceu:moon_stone_cinnabar_ore", "weight": 20 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_redstone_ore", + "block": "gtceu:moon_deepslate_redstone_ore", "weight": 45 }, { @@ -46,11 +46,11 @@ "weight": 1 }, { - "block": "gtceu:basanite_ruby_ore", + "block": "gtceu:moon_deepslate_ruby_ore", "weight": 35 }, { - "block": "gtceu:basanite_cinnabar_ore", + "block": "gtceu:moon_deepslate_cinnabar_ore", "weight": 20 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_saltpeter.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_saltpeter.json index f3efb4c77..1c59acbfe 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_saltpeter.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_saltpeter.json @@ -38,11 +38,11 @@ }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:basanite_saltpeter_ore", + "block": "gtceu:moon_stone_saltpeter_ore", "weight": 35 }, { @@ -50,26 +50,26 @@ "weight": 1 }, { - "block": "gtceu:basanite_soapstone_ore", + "block": "gtceu:moon_stone_soapstone_ore", "weight": 25 }, { - "block": "gtceu:basanite_electrotine_ore", + "block": "gtceu:moon_stone_electrotine_ore", "weight": 25 }, { - "block": "gtceu:basanite_talc_ore", + "block": "gtceu:moon_stone_talc_ore", "weight": 15 } ] }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:anorthosite_saltpeter_ore", + "block": "gtceu:moon_deepslate_saltpeter_ore", "weight": 35 }, { @@ -77,15 +77,15 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_soapstone_ore", + "block": "gtceu:moon_deepslate_soapstone_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_electrotine_ore", + "block": "gtceu:moon_deepslate_electrotine_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_talc_ore", + "block": "gtceu:moon_deepslate_talc_ore", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json index 8e66746f4..7077d8f13 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json @@ -40,11 +40,11 @@ }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_almandine_ore", + "block": "gtceu:moon_deepslate_almandine_ore", "weight": 35 }, { @@ -52,15 +52,15 @@ "weight": 1 }, { - "block": "gtceu:basanite_pyrope_ore", + "block": "gtceu:moon_deepslate_pyrope_ore", "weight": 25 }, { - "block": "gtceu:basanite_sapphire_ore", + "block": "gtceu:moon_deepslate_sapphire_ore", "weight": 15 }, { - "block": "gtceu:basanite_green_sapphire_ore", + "block": "gtceu:moon_deepslate_green_sapphire_ore", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_scheelite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_scheelite.json index 6e30ac22e..d1f40ad75 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_scheelite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_scheelite.json @@ -65,11 +65,11 @@ }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_scheelite_ore", + "block": "gtceu:moon_stone_scheelite_ore", "weight": 40 }, { @@ -77,7 +77,7 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_tungstate_ore", + "block": "gtceu:moon_stone_tungstate_ore", "weight": 50 }, { @@ -85,18 +85,18 @@ "weight": 2 }, { - "block": "gtceu:anorthosite_lithium_ore", + "block": "gtceu:moon_stone_lithium_ore", "weight": 10 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_scheelite_ore", + "block": "gtceu:moon_deepslate_scheelite_ore", "weight": 40 }, { @@ -104,7 +104,7 @@ "weight": 1 }, { - "block": "gtceu:basanite_tungstate_ore", + "block": "gtceu:moon_deepslate_tungstate_ore", "weight": 50 }, { @@ -112,7 +112,7 @@ "weight": 2 }, { - "block": "gtceu:basanite_lithium_ore", + "block": "gtceu:moon_deepslate_lithium_ore", "weight": 10 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json index 0d8fa2bc5..90003bff6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json @@ -11,11 +11,11 @@ "blocks": [ { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:anorthosite_bornite_ore", + "block": "gtceu:moon_stone_bornite_ore", "weight": 35 }, { @@ -23,26 +23,26 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_cooperite_ore", + "block": "gtceu:moon_stone_cooperite_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_platinum_ore", + "block": "gtceu:moon_stone_platinum_ore", "weight": 25 }, { - "block": "gtceu:anorthosite_palladium_ore", + "block": "gtceu:moon_stone_palladium_ore", "weight": 15 } ] }, { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:basanite_bornite_ore", + "block": "gtceu:moon_deepslate_bornite_ore", "weight": 35 }, { @@ -50,15 +50,15 @@ "weight": 1 }, { - "block": "gtceu:basanite_cooperite_ore", + "block": "gtceu:moon_deepslate_cooperite_ore", "weight": 25 }, { - "block": "gtceu:basanite_platinum_ore", + "block": "gtceu:moon_deepslate_platinum_ore", "weight": 25 }, { - "block": "gtceu:basanite_palladium_ore", + "block": "gtceu:moon_deepslate_palladium_ore", "weight": 15 } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_silver.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_silver.json index 30c1a38be..f52fccab3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_silver.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_silver.json @@ -11,15 +11,15 @@ "blocks": [ { "replace": [ - "tfg:rock/raw_basanite" + "ad_astra:moon_stone" ], "with": [ { - "block": "gtceu:basanite_galena_ore", + "block": "gtceu:moon_stone_galena_ore", "weight": 30 }, { - "block": "gtceu:basanite_silver_ore", + "block": "gtceu:moon_stone_silver_ore", "weight": 45 }, { @@ -27,22 +27,22 @@ "weight": 1 }, { - "block": "gtceu:basanite_lead_ore", + "block": "gtceu:moon_stone_lead_ore", "weight": 25 } ] }, { "replace": [ - "tfg:rock/raw_anorthosite" + "ad_astra:moon_deepslate" ], "with": [ { - "block": "gtceu:anorthosite_galena_ore", + "block": "gtceu:moon_deepslate_galena_ore", "weight": 30 }, { - "block": "gtceu:anorthosite_silver_ore", + "block": "gtceu:moon_deepslate_silver_ore", "weight": 45 }, { @@ -50,7 +50,7 @@ "weight": 1 }, { - "block": "gtceu:anorthosite_lead_ore", + "block": "gtceu:moon_deepslate_lead_ore", "weight": 25 } ] diff --git a/kubejs/data/tfg/worldgen/mars_rock_layers.json b/kubejs/data/tfg/worldgen/mars_rock_layers.json index ee9374e55..ff0cecc25 100644 --- a/kubejs/data/tfg/worldgen/mars_rock_layers.json +++ b/kubejs/data/tfg/worldgen/mars_rock_layers.json @@ -17,13 +17,13 @@ "andesite": "tfc:andesite", "dacite": "tfc:dacite", - "syenite": { - "raw": "tfg:raw_syenite", - "hardened": "tfg:hardened_syenite", + "mars_stone": { + "raw": "ad_astra:mars_stone", + "hardened": "tfg:rock/hardened_mars_stone", "gravel": "ad_astra:mars_sand", "cobble": "ad_astra:mars_cobblestone", "sand": "ad_astra:mars_sand", - "sandstone": "tfg:raw_syenite" + "sandstone": "ad_astra:mars_stone" }, "red_granite": { @@ -42,7 +42,7 @@ "basalt", "andesite", "dacite", - "syenite", + "mars_stone", "red_granite" ], "layers": [ @@ -56,7 +56,7 @@ { "id": "intermediate", "layers": { - "syenite": "bottom" + "mars_stone": "bottom" } }, { @@ -109,7 +109,7 @@ "red_granite": "land_sedimentary", "granite": "land_sedimentary", "gabbro": "land_sedimentary", - "syenite": "land_sedimentary" + "mars_stone": "land_sedimentary" } } ], diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index 367049a09..cc19b5910 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -5,7 +5,7 @@ "ore_veins_enabled": false, "legacy_random_source": false, "default_block": { - "Name": "tfg:rock/raw_syenite" + "Name": "ad_astra:mars_stone" }, "default_fluid": { "Name": "minecraft:air" @@ -311,7 +311,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "tfg:rock/hardened_syenite" + "Name": "tfg:rock/hardened_mars_stone" } } }, diff --git a/kubejs/data/tfg/worldgen/noise_settings/moon_noise.json b/kubejs/data/tfg/worldgen/noise_settings/moon_noise.json index f2144853e..728682474 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/moon_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/moon_noise.json @@ -5,7 +5,7 @@ "ore_veins_enabled": false, "legacy_random_source": false, "default_block": { - "Name": "tfg:rock/raw_anorthosite" + "Name": "ad_astra:moon_stone" }, "default_fluid": { "Name": "minecraft:air" @@ -250,7 +250,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "tfg:rock/raw_basanite", + "Name": "ad_astra:moon_deepslate", "Properties": { "axis": "y" } @@ -280,7 +280,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "tfg:rock/hardened_anorthosite" + "Name": "tfg:rock/hardened_moon_stone" } } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_anorthosite_rocks.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_moon_stone_rocks.json similarity index 82% rename from kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_anorthosite_rocks.json rename to kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_moon_stone_rocks.json index a40f89a9e..b98187645 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_anorthosite_rocks.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_moon_stone_rocks.json @@ -1,5 +1,5 @@ { - "feature": "tfg:moon/surface/loose_anorthosite_rocks", + "feature": "tfg:moon/surface/loose_moon_stone_rocks", "placement": [ { "type": "minecraft:count", diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index d4af8120f..2ced15e55 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -46,6 +46,7 @@ const registerAdAstraBlockTags = (event) => { 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