From 0256ece0ddfcc6135123d53f9156f65c35a916c4 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 5 May 2025 20:08:42 +0100 Subject: [PATCH] added loose stone, bricks, and recipes for all the different ad astra stone types --- kubejs/assets/ad_astra/lang/en_us.json | 41 +- .../tfg/blockstates/loose/glacio_stone.json | 55 +++ .../tfg/blockstates/loose/mercury_stone.json | 55 +++ .../tfg/blockstates/loose/permafrost.json | 55 +++ .../tfg/blockstates/loose/venus_stone.json | 55 +++ .../rock/hardened_glacio_stone.json | 7 + .../rock/hardened_mercury_stone.json | 7 + .../rock/hardened_venus_stone.json | 7 + kubejs/assets/tfg/lang/en_us.json | 24 +- .../models/block/loose/glacio_stone_1.json | 6 + .../models/block/loose/glacio_stone_2.json | 6 + .../models/block/loose/glacio_stone_3.json | 6 + .../models/block/loose/mercury_stone_1.json | 6 + .../models/block/loose/mercury_stone_2.json | 6 + .../models/block/loose/mercury_stone_3.json | 6 + .../tfg/models/block/loose/permafrost_1.json | 6 + .../tfg/models/block/loose/permafrost_2.json | 6 + .../tfg/models/block/loose/permafrost_3.json | 6 + .../tfg/models/block/loose/venus_stone_1.json | 6 + .../tfg/models/block/loose/venus_stone_2.json | 6 + .../tfg/models/block/loose/venus_stone_3.json | 6 + .../block/rock/hardened_glacio_stone.json | 6 + .../block/rock/hardened_mercury_stone.json | 6 + .../block/rock/hardened_venus_stone.json | 6 + .../loot_tables/blocks/glacio_stone.json | 44 ++ .../loot_tables/blocks/mars_stone.json | 44 ++ .../loot_tables/blocks/mercury_stone.json | 44 ++ .../loot_tables/blocks/venus_stone.json | 44 ++ .../blocks/rock/hardened_glacio_stone.json | 30 ++ .../blocks/rock/hardened_mars_stone.json | 30 ++ .../blocks/rock/hardened_mercury_stone.json | 30 ++ .../blocks/rock/hardened_moon_deepslate.json | 30 ++ .../blocks/rock/hardened_moon_stone.json | 30 ++ .../blocks/rock/hardened_venus_stone.json | 30 ++ kubejs/server_scripts/ad_astra/tags.js | 45 ++- kubejs/server_scripts/gregtech/tags.js | 7 +- kubejs/server_scripts/tfg/recipes.collapse.js | 22 +- kubejs/server_scripts/tfg/recipes.rocks.js | 382 +++++++++++++++++- kubejs/startup_scripts/ad_astra/constants.js | 2 - kubejs/startup_scripts/gtceu/constants.js | 5 +- kubejs/startup_scripts/tfc/materials.js | 6 + kubejs/startup_scripts/tfc/tag_prefixes.js | 21 + kubejs/startup_scripts/tfg/blocks.space.js | 81 +++- kubejs/startup_scripts/tfg/constants.js | 9 +- kubejs/startup_scripts/tfg/items.js | 16 +- 45 files changed, 1272 insertions(+), 76 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/loose/glacio_stone.json create mode 100644 kubejs/assets/tfg/blockstates/loose/mercury_stone.json create mode 100644 kubejs/assets/tfg/blockstates/loose/permafrost.json create mode 100644 kubejs/assets/tfg/blockstates/loose/venus_stone.json create mode 100644 kubejs/assets/tfg/blockstates/rock/hardened_glacio_stone.json create mode 100644 kubejs/assets/tfg/blockstates/rock/hardened_mercury_stone.json create mode 100644 kubejs/assets/tfg/blockstates/rock/hardened_venus_stone.json create mode 100644 kubejs/assets/tfg/models/block/loose/glacio_stone_1.json create mode 100644 kubejs/assets/tfg/models/block/loose/glacio_stone_2.json create mode 100644 kubejs/assets/tfg/models/block/loose/glacio_stone_3.json create mode 100644 kubejs/assets/tfg/models/block/loose/mercury_stone_1.json create mode 100644 kubejs/assets/tfg/models/block/loose/mercury_stone_2.json create mode 100644 kubejs/assets/tfg/models/block/loose/mercury_stone_3.json create mode 100644 kubejs/assets/tfg/models/block/loose/permafrost_1.json create mode 100644 kubejs/assets/tfg/models/block/loose/permafrost_2.json create mode 100644 kubejs/assets/tfg/models/block/loose/permafrost_3.json create mode 100644 kubejs/assets/tfg/models/block/loose/venus_stone_1.json create mode 100644 kubejs/assets/tfg/models/block/loose/venus_stone_2.json create mode 100644 kubejs/assets/tfg/models/block/loose/venus_stone_3.json create mode 100644 kubejs/assets/tfg/models/block/rock/hardened_glacio_stone.json create mode 100644 kubejs/assets/tfg/models/block/rock/hardened_mercury_stone.json create mode 100644 kubejs/assets/tfg/models/block/rock/hardened_venus_stone.json create mode 100644 kubejs/data/ad_astra/loot_tables/blocks/glacio_stone.json create mode 100644 kubejs/data/ad_astra/loot_tables/blocks/mars_stone.json create mode 100644 kubejs/data/ad_astra/loot_tables/blocks/mercury_stone.json create mode 100644 kubejs/data/ad_astra/loot_tables/blocks/venus_stone.json create mode 100644 kubejs/data/tfg/loot_tables/blocks/rock/hardened_glacio_stone.json create mode 100644 kubejs/data/tfg/loot_tables/blocks/rock/hardened_mars_stone.json create mode 100644 kubejs/data/tfg/loot_tables/blocks/rock/hardened_mercury_stone.json create mode 100644 kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_deepslate.json create mode 100644 kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_stone.json create mode 100644 kubejs/data/tfg/loot_tables/blocks/rock/hardened_venus_stone.json diff --git a/kubejs/assets/ad_astra/lang/en_us.json b/kubejs/assets/ad_astra/lang/en_us.json index df168e698..1452bd406 100644 --- a/kubejs/assets/ad_astra/lang/en_us.json +++ b/kubejs/assets/ad_astra/lang/en_us.json @@ -79,25 +79,28 @@ "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", + "block.ad_astra.glacio_stone": "Raw Phonolite", + "block.ad_astra.glacio_cobblestone": "Phonolite Cobble", + "block.ad_astra.glacio_cobblestone_slab": "Phonolite Cobble Slab", + "block.ad_astra.glacio_cobblestone_stairs": "Phonolite Cobble Stairs", + "block.ad_astra.glacio_pillar": "Phonolite Pillar", + "block.ad_astra.glacio_stone_brick_slab": "Phonolite Brick Slab", + "block.ad_astra.glacio_stone_brick_stairs": "Phonolite Brick Stairs", + "block.ad_astra.glacio_stone_brick_wall": "Phonolite Brick Wall", + "block.ad_astra.glacio_stone_bricks": "Phonolite Bricks", + "block.ad_astra.glacio_stone_slab": "Phonolite Slab", + "block.ad_astra.glacio_stone_stairs": "Phonolite Stairs", + "block.ad_astra.chiseled_glacio_stone_bricks": "Chiseled Phonolite Bricks", + "block.ad_astra.chiseled_glacio_stone_slab": "Chiseled Phonolite Slab", + "block.ad_astra.chiseled_glacio_stone_stairs": "Chiseled Phonolite Stairs", + "block.ad_astra.cracked_glacio_stone_bricks": "Cracked Phonolite Bricks", + "block.ad_astra.polished_glacio_stone": "Polished Phonolite", + "block.ad_astra.polished_glacio_stone_slab": "Polished Phonolite Slab", + "block.ad_astra.polished_glacio_stone_stairs": "Polished Phonolite Stairs", "tagprefix.moon_stone": "Anorthosite %s Ore", "tagprefix.moon_deepslate": "Norite %s Ore", - "tagprefix.mars_stone": "Argillite %s Ore" + "tagprefix.mars_stone": "Argillite %s Ore", + "tagprefix.venus_stone": "Trachyte %s Ore", + "tagprefix.mercury_stone": "Komatiite %s Ore", + "tagprefix.glacio_stone": "Phonolite %s Ore" } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/loose/glacio_stone.json b/kubejs/assets/tfg/blockstates/loose/glacio_stone.json new file mode 100644 index 000000000..2ce1455c5 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/loose/glacio_stone.json @@ -0,0 +1,55 @@ +{ + "variants": { + "count=1": [ + { + "model": "tfg:block/loose/glacio_stone_1", + "y": 90 + }, + { + "model": "tfg:block/loose/glacio_stone_1" + }, + { + "model": "tfg:block/loose/glacio_stone_1", + "y": 180 + }, + { + "model": "tfg:block/loose/glacio_stone_1", + "y": 270 + } + ], + "count=2": [ + { + "model": "tfg:block/loose/glacio_stone_2", + "y": 90 + }, + { + "model": "tfg:block/loose/glacio_stone_2" + }, + { + "model": "tfg:block/loose/glacio_stone_2", + "y": 180 + }, + { + "model": "tfg:block/loose/glacio_stone_2", + "y": 270 + } + ], + "count=3": [ + { + "model": "tfg:block/loose/glacio_stone_3", + "y": 90 + }, + { + "model": "tfg:block/loose/glacio_stone_3" + }, + { + "model": "tfg:block/loose/glacio_stone_3", + "y": 180 + }, + { + "model": "tfg:block/loose/glacio_stone_3", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/loose/mercury_stone.json b/kubejs/assets/tfg/blockstates/loose/mercury_stone.json new file mode 100644 index 000000000..1d10143d1 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/loose/mercury_stone.json @@ -0,0 +1,55 @@ +{ + "variants": { + "count=1": [ + { + "model": "tfg:block/loose/mercury_stone_1", + "y": 90 + }, + { + "model": "tfg:block/loose/mercury_stone_1" + }, + { + "model": "tfg:block/loose/mercury_stone_1", + "y": 180 + }, + { + "model": "tfg:block/loose/mercury_stone_1", + "y": 270 + } + ], + "count=2": [ + { + "model": "tfg:block/loose/mercury_stone_2", + "y": 90 + }, + { + "model": "tfg:block/loose/mercury_stone_2" + }, + { + "model": "tfg:block/loose/mercury_stone_2", + "y": 180 + }, + { + "model": "tfg:block/loose/mercury_stone_2", + "y": 270 + } + ], + "count=3": [ + { + "model": "tfg:block/loose/mercury_stone_3", + "y": 90 + }, + { + "model": "tfg:block/loose/mercury_stone_3" + }, + { + "model": "tfg:block/loose/mercury_stone_3", + "y": 180 + }, + { + "model": "tfg:block/loose/mercury_stone_3", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/loose/permafrost.json b/kubejs/assets/tfg/blockstates/loose/permafrost.json new file mode 100644 index 000000000..fccdea10e --- /dev/null +++ b/kubejs/assets/tfg/blockstates/loose/permafrost.json @@ -0,0 +1,55 @@ +{ + "variants": { + "count=1": [ + { + "model": "tfg:block/loose/permafrost_1", + "y": 90 + }, + { + "model": "tfg:block/loose/permafrost_1" + }, + { + "model": "tfg:block/loose/permafrost_1", + "y": 180 + }, + { + "model": "tfg:block/loose/permafrost_1", + "y": 270 + } + ], + "count=2": [ + { + "model": "tfg:block/loose/permafrost_2", + "y": 90 + }, + { + "model": "tfg:block/loose/permafrost_2" + }, + { + "model": "tfg:block/loose/permafrost_2", + "y": 180 + }, + { + "model": "tfg:block/loose/permafrost_2", + "y": 270 + } + ], + "count=3": [ + { + "model": "tfg:block/loose/permafrost_3", + "y": 90 + }, + { + "model": "tfg:block/loose/permafrost_3" + }, + { + "model": "tfg:block/loose/permafrost_3", + "y": 180 + }, + { + "model": "tfg:block/loose/permafrost_3", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/loose/venus_stone.json b/kubejs/assets/tfg/blockstates/loose/venus_stone.json new file mode 100644 index 000000000..a61c647e1 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/loose/venus_stone.json @@ -0,0 +1,55 @@ +{ + "variants": { + "count=1": [ + { + "model": "tfg:block/loose/venus_stone_1", + "y": 90 + }, + { + "model": "tfg:block/loose/venus_stone_1" + }, + { + "model": "tfg:block/loose/venus_stone_1", + "y": 180 + }, + { + "model": "tfg:block/loose/venus_stone_1", + "y": 270 + } + ], + "count=2": [ + { + "model": "tfg:block/loose/venus_stone_2", + "y": 90 + }, + { + "model": "tfg:block/loose/venus_stone_2" + }, + { + "model": "tfg:block/loose/venus_stone_2", + "y": 180 + }, + { + "model": "tfg:block/loose/venus_stone_2", + "y": 270 + } + ], + "count=3": [ + { + "model": "tfg:block/loose/venus_stone_3", + "y": 90 + }, + { + "model": "tfg:block/loose/venus_stone_3" + }, + { + "model": "tfg:block/loose/venus_stone_3", + "y": 180 + }, + { + "model": "tfg:block/loose/venus_stone_3", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_glacio_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_glacio_stone.json new file mode 100644 index 000000000..299b79753 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/hardened_glacio_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/hardened_glacio_stone" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_mercury_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_mercury_stone.json new file mode 100644 index 000000000..7e73a534b --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/hardened_mercury_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/hardened_mercury_stone" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_venus_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_venus_stone.json new file mode 100644 index 000000000..9c3b52771 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/hardened_venus_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/hardened_venus_stone" + } + } +} \ 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 459d986b3..5f68bfe91 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -136,6 +136,13 @@ "block.tfg.loose.moon_deepslate": "Loose Norite Rock", "block.tfg.rock.hardened_mars_stone": "Hardened Argillite", "block.tfg.loose.mars_stone": "Loose Argillite Rock", + "block.tfg.rock.hardened_venus_stone": "Hardened Trachyte", + "block.tfg.loose.venus_stone": "Loose Trachyte Rock", + "block.tfg.rock.hardened_mercury_stone": "Hardened Komatiite", + "block.tfg.loose.mercury_stone": "Loose Komatiite Rock", + "block.tfg.rock.hardened_glacio_stone": "Hardened Phonolite", + "block.tfg.loose.glacio_stone": "Loose Phonolite Rock", + "block.tfg.loose.permafrost": "Permafrost Chunk", "item.tfg.antipoison_pill": "Antipoison Pill", "item.tfg.haste_pill": "Haste Pill", "item.tfg.night_vision_pill": "Night Vision Pill", @@ -185,12 +192,17 @@ "item.tfg.brick.deepslate": "Migmatite Brick", "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.loose.venus_stone": "Loose Trachyte", + "item.tfg.brick.venus_stone": "Trachyte Brick", + "item.tfg.loose.mercury_stone": "Loose Komatiite", + "item.tfg.brick.mercury_stone": "Komatiite Brick", + "item.tfg.loose.glacio_stone": "Loose Phonolite", + "item.tfg.brick.glacio_stone": "Phonolite Brick", + "item.tfg.loose.permafrost": "Permafrost Chunk", + "item.tfg.brick.permafrost": "Permafrost Brick", "item.tfg.terra_firma_greg": "TerraFirmaGreg", "item.tfg.scaffolding_frame": "Scaffolding Frame", "item.tfg.airship_hull": "Airship Hull", @@ -239,6 +251,12 @@ "material.tfg.schist": "Schist", "material.tfg.gneiss": "Gneiss", "material.tfg.chalk": "Chalk", + "material.tfg.moon_stone": "Anorthosite", + "material.tfg.moon_deepslate": "Norite", + "material.tfg.mars_stone": "Argillite", + "material.tfg.venus_stone": "Trachyte", + "material.tfg.mercury_stone": "Komatiite", + "material.tfg.glacio_stone": "Phonolite", "material.gtceu.thermochemically_treated_hardwood": "Thermochemically Treated Hardwood", "material.gtceu.hardwood": "Hardwood", "tfg.disabled_portal": "Portal magic seems to be blocked by an unknown force, try reaching another dimension by going down or up", diff --git a/kubejs/assets/tfg/models/block/loose/glacio_stone_1.json b/kubejs/assets/tfg/models/block/loose/glacio_stone_1.json new file mode 100644 index 000000000..b6ca63b7e --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/glacio_stone_1.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_sedimentary_1", + "textures": { + "texture": "ad_astra:block/glacio_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/glacio_stone_2.json b/kubejs/assets/tfg/models/block/loose/glacio_stone_2.json new file mode 100644 index 000000000..d9fea2c11 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/glacio_stone_2.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_metamorphic_2", + "textures": { + "texture": "ad_astra:block/glacio_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/glacio_stone_3.json b/kubejs/assets/tfg/models/block/loose/glacio_stone_3.json new file mode 100644 index 000000000..00bc44dd9 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/glacio_stone_3.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_sedimentary_3", + "textures": { + "texture": "ad_astra:block/glacio_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/mercury_stone_1.json b/kubejs/assets/tfg/models/block/loose/mercury_stone_1.json new file mode 100644 index 000000000..a87756928 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/mercury_stone_1.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_metamorphic_1", + "textures": { + "texture": "ad_astra:block/mercury_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/mercury_stone_2.json b/kubejs/assets/tfg/models/block/loose/mercury_stone_2.json new file mode 100644 index 000000000..9e59d9d25 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/mercury_stone_2.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_metamorphic_2", + "textures": { + "texture": "ad_astra:block/mercury_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/mercury_stone_3.json b/kubejs/assets/tfg/models/block/loose/mercury_stone_3.json new file mode 100644 index 000000000..90bb2dafa --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/mercury_stone_3.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_metamorphic_3", + "textures": { + "texture": "ad_astra:block/mercury_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/permafrost_1.json b/kubejs/assets/tfg/models/block/loose/permafrost_1.json new file mode 100644 index 000000000..9be2de8d1 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/permafrost_1.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_sedimentary_1", + "textures": { + "texture": "ad_astra:block/permafrost" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/permafrost_2.json b/kubejs/assets/tfg/models/block/loose/permafrost_2.json new file mode 100644 index 000000000..f8b51e4c8 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/permafrost_2.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_metamorphic_2", + "textures": { + "texture": "ad_astra:block/permafrost" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/permafrost_3.json b/kubejs/assets/tfg/models/block/loose/permafrost_3.json new file mode 100644 index 000000000..d0ecbe831 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/permafrost_3.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_sedimentary_3", + "textures": { + "texture": "ad_astra:block/permafrost" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/venus_stone_1.json b/kubejs/assets/tfg/models/block/loose/venus_stone_1.json new file mode 100644 index 000000000..c77684122 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/venus_stone_1.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_igneous_intrusive_1", + "textures": { + "texture": "ad_astra:block/venus_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/venus_stone_2.json b/kubejs/assets/tfg/models/block/loose/venus_stone_2.json new file mode 100644 index 000000000..5b2623d97 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/venus_stone_2.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_igneous_intrusive_2", + "textures": { + "texture": "ad_astra:block/venus_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/venus_stone_3.json b/kubejs/assets/tfg/models/block/loose/venus_stone_3.json new file mode 100644 index 000000000..1fcf1fe2e --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/venus_stone_3.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_igneous_intrusive_3", + "textures": { + "texture": "ad_astra:block/venus_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/hardened_glacio_stone.json b/kubejs/assets/tfg/models/block/rock/hardened_glacio_stone.json new file mode 100644 index 000000000..454736deb --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/hardened_glacio_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ad_astra:block/glacio_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/hardened_mercury_stone.json b/kubejs/assets/tfg/models/block/rock/hardened_mercury_stone.json new file mode 100644 index 000000000..a991e2826 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/hardened_mercury_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ad_astra:block/mercury_stone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/hardened_venus_stone.json b/kubejs/assets/tfg/models/block/rock/hardened_venus_stone.json new file mode 100644 index 000000000..435eb75c4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/hardened_venus_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ad_astra:block/venus_stone" + } +} \ No newline at end of file diff --git a/kubejs/data/ad_astra/loot_tables/blocks/glacio_stone.json b/kubejs/data/ad_astra/loot_tables/blocks/glacio_stone.json new file mode 100644 index 000000000..aa7923479 --- /dev/null +++ b/kubejs/data/ad_astra/loot_tables/blocks/glacio_stone.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:glacio_stone", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/glacio_stone", + "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/ad_astra/loot_tables/blocks/mars_stone.json b/kubejs/data/ad_astra/loot_tables/blocks/mars_stone.json new file mode 100644 index 000000000..13574c3bc --- /dev/null +++ b/kubejs/data/ad_astra/loot_tables/blocks/mars_stone.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:mars_stone", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/mars_stone", + "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/ad_astra/loot_tables/blocks/mercury_stone.json b/kubejs/data/ad_astra/loot_tables/blocks/mercury_stone.json new file mode 100644 index 000000000..f5e6faf3f --- /dev/null +++ b/kubejs/data/ad_astra/loot_tables/blocks/mercury_stone.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:mercury_stone", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/mercury_stone", + "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/ad_astra/loot_tables/blocks/venus_stone.json b/kubejs/data/ad_astra/loot_tables/blocks/venus_stone.json new file mode 100644 index 000000000..9476c814b --- /dev/null +++ b/kubejs/data/ad_astra/loot_tables/blocks/venus_stone.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:venus_stone", + "conditions": [ + { + "condition": "tfc:is_isolated" + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:loose/venus_stone", + "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/hardened_glacio_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_glacio_stone.json new file mode 100644 index 000000000..e8e009c94 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_glacio_stone.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:loose/glacio_stone", + "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/hardened_mars_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mars_stone.json new file mode 100644 index 000000000..0e7e9cf38 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mars_stone.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:loose/mars_stone", + "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/hardened_mercury_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mercury_stone.json new file mode 100644 index 000000000..2362d4e63 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_mercury_stone.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:loose/mercury_stone", + "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/hardened_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_deepslate.json new file mode 100644 index 000000000..804cf0072 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_deepslate.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "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/hardened_moon_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_stone.json new file mode 100644 index 000000000..b687d4df8 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_moon_stone.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:loose/moon_stone", + "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/hardened_venus_stone.json b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_venus_stone.json new file mode 100644 index 000000000..3c950f61a --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/hardened_venus_stone.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:loose/venus_stone", + "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/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 2ced15e55..50b7acd89 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -29,8 +29,12 @@ const registerAdAstraItemTags = (event) => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) - + event.add('forge:cobblestone', 'ad_astra:moon_cobblestone') + event.add('forge:cobblestone', 'ad_astra:mars_cobblestone') + event.add('forge:cobblestone', 'ad_astra:venus_cobblestone') + event.add('forge:cobblestone', 'ad_astra:mercury_cobblestone') + event.add('forge:cobblestone', 'ad_astra:glacio_cobblestone') } const registerAdAstraBlockTags = (event) => { @@ -93,11 +97,44 @@ const registerAdAstraBlockTags = (event) => { event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/hardened/diorite') event.add('tfc:can_landslide', 'ad_astra:moon_sand') + event.add('tfc:can_landslide', 'ad_astra:mars_sand') + event.add('tfc:can_landslide', 'ad_astra:venus_sand') + event.add('tfc:can_landslide', 'ad_astra:moon_cobblestone') - event.add('tfc:can_landslide', 'ad_astra:moon_cobblestone_slab') + event.add('tfc:can_landslide', 'ad_astra:mars_cobblestone') + event.add('tfc:can_landslide', 'ad_astra:venus_cobblestone') + event.add('tfc:can_landslide', 'ad_astra:mercury_cobblestone') + event.add('tfc:can_landslide', 'ad_astra:glacio_cobblestone') + event.add('forge:cobblestone', 'ad_astra:moon_cobblestone') - event.add('tfc:can_start_collapse', 'ad_astra:moon_cobblestone_slab') - event.add('tfg:rock_slabs', 'ad_astra:moon_cobblestone_slab') + event.add('forge:cobblestone', 'ad_astra:mars_cobblestone') + event.add('forge:cobblestone', 'ad_astra:venus_cobblestone') + event.add('forge:cobblestone', 'ad_astra:mercury_cobblestone') + event.add('forge:cobblestone', 'ad_astra:glacio_cobblestone') + + event.add('tfc:can_landslide', 'ad_astra:moon_cobblestone_slab') + event.add('tfc:can_landslide', 'ad_astra:mars_cobblestone_slab') + event.add('tfc:can_landslide', 'ad_astra:venus_cobblestone_slab') + event.add('tfc:can_landslide', 'ad_astra:mercury_cobblestone_slab') + event.add('tfc:can_landslide', 'ad_astra:glacio_cobblestone_slab') + + event.add('tfc:can_landslide', 'ad_astra:moon_cobblestone_stairs') + event.add('tfc:can_landslide', 'ad_astra:mars_cobblestone_stairs') + event.add('tfc:can_landslide', 'ad_astra:venus_cobblestone_stairs') + event.add('tfc:can_landslide', 'ad_astra:mercury_cobblestone_stairs') + event.add('tfc:can_landslide', 'ad_astra:glacio_cobblestone_stairs') + + event.add('tfg:rock_stairs', 'ad_astra:moon_stone_stairs') + event.add('tfg:rock_stairs', 'ad_astra:mars_stone_stairs') + event.add('tfg:rock_stairs', 'ad_astra:venus_stone_stairs') + event.add('tfg:rock_stairs', 'ad_astra:mercury_stone_stairs') + event.add('tfg:rock_stairs', 'ad_astra:glacio_stone_stairs') + + event.add('tfg:rock_slabs', 'ad_astra:moon_stone_slab') + event.add('tfg:rock_slabs', 'ad_astra:mars_stone_slab') + event.add('tfg:rock_slabs', 'ad_astra:venus_stone_slab') + event.add('tfg:rock_slabs', 'ad_astra:mercury_stone_slab') + event.add('tfg:rock_slabs', 'ad_astra:glacio_stone_slab') } const registerAdAstraBiomeTags = (event) => { diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 624ec754d..6f18cbad3 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -43,7 +43,12 @@ const registerGTCEUItemTags = (event) => { event.add('tfg:stone_dusts', 'gtceu:deepslate_dust') event.add('tfg:stone_dusts', 'gtceu:blackstone_dust') event.add('tfg:stone_dusts', 'tfg:dripstone_dust') - + event.add('tfg:stone_dusts', 'tfg:moon_stone_dust') + event.add('tfg:stone_dusts', 'tfg:moon_deepslate_dust') + event.add('tfg:stone_dusts', 'tfg:mars_stone_dust') + event.add('tfg:stone_dusts', 'tfg:venus_stone_dust') + event.add('tfg:stone_dusts', 'tfg:mercury_stone_dust') + event.add('tfg:stone_dusts', 'tfg:glacio_stone_dust') event.add('tfg:stone_dusts', 'gtceu:stone_dust') //#endregion diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index c19ce1a9a..3a3d369d7 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -22,16 +22,30 @@ function registerTFGCollapseRecipes(event) { // #region Space 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:moon_deepslate', 'ad_astra:moon_deepslate') + event.recipes.tfc.collapse('ad_astra:moon_deepslate', 'tfg:rock/hardened_moon_deepslate') + 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') + + event.recipes.tfc.collapse('ad_astra:venus_cobblestone', 'ad_astra:venus_stone') + event.recipes.tfc.collapse('ad_astra:venus_cobblestone', 'tfg:rock/hardened_venus_stone') + event.recipes.tfc.landslide('ad_astra:venus_cobblestone', 'ad_astra:venus_cobblestone') + event.recipes.tfc.landslide('ad_astra:venus_sand', 'ad_astra:venus_sand') + + event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', 'ad_astra:mercury_stone') + event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', 'tfg:rock/hardened_mercury_stone') + event.recipes.tfc.landslide('ad_astra:mercury_cobblestone', 'ad_astra:mercury_cobblestone') + event.recipes.tfc.landslide('ad_astra:mercury_sand', 'ad_astra:mercury_sand') + + event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'ad_astra:glacio_stone') + event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'tfg:rock/hardened_glacio_stone') + event.recipes.tfc.landslide('ad_astra:glacio_cobblestone', 'ad_astra:glacio_cobblestone') + event.recipes.tfc.landslide('ad_astra:glacio_sand', 'ad_astra:glacio_sand') // #endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index 81fd5c3d1..1f36be6d4 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -12,7 +12,17 @@ function registerTFGRockRecipes(event) { { loose: 'tfg:brick/deepslate', block: '4x minecraft:deepslate_bricks' }, { loose: 'tfg:loose/dripstone', block: 'minecraft:dripstone_block' }, { loose: 'tfg:loose/moon_stone', block: 'ad_astra:moon_cobblestone' }, - { loose: 'tfg:loose/mars_stone', block: 'ad_astra:mars_cobblestone' } + { loose: 'tfg:brick/moon_stone', block: 'ad_astra:moon_stone_bricks' }, + { loose: 'tfg:loose/moon_deepslate', block: 'ad_astra:moon_deepslate' }, + { loose: 'tfg:loose/mars_stone', block: 'ad_astra:mars_cobblestone' }, + { loose: 'tfg:brick/mars_stone', block: 'ad_astra:mars_stone_bricks' }, + { loose: 'tfg:loose/venus_stone', block: 'ad_astra:venus_cobblestone' }, + { loose: 'tfg:brick/venus_stone', block: 'ad_astra:venus_stone_bricks' }, + { loose: 'tfg:loose/mercury_stone', block: 'ad_astra:mercury_cobblestone' }, + { loose: 'tfg:brick/mercury_stone', block: 'ad_astra:mercury_stone_bricks' }, + { loose: 'tfg:loose/glacio_stone', block: 'ad_astra:glacio_cobblestone' }, + { loose: 'tfg:brick/glacio_stone', block: 'ad_astra:glacio_stone_bricks' }, + { loose: 'tfg:loose/permafrost', block: 'ad_astra:permafrost' } ] GLUEING_TOGETHER.forEach(x => { @@ -39,7 +49,11 @@ function registerTFGRockRecipes(event) { const LOOSE_TO_BRICKS = [ { loose: 'tfg:loose/deepslate', brick: 'tfg:brick/deepslate' }, { loose: 'tfg:loose/moon_stone', brick: 'tfg:brick/moon_stone' }, - { loose: 'tfg:loose/mars_stone', brick: 'tfg:brick/mars_stone' } + { loose: 'tfg:loose/mars_stone', brick: 'tfg:brick/mars_stone' }, + { loose: 'tfg:loose/venus_stone', brick: 'tfg:brick/venus_stone' }, + { loose: 'tfg:loose/mercury_stone', brick: 'tfg:brick/mercury_stone' }, + { loose: 'tfg:loose/glacio_stone', brick: 'tfg:brick/glacio_stone' }, + { loose: 'tfg:loose/permafrost', brick: 'tfg:brick/permafrost' } ] LOOSE_TO_BRICKS.forEach(x => { @@ -63,7 +77,22 @@ function registerTFGRockRecipes(event) { { raw: 'minecraft:deepslate_tiles', polished: 'minecraft:chiseled_deepslate' }, { raw: 'minecraft:polished_blackstone_bricks', polished: 'minecraft:chiseled_polished_blackstone' }, { raw: 'minecraft:basalt', polished: 'minecraft:smooth_basalt' }, - { raw: 'minecraft:smooth_basalt', polished: 'minecraft:polished_basalt' } + { raw: 'minecraft:smooth_basalt', polished: 'minecraft:polished_basalt' }, + { raw: 'ad_astra:moon_stone', polished: 'ad_astra:polished_moon_stone' }, + { raw: 'ad_astra:moon_stone_bricks', polished: 'ad_astra:chiseled_moon_stone_bricks' }, + { raw: 'ad_astra:mars_stone', polished: 'ad_astra:polished_mars_stone' }, + { raw: 'ad_astra:mars_stone_bricks', polished: 'ad_astra:chiseled_mars_stone_bricks' }, + { raw: 'ad_astra:venus_stone', polished: 'ad_astra:polished_venus_stone' }, + { raw: 'ad_astra:venus_stone_bricks', polished: 'ad_astra:chiseled_venus_stone_bricks' }, + { raw: 'ad_astra:venus_sandstone', polished: 'ad_astra:venus_sandstone_bricks' }, + { raw: 'ad_astra:mercury_stone', polished: 'ad_astra:polished_mercury_stone' }, + { raw: 'ad_astra:mercury_stone_bricks', polished: 'ad_astra:chiseled_mercury_stone_bricks' }, + { raw: 'ad_astra:glacio_stone', polished: 'ad_astra:polished_glacio_stone' }, + { raw: 'ad_astra:glacio_stone_bricks', polished: 'ad_astra:chiseled_glacio_stone_bricks' }, + { raw: 'ad_astra:conglomerate', polished: 'ad_astra:polished_conglomerate' }, + { raw: 'ad_astra:permafrost', polished: 'ad_astra:polished_permafrost' }, + { raw: 'ad_astra:permafrost_bricks', polished: 'ad_astra:chiseled_permafrost_bricks' }, + { raw: 'ad_astra:chiseled_permafrost_bricks', polished: 'ad_astra:permafrost_tiles' } ] RAW_TO_POLISHED.forEach(x => { @@ -91,7 +120,14 @@ function registerTFGRockRecipes(event) { const CRACKING = [ { raw: 'minecraft:deepslate_bricks', cracked: 'minecraft:cracked_deepslate_bricks' }, - { raw: 'minecraft:deepslate_tiles', cracked: 'minecraft:cracked_deepslate_tiles' } + { raw: 'minecraft:deepslate_tiles', cracked: 'minecraft:cracked_deepslate_tiles' }, + { raw: 'ad_astra:moon_stone_bricks', cracked: 'ad_astra:cracked_moon_stone_bricks' }, + { raw: 'ad_astra:mars_stone_bricks', cracked: 'ad_astra:cracked_mars_stone_bricks' }, + { raw: 'ad_astra:venus_stone_bricks', cracked: 'ad_astra:cracked_venus_stone_bricks' }, + { raw: 'ad_astra:venus_sandstone_bricks', cracked: 'ad_astra:cracked_venus_sandstone_bricks' }, + { raw: 'ad_astra:mercury_stone_bricks', cracked: 'ad_astra:cracked_mercury_stone_bricks' }, + { raw: 'ad_astra:glacio_stone_bricks', cracked: 'ad_astra:cracked_glacio_stone_bricks' }, + { raw: 'ad_astra:permafrost_bricks', cracked: 'ad_astra:cracked_permafrost_bricks' } ] CRACKING.forEach(x => { @@ -119,7 +155,21 @@ function registerTFGRockRecipes(event) { { 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' } + { raw: 'tfg:rock/hardened_moon_deepslate', hammered: 'ad_astra:moon_sand' }, + { raw: 'ad_astra:mars_stone', hammered: 'ad_astra:mars_cobblestone' }, + { raw: 'tfg:rock/hardened_mars_stone', hammered: 'ad_astra:mars_cobblestone' }, + { raw: 'ad_astra:mars_cobblestone', hammered: 'ad_astra:mars_sand' }, + { raw: 'ad_astra:venus_stone', hammered: 'ad_astra:venus_cobblestone' }, + { raw: 'tfg:rock/hardened_venus_stone', hammered: 'ad_astra:venus_cobblestone' }, + { raw: 'ad_astra:venus_cobblestone', hammered: 'ad_astra:venus_sand' },, + { raw: 'ad_astra:mercury_stone', hammered: 'ad_astra:mercury_cobblestone' }, + { raw: 'tfg:rock/hardened_mercury_stone', hammered: 'ad_astra:mercury_cobblestone' }, + { raw: 'ad_astra:mercury_cobblestone', hammered: 'tfc:sand/red' }, + { raw: 'ad_astra:glacio_stone', hammered: 'ad_astra:glacio_cobblestone' }, + { raw: 'tfg:rock/hardened_glacio_stone', hammered: 'ad_astra:glacio_cobblestone' }, + { raw: 'ad_astra:glacio_cobblestone', hammered: 'tfc:sand/white' }, + { raw: 'ad_astra:conglomerate', hammered: 'tfc:rock/gravel/conglomerate' }, + { raw: 'ad_astra:permafrost', hammered: 'gtceu:ice_dust' } ] HAMMERING.forEach(x => { @@ -133,34 +183,39 @@ function registerTFGRockRecipes(event) { // slabs, stairs, walls const CUTTER = [ + // #region Nether { raw: 'minecraft:cobbled_deepslate', stair: 'minecraft:cobbled_deepslate_stairs', slab: 'minecraft:cobbled_deepslate_slab', wall: 'minecraft:cobbled_deepslate_wall', dust: 'gtceu:deepslate_dust', - loose: 'tfg:loose/deepslate' + loose: 'tfg:loose/deepslate', + stonecutting: false }, { raw: 'minecraft:polished_deepslate', stair: 'minecraft:polished_deepslate_stairs', slab: 'minecraft:polished_deepslate_slab', wall: 'minecraft:polished_deepslate_wall', - dust: 'gtceu:deepslate_dust' + dust: 'gtceu:deepslate_dust', + stonecutting: false }, { raw: 'minecraft:deepslate_bricks', stair: 'minecraft:deepslate_brick_stairs', slab: 'minecraft:deepslate_brick_slab', wall: 'minecraft:deepslate_brick_wall', - dust: 'gtceu:deepslate_dust' + dust: 'gtceu:deepslate_dust', + stonecutting: false }, { raw: 'minecraft:deepslate_tiles', stair: 'minecraft:deepslate_tile_stairs', slab: 'minecraft:deepslate_tile_slab', wall: 'minecraft:deepslate_tile_wall', - dust: 'gtceu:deepslate_dust' + dust: 'gtceu:deepslate_dust', + stonecutting: false }, { raw: 'minecraft:blackstone', @@ -168,28 +223,253 @@ function registerTFGRockRecipes(event) { slab: 'minecraft:blackstone_slab', wall: 'minecraft:blackstone_wall', dust: 'gtceu:blackstone_dust', - loose: 'beneath:blackstone_pebble' + loose: 'beneath:blackstone_pebble', + stonecutting: false }, { raw: 'minecraft:polished_blackstone', stair: 'minecraft:polished_blackstone_stairs', slab: 'minecraft:polished_blackstone_slab', wall: 'minecraft:polished_blackstone_wall', - dust: 'gtceu:blackstone_dust' + dust: 'gtceu:blackstone_dust', + stonecutting: false }, { raw: 'minecraft:polished_blackstone_bricks', stair: 'minecraft:polished_blackstone_brick_stairs', slab: 'minecraft:polished_blackstone_brick_slab', wall: 'minecraft:polished_blackstone_brick_wall', - dust: 'gtceu:blackstone_dust' - } + dust: 'gtceu:blackstone_dust', + stonecutting: false + }, + // #endregion + // #region Space + { + raw: 'ad_astra:moon_cobblestone', + stair: 'ad_astra:moon_cobblestone_stairs', + slab: 'ad_astra:moon_cobblestone_slab', + dust: 'tfg:moon_stone_dust', + loose: 'tfg:loose/moon_stone', + stonecutting: true + }, + { + raw: 'ad_astra:mars_cobblestone', + stair: 'ad_astra:mars_cobblestone_stairs', + slab: 'ad_astra:mars_cobblestone_slab', + dust: 'tfg:mars_stone_dust', + loose: 'tfg:loose/mars_stone', + stonecutting: true + }, + { + raw: 'ad_astra:venus_cobblestone', + stair: 'ad_astra:venus_cobblestone_stairs', + slab: 'ad_astra:venus_cobblestone_slab', + dust: 'tfg:venus_stone_dust', + loose: 'tfg:loose/venus_stone', + stonecutting: true + }, + { + raw: 'ad_astra:mercury_cobblestone', + stair: 'ad_astra:mercury_cobblestone_stairs', + slab: 'ad_astra:mercury_cobblestone_slab', + dust: 'tfg:mercury_stone_dust', + loose: 'tfg:loose/mercury_stone', + stonecutting: true + }, + { + raw: 'ad_astra:glacio_cobblestone', + stair: 'ad_astra:glacio_cobblestone_stairs', + slab: 'ad_astra:glacio_cobblestone_slab', + dust: 'tfg:glacio_stone_dust', + loose: 'tfg:loose/glacio_stone', + stonecutting: true + }, + { + raw: 'ad_astra:moon_stone', + stair: 'ad_astra:moon_stone_stairs', + slab: 'ad_astra:moon_stone_slab', + dust: 'tfg:moon_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:mars_stone', + stair: 'ad_astra:mars_stone_stairs', + slab: 'ad_astra:mars_stone_slab', + dust: 'tfg:mars_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:venus_stone', + stair: 'ad_astra:venus_stone_stairs', + slab: 'ad_astra:venus_stone_slab', + dust: 'tfg:venus_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:mercury_stone', + stair: 'ad_astra:mercury_stone_stairs', + slab: 'ad_astra:mercury_stone_slab', + dust: 'tfg:mercury_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:glacio_stone', + stair: 'ad_astra:glacio_stone_stairs', + slab: 'ad_astra:glacio_stone_slab', + dust: 'tfg:glacio_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:venus_sandstone_bricks', + stair: 'ad_astra:venus_sandstone_brick_stairs', + slab: 'ad_astra:venus_sandstone_brick_slab', + dust: '4x gtceu:venus_sand', + stonecutting: true + }, + { + raw: 'ad_astra:moon_stone_bricks', + stair: 'ad_astra:moon_stone_brick_stairs', + slab: 'ad_astra:moon_stone_brick_slab', + wall: 'ad_astra:moon_stone_brick_wall', + dust: 'tfg:moon_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:mars_stone_bricks', + stair: 'ad_astra:mars_stone_brick_stairs', + slab: 'ad_astra:mars_stone_brick_slab', + wall: 'ad_astra:mars_stone_brick_wall', + dust: 'tfg:mars_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:venus_stone_bricks', + stair: 'ad_astra:venus_stone_brick_stairs', + slab: 'ad_astra:venus_stone_brick_slab', + wall: 'ad_astra:venus_stone_brick_wall', + dust: 'tfg:venus_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:mercury_stone_bricks', + stair: 'ad_astra:mercury_stone_brick_stairs', + slab: 'ad_astra:mercury_stone_brick_slab', + wall: 'ad_astra:mercury_stone_brick_wall', + dust: 'tfg:mercury_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:glacio_stone_bricks', + stair: 'ad_astra:glacio_stone_brick_stairs', + slab: 'ad_astra:glacio_stone_brick_slab', + wall: 'ad_astra:glacio_stone_brick_wall', + dust: 'tfg:glacio_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:permafrost_bricks', + stair: 'ad_astra:permafrost_brick_stairs', + slab: 'ad_astra:permafrost_brick_slab', + wall: 'ad_astra:permafrost_brick_wall', + dust: 'gtceu:ice_dust', + stonecutting: true + }, + { + raw: 'ad_astra:chiseled_moon_stone_bricks', + stair: 'ad_astra:chiseled_moon_stone_stairs', + slab: 'ad_astra:chiseled_moon_stone_slab', + dust: 'tfg:moon_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:chiseled_mars_stone_bricks', + stair: 'ad_astra:chiseled_mars_stone_stairs', + slab: 'ad_astra:chiseled_mars_stone_slab', + dust: 'tfg:mars_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:chiseled_venus_stone_bricks', + stair: 'ad_astra:chiseled_venus_stone_stairs', + slab: 'ad_astra:chiseled_venus_stone_slab', + dust: 'tfg:venus_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:chiseled_mercury_stone_bricks', + stair: 'ad_astra:chiseled_mercury_stone_stairs', + slab: 'ad_astra:chiseled_mercury_stone_slab', + dust: 'tfg:mercury_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:chiseled_glacio_stone_bricks', + stair: 'ad_astra:chiseled_glacio_stone_stairs', + slab: 'ad_astra:chiseled_glacio_stone_slab', + dust: 'tfg:glacio_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:chiseled_permafrost_bricks', + stair: 'ad_astra:chiseled_permafrost_brick_stairs', + slab: 'ad_astra:chiseled_permafrost_brick_slab', + dust: 'gtceu:ice_dust', + stonecutting: true + }, + { + raw: 'ad_astra:polished_moon_stone', + stair: 'ad_astra:polished_moon_stone_stairs', + slab: 'ad_astra:polished_moon_stone_slab', + dust: 'tfg:moon_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:polished_mars_stone', + stair: 'ad_astra:polished_mars_stone_stairs', + slab: 'ad_astra:polished_mars_stone_slab', + dust: 'tfg:mars_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:polished_venus_stone', + stair: 'ad_astra:polished_venus_stone_stairs', + slab: 'ad_astra:polished_venus_stone_slab', + dust: 'tfg:venus_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:polished_mercury_stone', + stair: 'ad_astra:polished_mercury_stone_stairs', + slab: 'ad_astra:polished_mercury_stone_slab', + dust: 'tfg:mercury_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:polished_glacio_stone', + stair: 'ad_astra:polished_glacio_stone_stairs', + slab: 'ad_astra:polished_glacio_stone_slab', + dust: 'tfg:glacio_stone_dust', + stonecutting: true + }, + { + raw: 'ad_astra:polished_permafrost', + stair: 'ad_astra:polished_permafrost_stairs', + slab: 'ad_astra:polished_permafrost_slab', + dust: 'gtceu:ice_dust', + stonecutting: true + }, + // #endregion ] CUTTER.forEach(x => { if ("stair" in x) { + console.log(`STAIRS: ${x.raw} -> ${x.stair}`) + event.recipes.tfc.chisel(x.stair, x.raw, 'stair') - //event.stonecutting(x.stair, x.raw).id(`${x.raw}_to_${x.stair}`.replace(/:/g, '_')) + + if (x.stonecutting) { + event.stonecutting(x.stair, x.raw).id(`${x.raw}_to_${x.stair}`.replace(/:/g, '_')) + } event.recipes.gtceu.macerator(`macerate_${x.stair}`.replace(/:/g, '_')) .itemInputs(x.stair) @@ -203,8 +483,13 @@ function registerTFGRockRecipes(event) { } } if ("slab" in x) { + console.log(`SLAB: ${x.raw} -> ${x.stair}`) + event.recipes.tfc.chisel(x.slab, x.raw, 'slab') - //event.stonecutting(`2x ${x.slab}`, x.raw).id(`${x.raw}_to_${x.slab}`.replace(/:/g, '_')) + + if (x.stonecutting) { + event.stonecutting(`2x ${x.slab}`, x.raw).id(`${x.raw}_to_${x.slab}`.replace(/:/g, '_')) + } event.recipes.gtceu.macerator(`macerate_${x.slab}`.replace(/:/g, '_')) .itemInputs(`2x ${x.slab}`) @@ -219,7 +504,10 @@ function registerTFGRockRecipes(event) { } if ("wall" in x) { event.recipes.tfc.chisel(x.slab, x.raw, 'smooth') - //event.stonecutting(x.wall, x.raw).id(`${x.raw}_to_${x.wall}`.replace(/:/g, '_')) + + if (x.stonecutting) { + event.stonecutting(x.wall, x.raw).id(`${x.raw}_to_${x.wall}`.replace(/:/g, '_')) + } event.recipes.gtceu.macerator(`macerate_${x.wall}`.replace(/:/g, '_')) .itemInputs(x.wall) @@ -234,9 +522,39 @@ function registerTFGRockRecipes(event) { } }) + // pillars + + const PILLARS = [ + { raw: 'ad_astra:moon_stone', pillar: 'ad_astra:moon_pillar' }, + { raw: 'ad_astra:mars_stone', pillar: 'ad_astra:mars_pillar' }, + { raw: 'ad_astra:venus_stone', pillar: 'ad_astra:venus_pillar' }, + { raw: 'ad_astra:mercury_stone', pillar: 'ad_astra:mercury_pillar' }, + { raw: 'ad_astra:glacio_stone', pillar: 'ad_astra:glacio_pillar' }, + { raw: 'ad_astra:permafrost', pillar: 'ad_astra:permafrost_pillar' } + ] + + PILLARS.forEach(x => { + event.shaped(`2x ${x.pillar}`, [ + 'A', + 'A' + ], { + A: x.raw + }) + + event.stonecutting(x.pillar, x.raw).id(`${x.raw}_to_${x.pillar}`.replace(/:/g, '_')) + }) + + // macerating + const MACERATOR = [ { block: 'minecraft:deepslate', dust: 'gtceu:deepslate_dust' }, - { block: 'minecraft:dripstone_block', dust: 'tfg:dripstone_dust' } + { block: 'minecraft:dripstone_block', dust: 'tfg:dripstone_dust' }, + { block: 'ad_astra:moon_stone', dust: 'tfg:moon_stone_dust' }, + { block: 'ad_astra:mars_stone', dust: 'tfg:mars_stone_dust' }, + { block: 'ad_astra:venus_stone', dust: 'tfg:venus_stone_dust' }, + { block: 'ad_astra:mercury_stone', dust: 'tfg:mercury_stone_dust' }, + { block: 'ad_astra:glacio_stone', dust: 'tfg:glacio_stone_dust' }, + { block: 'ad_astra:permafrost', dust: 'gtceu:ice_dust' }, ] MACERATOR.forEach(x => { @@ -279,12 +597,42 @@ function registerTFGRockRecipes(event) { .EUt(7) .dimension('ad_astra:moon') + event.recipes.gtceu.rock_breaker('tfg:glacio_stone') + .notConsumable('ad_astra:glacio_stone') + .itemOutputs('ad_astra:glacio_stone') + .duration(16) + .EUt(7) + .dimension('ad_astra:moon') + 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') + + event.recipes.gtceu.rock_breaker('tfg:venus_stone') + .notConsumable('ad_astra:venus_stone') + .itemOutputs('ad_astra:venus_stone') + .duration(16) + .EUt(7) + .dimension('ad_astra:venus') + + event.recipes.gtceu.rock_breaker('tfg:mercury_stone') + .notConsumable('ad_astra:mercury_stone') + .itemOutputs('ad_astra:mercury_stone') + .duration(16) + .EUt(7) + .dimension('ad_astra:mercury') + // #endregion + + // #region sandstone + + event.recipes.gtceu.compressor('tfg:venus_sandstone') + .itemInputs('4x ad_astra:venus_sand') + .itemOutputs('ad_astra:venus_sandstone') + .duration(40*20) + .EUt(2) // #endregion } \ No newline at end of file diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index 6e07a7ef6..3fc5a94d9 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -53,8 +53,6 @@ global.AD_ASTRA_DISABLED_ITEMS = // Disabled until IV planets 'ad_astra:tier_3_rocket', - 'ad_astra:mercury_globe', - 'ad_astra:venus_globe', 'ad_astra:netherite_space_helmet', 'ad_astra:netherite_space_suit', 'ad_astra:netherite_space_pants', diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 29e2d5d64..b06869892 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -192,6 +192,9 @@ global.ORE_BEARING_STONES = [ 'moon_stone', 'moon_deepslate', - 'mars_stone' + 'mars_stone', + 'venus_stone', + 'mercury_stone', + 'glacio_stone' ]; diff --git a/kubejs/startup_scripts/tfc/materials.js b/kubejs/startup_scripts/tfc/materials.js index 296f9acc6..6814856d2 100644 --- a/kubejs/startup_scripts/tfc/materials.js +++ b/kubejs/startup_scripts/tfc/materials.js @@ -30,6 +30,12 @@ const registerTFCMaterials = (event) => { registerStoneMaterial('dripstone', 0x927965) + registerStoneMaterial('moon_stone', 0x506869) + registerStoneMaterial('moon_deepslate', 0x45474D) + registerStoneMaterial('mars_stone', 0xD08957) + registerStoneMaterial('venus_stone', 0xD5A664) + registerStoneMaterial('mercury_stone', 0x723E49) + registerStoneMaterial('glacio_stone', 0x9897BF) // Specialized icon sets for TFC's own diff --git a/kubejs/startup_scripts/tfc/tag_prefixes.js b/kubejs/startup_scripts/tfc/tag_prefixes.js index 9df1a02be..915daff1e 100644 --- a/kubejs/startup_scripts/tfc/tag_prefixes.js +++ b/kubejs/startup_scripts/tfc/tag_prefixes.js @@ -81,4 +81,25 @@ const registerTFCTagPrefixes = (event) => { .unificationEnabled(true) .materialIconType(GTMaterialIconType.ore) .generationCondition(ItemGenerationCondition.hasOreProperty) + + event.create('venus_stone', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_venus_stone').defaultBlockState()) + .baseModelLocation('ad_astra:block/venus_stone') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(ItemGenerationCondition.hasOreProperty) + + event.create('mercury_stone', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_mercury_stone').defaultBlockState()) + .baseModelLocation('ad_astra:block/mercury_stone') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(ItemGenerationCondition.hasOreProperty) + + event.create('glacio_stone', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_glacio_stone').defaultBlockState()) + .baseModelLocation('ad_astra:block/glacio_stone') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(ItemGenerationCondition.hasOreProperty) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 1d8b01238..b9339695d 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -4,8 +4,6 @@ function registerTFGSpaceBlocks(event) { const $Properties = Java.loadClass('net.minecraft.world.level.block.state.BlockBehaviour$Properties') const $SproutsBlock = Java.loadClass('net.minecraft.world.level.block.NetherSproutsBlock') - // #region Moon blocks - 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))) @@ -33,22 +31,10 @@ function registerTFGSpaceBlocks(event) { .tagBoth('forge:stone') .tagBoth('tfc:rock/hardened') .tagBlock('minecraft:mineable/pickaxe') - .mapColor('terracotta_cyan') + .mapColor('terracotta_blue') .fullBlock(true) .opaque(true) - 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/hardened_mars_stone') .stoneSoundType() .requiresTool(true) @@ -63,8 +49,73 @@ function registerTFGSpaceBlocks(event) { .fullBlock(true) .opaque(true) + event.create('tfg:rock/hardened_venus_stone') + .stoneSoundType() + .requiresTool(true) + .item(item => { + item.modelJson({ parent: 'ad_astra:item/venus_stone' }) + }) + .tagBlock('tfc:can_carve') + .tagBoth('forge:stone') + .tagBoth('tfc:rock/hardened') + .tagBlock('minecraft:mineable/pickaxe') + .mapColor('terracotta_yellow') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/hardened_mercury_stone') + .stoneSoundType() + .requiresTool(true) + .item(item => { + item.modelJson({ parent: 'ad_astra:item/mercury_stone' }) + }) + .tagBlock('tfc:can_carve') + .tagBoth('forge:stone') + .tagBoth('tfc:rock/hardened') + .tagBlock('minecraft:mineable/pickaxe') + .mapColor('terracotta_purple') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/hardened_glacio_stone') + .stoneSoundType() + .requiresTool(true) + .item(item => { + item.modelJson({ parent: 'ad_astra:item/glacio_stone' }) + }) + .tagBlock('tfc:can_carve') + .tagBoth('forge:stone') + .tagBoth('tfc:rock/hardened') + .tagBlock('minecraft:mineable/pickaxe') + .mapColor('terracotta_light_blue') + .fullBlock(true) + .opaque(true) + + 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_intrusive') + event.create('tfg:loose/mars_stone', 'tfc:loose_rock') .itemTexture('tfg:item/loose/mars_stone') .rockTypeModel('sedimentary') + event.create('tfg:loose/venus_stone', 'tfc:loose_rock') + .itemTexture('tfg:item/loose/venus_stone') + .rockTypeModel('igneous_extrusive') + + event.create('tfg:loose/mercury_stone', 'tfc:loose_rock') + .itemTexture('tfg:item/loose/mercury_stone') + .rockTypeModel('metamorphic') + + event.create('tfg:loose/glacio_stone', 'tfc:loose_rock') + .itemTexture('tfg:item/loose/glacio_stone') + .rockTypeModel('sedimentary') + + event.create('tfg:loose/permafrost', 'tfc:loose_rock') + .itemTexture('tfg:item/loose/permafrost') + .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 8df128eb3..9e56b2107 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -24,12 +24,17 @@ global.EXTRATERRESTRIAL_RAW_ROCKS = [ 'ad_astra:moon_deepslate', 'ad_astra:mars_stone', 'ad_astra:venus_stone', - 'ad_astra:mercury_stone' + 'ad_astra:mercury_stone', + 'ad_astra:glacio_stone' ] global.EXTRATERRESTRIAL_HARDENED_ROCKS = [ 'tfg:rock/hardened_moon_stone', - 'tfg:rock/hardened_mars_stone' + 'tfg:rock/hardened_moon_deepslate', + 'tfg:rock/hardened_mars_stone', + 'tfg:rock/hardened_venus_stone', + 'tfg:rock/hardened_mercury_stone', + 'tfg:rock/hardened_glacio_stone', ] global.MOON_BIOMES = [ diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index eecaf8231..2774ccb12 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -49,18 +49,18 @@ const registerTFGItems = (event) => { // #region Stone bricks and dusts event.create('tfg:brick/deepslate') .translationKey('item.tfg.brick.deepslate') - event.create('tfg:brick/moon_stone') .translationKey('item.tfg.brick.moon_stone') - event.create('tfg:brick/mars_stone') .translationKey('item.tfg.brick.mars_stone') - - event.create('tfg:dust/moon_stone') - .translationKey('item.tfg.dust.moon_stone') - - event.create('tfg:dust/mars_stone') - .translationKey('item.tfg.dust.mars_stone') + event.create('tfg:brick/venus_stone') + .translationKey('item.tfg.brick.venus_stone') + event.create('tfg:brick/mercury_stone') + .translationKey('item.tfg.brick.mercury_stone') + event.create('tfg:brick/glacio_stone') + .translationKey('item.tfg.brick.glacio_stone') + event.create('tfg:brick/permafrost') + .translationKey('item.tfg.brick.permafrost') // #endregion // #region Primitive rubber gloves