From f860056940de5b847585fd9cdab7597f9b39b77f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 25 Jul 2025 01:31:25 +0100 Subject: [PATCH] Mars grass and water (#1437) * mars grass and water and all that fun stuff * removing the heavy water --- .../tfg/blockstates/grass/amber_mycelium.json | 256 + .../tfg/blockstates/grass/mars_dirt.json | 21 + .../blockstates/grass/rusticus_mycelium.json | 283 + .../blockstates/grass/sangnum_mycelium.json | 221 + .../semiheavy_ammoniacal_water.json | 7 + kubejs/assets/tfg/lang/en_us.json | 15 +- .../block/grass/amber_mycelium_side_1.json | 8 + .../block/grass/amber_mycelium_side_2.json | 8 + .../block/grass/amber_mycelium_side_3.json | 8 + .../block/grass/amber_mycelium_top.json | 27 + .../tfg/models/block/grass/mars_dirt.json | 6 + .../block/grass/mars_dirt_snowy_side.json | 6 + .../block/grass/rusticus_mycelium_side_1.json | 8 + .../block/grass/rusticus_mycelium_side_2.json | 8 + .../block/grass/rusticus_mycelium_top_1.json | 7 + .../block/grass/rusticus_mycelium_top_2.json | 7 + .../block/grass/sangnum_mycelium_side.json | 8 + .../block/grass/sangnum_mycelium_top.json | 7 + .../block/semiheavy_ammoniacal_water.json | 5 + .../tfg/models/item/grass/amber_mycelium.json | 36 + .../tfg/models/item/grass/mars_dirt.json | 3 + .../models/item/grass/rusticus_mycelium.json | 36 + .../models/item/grass/sangnum_mycelium.json | 36 + .../tfg/textures/block/grass/amber_side_1.png | Bin 0 -> 678 bytes .../tfg/textures/block/grass/amber_side_2.png | Bin 0 -> 676 bytes .../tfg/textures/block/grass/amber_side_3.png | Bin 0 -> 660 bytes .../tfg/textures/block/grass/amber_top.png | Bin 0 -> 450 bytes .../tfg/textures/block/grass/mars_dirt.png | Bin 0 -> 4790 bytes .../textures/block/grass/rusticus_side_1.png | Bin 0 -> 652 bytes .../textures/block/grass/rusticus_side_2.png | Bin 0 -> 621 bytes .../textures/block/grass/rusticus_top_1.png | Bin 0 -> 194 bytes .../textures/block/grass/rusticus_top_2.png | Bin 0 -> 197 bytes .../tfg/textures/block/grass/sangnum_side.png | Bin 0 -> 728 bytes .../tfg/textures/block/grass/sangnum_top.png | Bin 0 -> 540 bytes kubejs/data/ad_astra/dimension/mars.json | 20456 ++++++++-------- .../{martian_hills.json => amber_hills.json} | 0 ...martian_forests.json => amber_plains.json} | 0 .../worldgen/biome/mars/martian_river.json | 74 + .../worldgen/biome/mars/rusticus_hills.json | 75 + ...rtian_plains.json => rusticus_plains.json} | 0 .../worldgen/biome/mars/sangnum_hills.json | 75 + .../worldgen/biome/mars/sangnum_plains.json | 78 + .../mars/semiheavy_ammoniacal_water.json | 8 + .../density_function/mars/offset.json | 2 +- .../worldgen/noise_settings/mars_noise.json | 1360 +- .../mars/semiheavy_ammoniacal_water.json | 24 + kubejs/server_scripts/ad_astra/tags.js | 5 +- kubejs/server_scripts/tfg/recipes.collapse.js | 5 + kubejs/server_scripts/tfg/tags.js | 25 +- kubejs/startup_scripts/tfg/blocks.js | 350 +- kubejs/startup_scripts/tfg/fluids.js | 5 - 51 files changed, 12766 insertions(+), 10803 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/grass/amber_mycelium.json create mode 100644 kubejs/assets/tfg/blockstates/grass/mars_dirt.json create mode 100644 kubejs/assets/tfg/blockstates/grass/rusticus_mycelium.json create mode 100644 kubejs/assets/tfg/blockstates/grass/sangnum_mycelium.json create mode 100644 kubejs/assets/tfg/blockstates/semiheavy_ammoniacal_water.json create mode 100644 kubejs/assets/tfg/models/block/grass/amber_mycelium_side_1.json create mode 100644 kubejs/assets/tfg/models/block/grass/amber_mycelium_side_2.json create mode 100644 kubejs/assets/tfg/models/block/grass/amber_mycelium_side_3.json create mode 100644 kubejs/assets/tfg/models/block/grass/amber_mycelium_top.json create mode 100644 kubejs/assets/tfg/models/block/grass/mars_dirt.json create mode 100644 kubejs/assets/tfg/models/block/grass/mars_dirt_snowy_side.json create mode 100644 kubejs/assets/tfg/models/block/grass/rusticus_mycelium_side_1.json create mode 100644 kubejs/assets/tfg/models/block/grass/rusticus_mycelium_side_2.json create mode 100644 kubejs/assets/tfg/models/block/grass/rusticus_mycelium_top_1.json create mode 100644 kubejs/assets/tfg/models/block/grass/rusticus_mycelium_top_2.json create mode 100644 kubejs/assets/tfg/models/block/grass/sangnum_mycelium_side.json create mode 100644 kubejs/assets/tfg/models/block/grass/sangnum_mycelium_top.json create mode 100644 kubejs/assets/tfg/models/block/semiheavy_ammoniacal_water.json create mode 100644 kubejs/assets/tfg/models/item/grass/amber_mycelium.json create mode 100644 kubejs/assets/tfg/models/item/grass/mars_dirt.json create mode 100644 kubejs/assets/tfg/models/item/grass/rusticus_mycelium.json create mode 100644 kubejs/assets/tfg/models/item/grass/sangnum_mycelium.json create mode 100644 kubejs/assets/tfg/textures/block/grass/amber_side_1.png create mode 100644 kubejs/assets/tfg/textures/block/grass/amber_side_2.png create mode 100644 kubejs/assets/tfg/textures/block/grass/amber_side_3.png create mode 100644 kubejs/assets/tfg/textures/block/grass/amber_top.png create mode 100644 kubejs/assets/tfg/textures/block/grass/mars_dirt.png create mode 100644 kubejs/assets/tfg/textures/block/grass/rusticus_side_1.png create mode 100644 kubejs/assets/tfg/textures/block/grass/rusticus_side_2.png create mode 100644 kubejs/assets/tfg/textures/block/grass/rusticus_top_1.png create mode 100644 kubejs/assets/tfg/textures/block/grass/rusticus_top_2.png create mode 100644 kubejs/assets/tfg/textures/block/grass/sangnum_side.png create mode 100644 kubejs/assets/tfg/textures/block/grass/sangnum_top.png rename kubejs/data/tfg/worldgen/biome/mars/{martian_hills.json => amber_hills.json} (100%) rename kubejs/data/tfg/worldgen/biome/mars/{martian_forests.json => amber_plains.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/biome/mars/martian_river.json create mode 100644 kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json rename kubejs/data/tfg/worldgen/biome/mars/{martian_plains.json => rusticus_plains.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json create mode 100644 kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json diff --git a/kubejs/assets/tfg/blockstates/grass/amber_mycelium.json b/kubejs/assets/tfg/blockstates/grass/amber_mycelium.json new file mode 100644 index 000000000..492612761 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/grass/amber_mycelium.json @@ -0,0 +1,256 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/amber_mycelium_top", + "x": 90 + } + }, + { + "when": { + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/amber_mycelium_top", + "x": 270, + "y": 90 + }, + { + "model": "tfg:block/grass/amber_mycelium_top", + "x": 270 + }, + { + "model": "tfg:block/grass/amber_mycelium_top", + "x": 270, + "y": 180 + }, + { + "model": "tfg:block/grass/amber_mycelium_top", + "x": 270, + "y": 270 + } + ] + }, + { + "when": { + "snowy": true + }, + "apply": [ + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 90 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 180 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 270 + } + ] + }, + { + "when": { + "north": true, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_mycelium_top" + } + }, + { + "when": { + "east": true, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_mycelium_top", + "y": 90 + } + }, + { + "when": { + "south": true, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_mycelium_top", + "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_mycelium_top", + "y": 270 + } + }, + { + "when": { + "north": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top" + } + }, + { + "when": { + "east": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 90 + } + }, + { + "when": { + "south": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 270 + } + }, + { + "when": { + "north": false, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/amber_mycelium_side_1" + }, + { + "model": "tfg:block/grass/amber_mycelium_side_2" + }, + { + "model": "tfg:block/grass/amber_mycelium_side_3" + } + ] + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/amber_mycelium_side_1", + "y": 90 + }, + { + "model": "tfg:block/grass/amber_mycelium_side_2", + "y": 90 + }, + { + "model": "tfg:block/grass/amber_mycelium_side_3", + "y": 90 + } + ] + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/amber_mycelium_side_1", + "y": 180 + }, + { + "model": "tfg:block/grass/amber_mycelium_side_2", + "y": 180 + }, + { + "model": "tfg:block/grass/amber_mycelium_side_3", + "y": 180 + } + ] + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/amber_mycelium_side_1", + "y": 270 + }, + { + "model": "tfg:block/grass/amber_mycelium_side_2", + "y": 270 + }, + { + "model": "tfg:block/grass/amber_mycelium_side_3", + "y": 270 + } + ] + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 270 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/grass/mars_dirt.json b/kubejs/assets/tfg/blockstates/grass/mars_dirt.json new file mode 100644 index 000000000..70ecbec7e --- /dev/null +++ b/kubejs/assets/tfg/blockstates/grass/mars_dirt.json @@ -0,0 +1,21 @@ +{ + "variants": { + "": [ + { + "model": "tfg:block/grass/mars_dirt" + }, + { + "model": "tfg:block/grass/mars_dirt", + "y": 90 + }, + { + "model": "tfg:block/grass/mars_dirt", + "y": 180 + }, + { + "model": "tfg:block/grass/mars_dirt", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/grass/rusticus_mycelium.json b/kubejs/assets/tfg/blockstates/grass/rusticus_mycelium.json new file mode 100644 index 000000000..a33c06a2c --- /dev/null +++ b/kubejs/assets/tfg/blockstates/grass/rusticus_mycelium.json @@ -0,0 +1,283 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "x": 90 + } + }, + { + "when": { + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "x": 270, + "y": 90 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "x": 270 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "x": 270, + "y": 180 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "x": 270, + "y": 270 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_2", + "x": 270, + "y": 90 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_2", + "x": 270 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_2", + "x": 270, + "y": 180 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_2", + "x": 270, + "y": 270 + } + ] + }, + { + "when": { + "snowy": true + }, + "apply": [ + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 90 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 180 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 270 + } + ] + }, + { + "when": { + "north": true, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_top_1" + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_2" + } + ] + }, + { + "when": { + "east": true, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "y": 90 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_2", + "y": 90 + } + ] + }, + { + "when": { + "south": true, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "y": 180 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_2", + "y": 180 + } + ] + }, + { + "when": { + "west": true, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "y": 270 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_top_2", + "y": 270 + } + ] + }, + { + "when": { + "north": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top" + } + }, + { + "when": { + "east": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 90 + } + }, + { + "when": { + "south": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 270 + } + }, + { + "when": { + "north": false, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_side_1" + }, + { + "model": "tfg:block/grass/rusticus_mycelium_side_2" + } + ] + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_side_1", + "y": 90 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_side_2", + "y": 90 + } + ] + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_side_1", + "y": 180 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_side_2", + "y": 180 + } + ] + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/rusticus_mycelium_side_1", + "y": 270 + }, + { + "model": "tfg:block/grass/rusticus_mycelium_side_2", + "y": 270 + } + ] + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 270 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/grass/sangnum_mycelium.json b/kubejs/assets/tfg/blockstates/grass/sangnum_mycelium.json new file mode 100644 index 000000000..eeb37da68 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/grass/sangnum_mycelium.json @@ -0,0 +1,221 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top", + "x": 90 + } + }, + { + "when": { + "snowy": false + }, + "apply": [ + { + "model": "tfg:block/grass/sangnum_mycelium_top", + "x": 270, + "y": 90 + }, + { + "model": "tfg:block/grass/sangnum_mycelium_top", + "x": 270 + }, + { + "model": "tfg:block/grass/sangnum_mycelium_top", + "x": 270, + "y": 180 + }, + { + "model": "tfg:block/grass/sangnum_mycelium_top", + "x": 270, + "y": 270 + } + ] + }, + { + "when": { + "snowy": true + }, + "apply": [ + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 90 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 180 + }, + { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "x": 270, + "y": 270 + } + ] + }, + { + "when": { + "north": true, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top" + } + }, + { + "when": { + "east": true, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top", + "y": 90 + } + }, + { + "when": { + "south": true, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top", + "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top", + "y": 270 + } + }, + { + "when": { + "north": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top" + } + }, + { + "when": { + "east": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 90 + } + }, + { + "when": { + "south": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": true + }, + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 270 + } + }, + { + "when": { + "north": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_side" + } + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_side", + "y": 90 + } + + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_side", + "y": 180 + } + + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_side", + "y": 270 + } + + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_dirt_snowy_side", + "y": 270 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/semiheavy_ammoniacal_water.json b/kubejs/assets/tfg/blockstates/semiheavy_ammoniacal_water.json new file mode 100644 index 000000000..16293b69d --- /dev/null +++ b/kubejs/assets/tfg/blockstates/semiheavy_ammoniacal_water.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/fluid/semiheavy_ammoniacal_water" + } + } +} \ 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 2ac0094af..143cf58dc 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -296,13 +296,14 @@ "block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator", "block.tfg.superconductor_coil_large": "Large Superconductor Coil", "block.tfg.superconductor_coil_small": "Small Superconductor Coil", - "tfg:nether_slurry": "Nether Slurry", - "tfg:enriched_nether_slurry": "Enriched Nether Slurry", - "tfg:ender_slurry": "Ender Slurry", - "tfg:enriched_ender_slurry": "Enriched Ender Slurry", - "tfg:semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", - "tfg:sulfur_fumes": "Sulfur Fumes", - "tfg:super_heated_slurry": "Super Heated Slurry", + "fluid.tfg.nether_slurry": "Nether Slurry", + "fluid.tfg.enriched_nether_slurry": "Enriched Nether Slurry", + "fluid.tfg.ender_slurry": "Ender Slurry", + "fluid.tfg.enriched_ender_slurry": "Enriched Ender Slurry", + "fluid.tfg.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", + "fluid.tfg.heavy_water": "Heavy Water", + "fluid.tfg.sulfur_fumes": "Sulfur Fumes", + "fluid.tfg.super_heated_slurry": "Super Heated Slurry", "item.tfg.antipoison_pill": "Antipoison Pill", "item.tfg.haste_pill": "Haste Pill", "item.tfg.night_vision_pill": "Night Vision Pill", diff --git a/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_1.json b/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_1.json new file mode 100644 index 000000000..bfb4c765d --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_1.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_dirt", + "overlay": "tfg:block/grass/amber_side_1", + "particle": "tfg:block/grass/amber_side_1" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_2.json b/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_2.json new file mode 100644 index 000000000..39c37fa6f --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_2.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_dirt", + "overlay": "tfg:block/grass/amber_side_2", + "particle": "tfg:block/grass/amber_side_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_3.json b/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_3.json new file mode 100644 index 000000000..1e71138aa --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/amber_mycelium_side_3.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_dirt", + "overlay": "tfg:block/grass/amber_side_3", + "particle": "tfg:block/grass/amber_side_3" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/amber_mycelium_top.json b/kubejs/assets/tfg/models/block/grass/amber_mycelium_top.json new file mode 100644 index 000000000..6f6ccea9b --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/amber_mycelium_top.json @@ -0,0 +1,27 @@ +{ + "parent": "block/block", + "textures": { + "overlay": "tfg:block/grass/amber_top", + "particle": "tfg:block/grass/amber_top" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 0 + ], + "faces": { + "north": { + "texture": "#overlay", + "cullface": "north" + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/mars_dirt.json b/kubejs/assets/tfg/models/block/grass/mars_dirt.json new file mode 100644 index 000000000..bb240938d --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/mars_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/grass/mars_dirt" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/mars_dirt_snowy_side.json b/kubejs/assets/tfg/models/block/grass/mars_dirt_snowy_side.json new file mode 100644 index 000000000..332dd9835 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/mars_dirt_snowy_side.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/grass_snowy_side", + "textures": { + "texture": "tfg:block/grass/mars_dirt" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_side_1.json b/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_side_1.json new file mode 100644 index 000000000..bef471ab6 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_side_1.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_dirt", + "overlay": "tfg:block/grass/rusticus_side_1", + "particle": "tfg:block/grass/rusticus_side_1" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_side_2.json b/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_side_2.json new file mode 100644 index 000000000..1ce8295c5 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_side_2.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_dirt", + "overlay": "tfg:block/grass/rusticus_side_2", + "particle": "tfg:block/grass/rusticus_side_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_top_1.json b/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_top_1.json new file mode 100644 index 000000000..ee4f06f09 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_top_1.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/grass_top", + "textures": { + "overlay": "tfg:block/grass/rusticus_top_1", + "particle": "tfg:block/grass/rusticus_top_1" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_top_2.json b/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_top_2.json new file mode 100644 index 000000000..1be4ea162 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/rusticus_mycelium_top_2.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/grass_top", + "textures": { + "overlay": "tfg:block/grass/rusticus_top_2", + "particle": "tfg:block/grass/rusticus_top_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/sangnum_mycelium_side.json b/kubejs/assets/tfg/models/block/grass/sangnum_mycelium_side.json new file mode 100644 index 000000000..66be91d17 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/sangnum_mycelium_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_dirt", + "overlay": "tfg:block/grass/sangnum_side", + "particle": "tfg:block/grass/sangnum_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/sangnum_mycelium_top.json b/kubejs/assets/tfg/models/block/grass/sangnum_mycelium_top.json new file mode 100644 index 000000000..9fda23833 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/sangnum_mycelium_top.json @@ -0,0 +1,7 @@ +{ + "parent": "tfc:block/grass_top", + "textures": { + "overlay": "tfg:block/grass/sangnum_top", + "particle": "tfg:block/grass/sangnum_top" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/semiheavy_ammoniacal_water.json b/kubejs/assets/tfg/models/block/semiheavy_ammoniacal_water.json new file mode 100644 index 000000000..f298cabc3 --- /dev/null +++ b/kubejs/assets/tfg/models/block/semiheavy_ammoniacal_water.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "minecraft:block/water_still" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/grass/amber_mycelium.json b/kubejs/assets/tfg/models/item/grass/amber_mycelium.json new file mode 100644 index 000000000..7ec055dbc --- /dev/null +++ b/kubejs/assets/tfg/models/item/grass/amber_mycelium.json @@ -0,0 +1,36 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "0": "tfg:block/grass/mars_dirt", + "1": "tfg:block/grass/amber_side_1", + "2": "tfg:block/grass/amber_top", + "particle": "#2" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "texture": "#1" + }, + "east": { + "texture": "#1" + }, + "south": { + "texture": "#1" + }, + "west": { + "texture": "#1" + }, + "up": { + "texture": "#2" + }, + "down": { + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/grass/mars_dirt.json b/kubejs/assets/tfg/models/item/grass/mars_dirt.json new file mode 100644 index 000000000..4839b278c --- /dev/null +++ b/kubejs/assets/tfg/models/item/grass/mars_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/grass/mars_dirt" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/grass/rusticus_mycelium.json b/kubejs/assets/tfg/models/item/grass/rusticus_mycelium.json new file mode 100644 index 000000000..795350fbe --- /dev/null +++ b/kubejs/assets/tfg/models/item/grass/rusticus_mycelium.json @@ -0,0 +1,36 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "0": "tfg:block/grass/mars_dirt", + "1": "tfg:block/grass/rusticus_side_1", + "2": "tfg:block/grass/rusticus_top_1", + "particle": "#2" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "texture": "#1" + }, + "east": { + "texture": "#1" + }, + "south": { + "texture": "#1" + }, + "west": { + "texture": "#1" + }, + "up": { + "texture": "#2" + }, + "down": { + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/grass/sangnum_mycelium.json b/kubejs/assets/tfg/models/item/grass/sangnum_mycelium.json new file mode 100644 index 000000000..9feca48ba --- /dev/null +++ b/kubejs/assets/tfg/models/item/grass/sangnum_mycelium.json @@ -0,0 +1,36 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "0": "tfg:block/grass/mars_dirt", + "1": "tfg:block/grass/sangnum_side", + "2": "tfg:block/grass/sangnum_top", + "particle": "#2" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "texture": "#1" + }, + "east": { + "texture": "#1" + }, + "south": { + "texture": "#1" + }, + "west": { + "texture": "#1" + }, + "up": { + "texture": "#2" + }, + "down": { + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/grass/amber_side_1.png b/kubejs/assets/tfg/textures/block/grass/amber_side_1.png new file mode 100644 index 0000000000000000000000000000000000000000..3be4db86739e8121a066af8a3ad4ff2425c7e0af GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_q`GPZ!4!i{8*ld-E;_h#arq>MNw~)_1w)!m-epl|sBqU6UF&h04xwe8d_dxc
  • uZbNU^esV-~67-&Hewk{?6uaUk|@q`=t8JA)U*w zSsHpzF+FfRf8z8Lu8l9|`=-v5;+*uPTIcH`37Mmk)2b#ejZ+ElF#Ke+*ur_8K=;2_ zPq++E9SA(YY4GXO|L|IV1zA4jK>H9a;{uT-fpZpaTRib*NapP8PLB=*&WLwu%Kc%S zAeMGAXVsxc8s`>-Y%W%@XRWiItRb4R>ZT>b<<~8Na}M&RJMhieT$sM|70aAm-XaZ+ ziwj=qX`0VBemD0Hud}K3ao+Tta;ra9R)=^KMV_y;Vq{=n&lli#SC!%RTs{V`zmn7c z$}{Xx+*A9#?F9dZQ|wb-SIJQOy`xq>bTZ?Mo5HiM zS=m-Mh5B9Ieth1F_R9<>Z(Yiadae0bHsY%3B85r@y{n~+VWu-57q`z^xRlE+(dG0S zgE?$2C!JLGCt2B*GgQo}W;t;6O`G^`e})N*QXEgON$9uDYIECucR}V_?hUI>ZaKrH zyZO-7H*R0}_s0vca-OQ4xk~Nvx7vrI4?bOZp1Qqp)yWWUt;3lLH>$s>{5>YRBi(<; zth*fCzpJffK3Q)y^IN<2Q&&?<-tNXLo7Eqgu8wi}xqC@!*p2(Q1+&)Z&duB1sHJ_Q zz9uAAI7@YP%n`Zj6`LkitxMZ@TyCO#hr(h7&+a|Q+m22WQ%mvv4FO#n#UFj@cr literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/grass/amber_side_2.png b/kubejs/assets/tfg/textures/block/grass/amber_side_2.png new file mode 100644 index 0000000000000000000000000000000000000000..781185261215b1087d4de05db719cc4d672f4dbe GIT binary patch literal 676 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_q`uPZ!4!i{8>nXZ>zFh_u?vB)>VP;rTgSWO0Qc=N+xCDPb3615Yno{f+e(L+tm` zUs88NMYESEDQfNXh?NlKGBhjf>UCE%jP=Pqxai*8kGAFejKAyE*6lB2R}h-(X?0v& zO1GBH;cNioj3uA{XNfAT4!hX7Vj;8fEn8s*)h>a~K7A9jEXk@!4`r+4!mV46_2w*a z5&XVCCjF|G%B3aKTdxGnnai&As&avy!{=7EgZup)d-P2Xxy&k7l5{*QF4d*Kg?;BC zmj~QGjjw+_o8D7@ti#3q^@}y8DQ^$#a+HiP&yby4cK(RCRQ|oaYCbH9N(F~|F23ss zt(7!CGh<2d6b+@-VVN(D_sMDN)ZTe@XYZ{OT|VL3(h_S$8Q!=}JwBJ~rHNXv_?z0B zi{q|kzTCWM=Odf?gAZRSpJNs^KT|MoTj3k4zS!g3N|!QwUbiyzl)3YtI5t`0YTWt< zb;2#3ItFKi+>SnZmD81cy>Raa1xpJX&8%U z#cR23@nvs@u&=2M>yGM1&-Qr10R=Q<6`Qd`@9XsxRb=ujv^X6Blbw_gr z6VrDeXH++eQdn$RCfi^VXCPA&_(}Yn<`sL%+SMn|m91Z}@wzq-du-37uJ74hfri{s zNAp5HHgPOgxqdTat;plkFE3R%TJ>(cuKj7#`*hZ&Su<2Q7Q`A`TJ2quZ_2&s_lce7 hxPQ%cj1OYy7$3O>)6 zPg)4}JTVF_=Hp=KIoZ-3a5sOaGF)Wm3&e^FZzVLzOs&%uN9+q1DP**S4^x)(B?)hlSVt;oN zZ|*zR-s_gG`4M=`W8Ea}_^SW!&gM?Kr#`ReUs7l|!;XJt%Ni?Jyw=~w`Q?C(;sI@I zo4T+kSq4WpaWmA|ObqdLP8T|>^7_EN*R~98k0lP@*0}V=i(yudXznD7rw2 zP0CRFXeGO6Q*)~Li?8}CcW&EcFiUmIE77*cGuq4cZ1UQFeLqXW-I^t9PD;n+*$2M% zy~Mh}H9+WZS#^N}@@A-)dM_7yFKkD%F3C&R@mnhh@+G Rz`(%3;OXk;vd$@?2>`%FCzb#J literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/grass/amber_top.png b/kubejs/assets/tfg/textures/block/grass/amber_top.png new file mode 100644 index 0000000000000000000000000000000000000000..b36de850dfa3f66553d03549b0375f16d170f214 GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_s6wPZ!4!jft_7&aPVQAkeyhqLbH|Lv0BH@9wg0+H>CUy@kHm39}aMro9&;OnT2O z+H=-m-Imu^UVeVO-hRJ*d-1*9dbYXuiZWcHZ|`2$bun!2cAGiI58f}nY7|xb(yw8g z*oDf|IYME~U;o}+ex$)^QuK}05{-LbN91miYGCOJYk&5CCBu48hGnT+c3m&oId6fV ze{;$F*V0^PE;Bjke&5NIzVy1uoX>orJqs32yjURJ9yK9u^5WPt`^%h_kN;#z*&nZW zJy`Vdy;7TL7qjHNGeV-JqjE&UBaVL0o)mp!>)Fu6QoH(`tJhWLExsJPPF+4!t||M4 zX>Zu>YZp4QH-xU1;P%N04cmP_bUn{=n+e|Td)4+|3uC=Ab;``|u~t%NlP$_**gWfI zSDN|&gyZrn7S7l|<&Ut%o zU66^}Z+9bP0 Hl+XkKAKc9d literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/grass/mars_dirt.png b/kubejs/assets/tfg/textures/block/grass/mars_dirt.png new file mode 100644 index 0000000000000000000000000000000000000000..8ff05bee91967cba28d13e3d2da9915d80adf7fa GIT binary patch literal 4790 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s74pxOklmsP~D-;yvr)B1( zDwI?fq$;FVWTr7NRNTr9h~{Hf)cmb^G?_y@y?z zg%=xc{=s15&-PAjmElI-RNs^+rQpM7#6IQwt3Tkq9u_I2|71-f0|R4Arn7T^r?WH6 zGYkwBb808rdK`9;IT|0lR7q5jyGtWwgjEu)q_WCRyVI!;HYcZ!R^FdggY1enCm>^eRR{; z`}rP!nIu(DMLYF*CNG+f^v6t(t$Q3(67gWBqVnWf>U@ITNBO2%&zQz5o&qdF<>eajT-N|@~Guhgi>n_W<%6NMya0(h_X)I>q7K}0t@>!B$|LmcB;UCYU zlTWmoCnht7u9zTW|3m)IyK6c={yRMnN?iDxbX)$hLxOn5wcOvoZ)}^b-tb>?$E92U zvY2Q5R@r;++97v`|7Hb+cdtFMeNe}1OnC3`zAn+mIn+=ATHl0=1y+?>2(s|s5su(?)w#a19;eI*63l9Fs& zr3l{u1?T*tR0R_~6Fmc6*NV(CBPBa71)HLjG^-#NH>eRsDQUJ!86_nJR{Hwo<>h+i z#(Mch>H3D2mX`VkM*2oZxJ9 zL6DxATL9Kokz0VGvLrJN5m+d`0m*>9gY1xs+yc0{D5_z82P+1Lk(En+aw*7po-VdZ zAp5OS@{==DtRPH-)YPODb0b|t3$s*R6LX6c-9%%{WL*<;)6^u>WJ7a{6muk_JoAc6 z67!N%K}J>N7U*SWrdU}Tm{=qw8Kvr)nwpsDnwX~<=q4o^8tWRHnkSiu)S78XXjiAiQgx{1lj#wHe)X(owg z7GR@NlC9kGi*gf7Y?U%|6Vp@m3-Z#z5}*LLat!daRWi~uK!^n7B$lM*7vFnYA%q9v=466YD<~*{vxQY+GQ?gVn|Ih zNJ=y?HrGuxG)mGnF-BaeJCFO}lsgCKXc_p?= z?wPp-;ILBAfJT)js%y$KQbF-xU}UOmV6F=fG7~c;eTesL^g$&C%(piB7~ug?fK?k)_MK=947qYoGu7&r?&B8wRq zxP?KOkzv*x2?hoR_7YEDSN50e;)42mf${4t85o$nJY5_^EKY|`_RYKHAacC^pj&F! z#Ggi;ErOd*C{0UJ+~~3Ev|v@kyanMeBCEPRY+1OMOz}9kh}*qUqvmmvmB)i+-JR|) z*VyDg`}z0(e)IQFzTKXF{bB{5!)hH4z1u5PSRIy1GF;wz?{uH{pD8akzwy|AeW^k0 z@|JzauO5}uvKG4QFJZICK*mN{rn_RJ;*K2S+nNlY_uiH7c&C12xoLaVZPQTyY(6b( zrBmD1-CDC~(iE?i9)G4NGyxE&? z`UxKOPT9Qby``9$!_KdP>@n>R?}-OX`) zQK*>D^_45-j(YPN`u9Cjz5VxK#EzYI=_eL%+jikvQJmJEu18Bv#@mI@6NzX z?&D3Za*Hlj_`RrhyI6hlr(L_mQE#T359B+z<#_i>Zd<{?z`&Op;hE;^%b>-;z`y|- W2Vh`exD-4Y#PW3Yb6Mw<&;$Ss2K?6m literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/grass/rusticus_side_1.png b/kubejs/assets/tfg/textures/block/grass/rusticus_side_1.png new file mode 100644 index 0000000000000000000000000000000000000000..de9e80b28cb2b655d09a0a72961359a27deb3d40 GIT binary patch literal 652 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_mZOPZ!4!i{9Kx2mNk4NVM#~5iPw~Bj@Q7MK1<<0ii{T9o$nVJmCDrRXg$C@1QB( zeYO`kloS;ew{Z#x7+NTHb#9z2*E8MYZCu#z_h;Vx`Ja>b1Aop%5%>8Yw=~anW#GB3TYQUmX8iKI0xzXJ%-c(f89clngzD_+a&?@+@=r(9 z!fM|lg){XGm(C{cPMx*3P|HAFLzl7P?KDA2OJ)X-_=Mf5eSPaAVz+#a4b$eB>}Q@h z+q&mW8C%9yb(X+0NA^EYNdLG$C9`w8*)oYsLKV`>*iydDTD$RGaIA{YpK7i{DbF|a zE-0VqSJ{?TuE7z^uOt2JTbFaXO(S>ob>qJ6iOY0Z{!LlFHc0AzOw7!)r(Zc~eR7+! zuJM&C%RipQ#`7{Jy>hJ(^=@9O%CSgdy+-gxjk<1&;|6{KdpRDLnfe#M{M)=D?nr8> zVy$kM-;9uAC&)OW=*`5<-g(EYM#d|%05Z2whFD1pI|bL@y3^!dE2}gB7TRy z+A8!ls`L5u@L2nwrQVk!)V_Z{zWwITPanI4)boYkzn=4<{r7UgMEh&+7!Cy<%1h>b9P=~kthU#Y0XgY%M`O#URY5;AQ;#kRQZ;)ckbj_i!}FzH z=AuEWVj5b4f#F*@JUctOlh^Djd^@8xd-94iX(r|SexKc&zD{g^eQ=9oWBtq^-Sx>r zY~D*QF>*AkCeFJ0J#bp_j{6J_+oznqsgYPZw^wM%rHNk7TD%OITzmRDuN!7^H5+Jn zH7|b5J?qd8^$A{wgY?w@zP^-jG+-7JgZIu3t(`&)Cma$qr!RiYT_zP)8-8@wp$ES; z();JX2)#LVfqjI)GRf|QQxEGN?>~7-q&!#W;!@2IWxY`WQ_C;yU-z3Of+cv?p@jb{ zSp(izdG1_sS3AKs@y@|3FZjhGPOUw=S|Xrnn{PMWaJbU)`()X6mGc#bdsR;rooUwdoU{32 zu3}qV!}V!bes9;@dt6WYu2}eE%YQmcw%q(AlZ$`Djjx+~eHs3|YzyiPmgq4%9yQ@b$RQU93!> xJ@jQ_`=0I1uNx0#6z_>RW_=~^^qXyVTE$FmN8&$hWME)m@O1TaS?83{1OWC;Ns9mg literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/grass/rusticus_top_2.png b/kubejs/assets/tfg/textures/block/grass/rusticus_top_2.png new file mode 100644 index 0000000000000000000000000000000000000000..43d50bce963918d2385c3f290903f1ce06a3131e GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUvzJRmo2K|pcrnXi>)ZhSBW2&rZb|d*%30vYYZ~z?D%K(Gwa(o|+g|0B zrN7YiJGn>V#YE{4=grp+y^x8y5^Mc@-Cbti2Bx;J0oC~o3=9mOu6{1-oD!M<-@8ab literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/grass/sangnum_side.png b/kubejs/assets/tfg/textures/block/grass/sangnum_side.png new file mode 100644 index 0000000000000000000000000000000000000000..b856fcba16f5f722b783b67962a1e1a47d49bce5 GIT binary patch literal 728 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_q`sPZ!4!jfu7sZ8L-uC652!yL(CP{dqf0%KthD7gcB)I(hacZRILmxl&Y+-QG)` zJ$I_pLawION){HD9RUZI?&z4kh%YZ`;}-8|rDan$`zB3(HYuiR=MfcOnYfeRZ2mug z{Jp;7me`?(zPH&nB;IE9>dg{ucvF%!W!sk(ix?6#uLm(^OnLUYl!0NNIG0b(Rwjwh zKP?z?vO@wR5`!+A&2{bG zw&M>YjC>h(W=;K6voGv1(-b}NZicib$D1$zL~0r4_k2sr)?TGyeDJ}t-0Ue#59agn z@x^u4#Pn3M9(-IdXRbuuzto>QRBBJ8T+@BM?mqv6NSnI)ygv{8_C~J%{5)pe{*OK7 zUtSz~ROK@1U&S2rxu+&22F#m3uXo>{Jwcf!ZThY*3;&+{z5aNN-n&pGMu*Tl{qlD! z=K8dSSmsGcEj@iS$;bTNy*|B}&yFoOW!M~?oFAn5?&03<&$n+g6nTC=c*kPmk=78d z17BAkUiIjk%p|pSbAJYE2~LdnedBl6>b_b1^P*)Tav#c;e-5ks|6lmt-oIw%wTY%1 zxgR*RGarasTK369o}tb}h~wMIs%;OZ#2(G z)%x%17t>Y<1U;RRx1wuyM~z-4(}m5f4A$DuR(8zqsPR|#e6G9AZkaUG?in35KIY%F zOw%$`G&VHdf4L|0+%?9Q5J`udxB6TD#`u`uSg~qHYf|!o+qOm`2^v?`T@TeA;{LVG zQ)Oc0gOH`UQP%8ic literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/grass/sangnum_top.png b/kubejs/assets/tfg/textures/block/grass/sangnum_top.png new file mode 100644 index 0000000000000000000000000000000000000000..5598ba17268ac39bdc8081a577d8a17ae05e1695 GIT binary patch literal 540 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_s7+o-U3d8WVjdozA))AkbDXdv}qt;2Q4$#axezjOl_I;rF&#uk|jkYuyvJ@ce`D zf^Ctfwy;ETOj9*~ktQ3vYevC`p#L)^YmNV}{~J+z?<#M@nyi-N{LAGWGNLFJG8@QDy6aZ5GQ4 zzZBHFD=|#FcaK5i>4dkRk33zN8>m^hu8Fnb?EB|Ie2=ueV%F7v)o(psUb;AwL&tda ztNcfgAKT?0pD3|uRo?N9vzM*0iL(~}wftym!pz;fG^6PgytM%Os2Q%MG{=Ssts>^sm24PgE0H22WsQ`3$-Z4dT0^nTnCD75mndGA^8x_2gb v3q*Cy^eqLAM32SZ6=?R-ds*VU^;La!wdNzIx3b&}3=9mOu6{1-oD!M { event.add('ad_astra:mars_stone_replaceables', 'tfc:sand/black') event.add('ad_astra:mars_stone_replaceables', 'tfc:sand/red') event.add('ad_astra:mars_stone_replaceables', 'tfc:sand/pink') - + + event.add('tfc:can_carve', '#ad_astra:moon_stone_replaceables') + event.add('tfc:can_carve', '#ad_astra:mars_stone_replaceables') event.add('minecraft:rabbits_spawnable_on', '#ad_astra:moon_stone_replaceables') event.add('species:limpet_spawnable_on', '#ad_astra:moon_stone_replaceables') @@ -265,7 +267,6 @@ const registerAdAstraBlockTags = (event) => { event.add('tfg:rock_slabs', 'ad_astra:glacio_stone_slab') event.add('ad_astra:destroyed_in_space', '#minecraft:saplings') - event.remove('ad_astra:destroyed_in_space', 'ad_astra:glacian_leaves') } const registerAdAstraBiomeTags = (event) => { diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index 2d1fefc91..48501107c 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -58,5 +58,10 @@ function registerTFGCollapseRecipes(event) { event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', 'gtceu:red_granite') event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', 'tfg:rock/hardened_red_granite') event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', '#forge:ores_in_ground/red_granite') + + event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/mars_dirt') + event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/amber_mycelium') + event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/rusticus_mycelium') + event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/sangnum_mycelium') // #endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 667b30fb3..6f37981ea 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -244,6 +244,12 @@ const registerTFGItemTags = (event) => { // #region Space blocks event.add('tfg:moon_plants', 'tfg:lunar_roots') event.add('tfg:moon_plants', 'tfg:lunar_sprouts') + + event.add('minecraft:dirt', 'tfg:grass/mars_dirt') + event.add('tfc:dirt', 'tfg:grass/mars_dirt') + event.add('tfc:grass', 'tfg:grass/amber_mycelium') + event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') + event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') // #endregion // #region 0.7.19 -> 0.9 conversion @@ -356,8 +362,8 @@ const registerTFGBlockTags = (event) => { event.add('tfc:crops', 'tfg:sunflower') event.add('tfc:mineable_with_sharp_tool','tfg:sunflower') - // #region Nether blocks + // #region Nether blocks event.add('minecraft:nether_carver_replaceables', 'tfg:rock/hardened_deepslate') event.add('minecraft:moss_replaceable', 'tfg:rock/hardened_deepslate') event.add('minecraft:base_stone_nether', 'tfg:rock/hardened_deepslate') @@ -376,6 +382,22 @@ const registerTFGBlockTags = (event) => { event.add('minecraft:nether_carver_replaceables', 'tfg:rock/hardened_dripstone') event.add('minecraft:base_stone_nether', 'tfg:rock/hardened_dripstone') event.add('tfc:rock/hardened', 'tfg:rock/hardened_dripstone') + // #endregion + + // #region Mars blocks + event.add('minecraft:dirt', 'tfg:grass/mars_dirt') + event.add('tfc:dirt', 'tfg:grass/mars_dirt') + event.add('tfc:grass', 'tfg:grass/amber_mycelium') + event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') + event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/amber_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/rusticus_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/sangnum_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/mars_dirt') + event.add('tfc:can_landslide', 'tfg:grass/amber_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/rusticus_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/sangnum_mycelium') + // #endregion event.add('tfg:harvester_harvestable', '#tfc:fruit_tree_leaves') event.add('tfg:harvester_harvestable', '#tfc:berry_bushes') @@ -388,7 +410,6 @@ const registerTFGBlockTags = (event) => { event.add('forge:mineable/wrench', 'tfg:superconductor_coil_small') event.add('forge:mineable/wrench', 'tfg:electromagnetic_accelerator') - // #endregion } //#endregion diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 760696f4d..feab89736 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -1,175 +1,175 @@ -"use strict"; - -const registerTFGBlocks = (event) => { - - registerTFGNetherBlocks(event) - registerTFGSpaceBlocks(event) - registerTFGSupportBlocks(event) - registerTFGCrops(event) - - event.create('tfg:artificial_end_portal_frame') - .stoneSoundType() - .tagBlock('minecraft:mineable/pickaxe') - .requiresTool(true) - .fullBlock(true) - .item(item => { - item.modelJson({ parent: 'minecraft:block/end_portal_frame' }) - }) - - event.create('tfg:dry_ice', 'tfg:particle_emitter') - .textureAll('tfg:block/dry_ice') - .soundType('bone_block') - .hardness(1) - .resistance(1) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('tfcambiental:cold_stuff') - .defaultTranslucent() - .mapColor('color_white') - .speedFactor(1.2) - .particleOffset(1, 1, 1) - .particleVelocity(0.05, 0, 0.05) - .particle('minecraft:campfire_cosy_smoke') - .particleCount(2) - .particleForced(false) - - // #region Machine Casings - - global.TFG_MACHINE_CASINGS.forEach(type => { - event.create(`tfg:casings/${type}`) - .translationKey(`block.tfg.casings.${type}`) - .model(`tfg:block/casings/${type}`) - .soundType('copper') - .hardness(5) - .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor('color_light_gray') - }) - - //#endregion - - // #region Decorative vases - global.MINECRAFT_DYE_NAMES.forEach(color => { - event.create(`tfg:decorative_vase/generated/${color}`, 'cardinal') - .model(`tfg:block/decorative_vase/loot_vase_${color}`) - .soundType('decorated_pot') - .hardness(0.7) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .box(2, 0, 2, 14, 20, 14) - .fullBlock(false) - .opaque(false) - .renderType('cutout') - - event.create(`tfg:decorative_vase/${color}`, 'cardinal') - .model(`tfg:block/decorative_vase/vase_${color}`) - .soundType('decorated_pot') - .hardness(0.7) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .box(2, 0, 2, 14, 20, 14) - .fullBlock(false) - .opaque(false) - .renderType('cutout') - .blockEntity(be => { - be.attach('tfc:inventory', { - width: 9, - height: 1, - size: size => size.isSmallerThan('large') - }) - be.rightClickOpensInventory() - }) - - event.create(`tfg:decorative_vase/unfired/${color}`, 'cardinal') - .model(`tfg:block/decorative_vase/vase_unfired_${color}`) - .soundType('decorated_pot') - .hardness(0.7) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .box(2, 0, 2, 14, 20, 14) - .fullBlock(false) - .opaque(false) - .renderType('cutout') - }) - event.create('tfg:decorative_vase', 'cardinal') - .model('tfg:block/decorative_vase/vase') - .soundType('decorated_pot') - .hardness(0.7) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_gray`) - .box(2, 0, 2, 14, 20, 14) - .fullBlock(false) - .opaque(false) - .renderType('cutout') - .blockEntity(be => { - be.attach('tfc:inventory', { - width: 9, - height: 1, - size: size => size.isSmallerThan('large') - }) - be.rightClickOpensInventory() - }) - - event.create('tfg:decorative_vase/unfired', 'cardinal') - .model('tfg:block/decorative_vase/vase_unfired') - .soundType('decorated_pot') - .hardness(0.7) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_gray`) - .box(2, 0, 2, 14, 20, 14) - .fullBlock(false) - .opaque(false) - .renderType('cutout') - - // #endregion - - // #region Layer blocks - - event.create('tfg:ash_pile', 'tfg:layer_block') - .existingItem('tfc:powder/wood_ash') - .mapColor('color_light_gray') - - event.create('tfg:pile/black_sand', 'tfg:layer_block') - .existingItem('tfc:sand/black') - - event.create('tfg:pile/brown_sand', 'tfg:layer_block') - .existingItem('tfc:sand/brown') - - event.create('tfg:pile/green_sand', 'tfg:layer_block') - .existingItem('tfc:sand/green') - - event.create('tfg:pile/pink_sand', 'tfg:layer_block') - .existingItem('tfc:sand/pink') - - event.create('tfg:pile/red_sand', 'tfg:layer_block') - .existingItem('tfc:sand/red') - - event.create('tfg:pile/white_sand', 'tfg:layer_block') - .existingItem('tfc:sand/white') - - event.create('tfg:pile/yellow_sand', 'tfg:layer_block') - .existingItem('tfc:sand/yellow') - - event.create('tfg:pile/mars_sand', 'tfg:layer_block') - .existingItem('ad_astra:mars_sand') - - event.create('tfg:pile/moon_sand', 'tfg:layer_block') - .existingItem('ad_astra:moon_sand') - - event.create('tfg:pile/venus_sand', 'tfg:layer_block') - .existingItem('ad_astra:venus_sand') - - - // #endregion - - // #region Deprecated - - event.create('treetap:tap') - .requiresTool(false) - .textureAll('tfg:item/deprecated') - - event.create('tfcea:refrigerator') - .requiresTool(false) - .textureAll('tfg:item/deprecated') - - // #endregion -} +"use strict"; + +const registerTFGBlocks = (event) => { + + registerTFGNetherBlocks(event) + registerTFGSpaceBlocks(event) + registerTFGSupportBlocks(event) + registerTFGCrops(event) + + event.create('tfg:artificial_end_portal_frame') + .stoneSoundType() + .tagBlock('minecraft:mineable/pickaxe') + .requiresTool(true) + .fullBlock(true) + .item(item => { + item.modelJson({ parent: 'minecraft:block/end_portal_frame' }) + }) + + event.create('tfg:dry_ice', 'tfg:particle_emitter') + .textureAll('tfg:block/dry_ice') + .soundType('bone_block') + .hardness(1) + .resistance(1) + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('tfcambiental:cold_stuff') + .defaultTranslucent() + .mapColor('color_white') + .speedFactor(1.2) + .particleOffset(1, 1, 1) + .particleVelocity(0.05, 0, 0.05) + .particle('minecraft:campfire_cosy_smoke') + .particleCount(2) + .particleForced(false) + + // #region Machine Casings + + global.TFG_MACHINE_CASINGS.forEach(type => { + event.create(`tfg:casings/${type}`) + .translationKey(`block.tfg.casings.${type}`) + .model(`tfg:block/casings/${type}`) + .soundType('copper') + .hardness(5) + .resistance(6) + .tagBlock('minecraft:mineable/pickaxe') + .mapColor('color_light_gray') + }) + + //#endregion + + // #region Decorative vases + global.MINECRAFT_DYE_NAMES.forEach(color => { + event.create(`tfg:decorative_vase/generated/${color}`, 'cardinal') + .model(`tfg:block/decorative_vase/loot_vase_${color}`) + .soundType('decorated_pot') + .hardness(0.7) + .tagBlock('minecraft:mineable/pickaxe') + .mapColor(`color_${color}`) + .box(2, 0, 2, 14, 20, 14) + .fullBlock(false) + .opaque(false) + .renderType('cutout') + + event.create(`tfg:decorative_vase/${color}`, 'cardinal') + .model(`tfg:block/decorative_vase/vase_${color}`) + .soundType('decorated_pot') + .hardness(0.7) + .tagBlock('minecraft:mineable/pickaxe') + .mapColor(`color_${color}`) + .box(2, 0, 2, 14, 20, 14) + .fullBlock(false) + .opaque(false) + .renderType('cutout') + .blockEntity(be => { + be.attach('tfc:inventory', { + width: 9, + height: 1, + size: size => size.isSmallerThan('large') + }) + be.rightClickOpensInventory() + }) + + event.create(`tfg:decorative_vase/unfired/${color}`, 'cardinal') + .model(`tfg:block/decorative_vase/vase_unfired_${color}`) + .soundType('decorated_pot') + .hardness(0.7) + .tagBlock('minecraft:mineable/pickaxe') + .mapColor(`color_${color}`) + .box(2, 0, 2, 14, 20, 14) + .fullBlock(false) + .opaque(false) + .renderType('cutout') + }) + event.create('tfg:decorative_vase', 'cardinal') + .model('tfg:block/decorative_vase/vase') + .soundType('decorated_pot') + .hardness(0.7) + .tagBlock('minecraft:mineable/pickaxe') + .mapColor(`color_gray`) + .box(2, 0, 2, 14, 20, 14) + .fullBlock(false) + .opaque(false) + .renderType('cutout') + .blockEntity(be => { + be.attach('tfc:inventory', { + width: 9, + height: 1, + size: size => size.isSmallerThan('large') + }) + be.rightClickOpensInventory() + }) + + event.create('tfg:decorative_vase/unfired', 'cardinal') + .model('tfg:block/decorative_vase/vase_unfired') + .soundType('decorated_pot') + .hardness(0.7) + .tagBlock('minecraft:mineable/pickaxe') + .mapColor(`color_gray`) + .box(2, 0, 2, 14, 20, 14) + .fullBlock(false) + .opaque(false) + .renderType('cutout') + + // #endregion + + // #region Layer blocks + + event.create('tfg:ash_pile', 'tfg:layer_block') + .existingItem('tfc:powder/wood_ash') + .mapColor('color_light_gray') + + event.create('tfg:pile/black_sand', 'tfg:layer_block') + .existingItem('tfc:sand/black') + + event.create('tfg:pile/brown_sand', 'tfg:layer_block') + .existingItem('tfc:sand/brown') + + event.create('tfg:pile/green_sand', 'tfg:layer_block') + .existingItem('tfc:sand/green') + + event.create('tfg:pile/pink_sand', 'tfg:layer_block') + .existingItem('tfc:sand/pink') + + event.create('tfg:pile/red_sand', 'tfg:layer_block') + .existingItem('tfc:sand/red') + + event.create('tfg:pile/white_sand', 'tfg:layer_block') + .existingItem('tfc:sand/white') + + event.create('tfg:pile/yellow_sand', 'tfg:layer_block') + .existingItem('tfc:sand/yellow') + + event.create('tfg:pile/mars_sand', 'tfg:layer_block') + .existingItem('ad_astra:mars_sand') + + event.create('tfg:pile/moon_sand', 'tfg:layer_block') + .existingItem('ad_astra:moon_sand') + + event.create('tfg:pile/venus_sand', 'tfg:layer_block') + .existingItem('ad_astra:venus_sand') + + + // #endregion + + // #region Deprecated + + event.create('treetap:tap') + .requiresTool(false) + .textureAll('tfg:item/deprecated') + + event.create('tfcea:refrigerator') + .requiresTool(false) + .textureAll('tfg:item/deprecated') + + // #endregion +} diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index 195cb2301..6e2670ff9 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -32,11 +32,6 @@ const registerTFGFluids = (event) => { .noBlock() //#region Mars - event.create('tfg:semiheavy_ammoniacal_water') - .thinTexture(0x704f786c) - .color(0x4f786c) - .temperature(213) - .renderType('translucent') //#endregion //#region Venus