diff --git a/defaultconfigs/createhorsepower-server.toml b/defaultconfigs/createhorsepower-server.toml index 185b86f0a..1b2676355 100644 --- a/defaultconfigs/createhorsepower-server.toml +++ b/defaultconfigs/createhorsepower-server.toml @@ -17,9 +17,9 @@ #Path Category [paths] #Types of blocks valid as "Poor" quality, - poor_path_block = ["tfc:rooted_dirt/sandy_loam", "tfc:clay/sandy_loam", "tfc:dirt/sandy_loam", "tfc:rooted_dirt/loam", "tfc:clay/loam", "tfc:clay/silt", "tfc:dirt/loam", "tfc:rooted_dirt/silt", "tfc:dirt/silt", "tfc:dirt/silty_loam", "tfc:clay/silty_loam", "tfc:rooted_dirt/silty_loam", "tfc:peat_grass", "tfc:clay_grass/silty_loam", "tfc:grass/silty_loam", "tfc:clay_grass/sandy_loam", "tfc:grass/sandy_loam", "tfc:clay_grass/loam", "tfc:grass/loam", "tfc:clay_grass/silt", "tfc:grass/silt", "tfg:grass/mars_dirt", "tfg:grass/sangnum_mycelium", "tfg:grass/amber_mycelium", "tfg:grass/rusticus_mycelium"] + poor_path_block = ["tfc:rooted_dirt/sandy_loam", "tfc:clay/sandy_loam", "tfc:dirt/sandy_loam", "tfc:rooted_dirt/loam", "tfc:clay/loam", "tfc:clay/silt", "tfc:dirt/loam", "tfc:rooted_dirt/silt", "tfc:dirt/silt", "tfc:dirt/silty_loam", "tfc:clay/silty_loam", "tfc:rooted_dirt/silty_loam", "tfc:peat_grass", "tfc:clay_grass/silty_loam", "tfc:grass/silty_loam", "tfc:clay_grass/sandy_loam", "tfc:grass/sandy_loam", "tfc:clay_grass/loam", "tfc:grass/loam", "tfc:clay_grass/silt", "tfc:grass/silt", "tfg:grass/mars_dirt", "tfg:grass/sangnum_mycelium", "tfg:grass/amber_mycelium", "tfg:grass/rusticus_mycelium", "tfg:grass/sangnum_clay_mycelium", "tfg:grass/amber_clay_mycelium", "tfg:grass/rusticus_clay_mycelium", "tfg:grass/sangnum_kaolin_mycelium", "tfg:grass/amber_kaolin_mycelium", "tfg:grass/rusticus_kaolin_mycelium"] #Types of blocks valid as "Normal" quality, - normal_path_block = ["tfc:rock/gravel/granite", "tfc:rock/gravel/diorite", "tfc:rock/gravel/gabbro", "tfc:rock/gravel/shale", "tfc:rock/gravel/claystone", "tfc:rock/gravel/limestone", "tfc:rock/gravel/conglomerate", "tfc:rock/gravel/dolomite", "tfc:rock/gravel/chert", "tfc:rock/gravel/schist", "tfc:rock/gravel/phyllite", "tfc:rock/gravel/slate", "tfc:rock/gravel/quartzite", "tfc:rock/gravel/dacite", "tfc:rock/gravel/andesite", "tfc:rock/gravel/basalt", "tfc:rock/gravel/rhyolite", "tfc:rock/gravel/chalk", "tfc:rock/gravel/marble", "tfg:rock/gravel_dripstone", "tfg:rock/gravel_deepslate", "tfg:rock/gravel_blackstone", "tfg:rock/gravel_moon", "tfg:rock/gravel_moon_deepslate", "tfg:rock/gravel_glacio", "tfg:rock/gravel_mars", "tfg:rock/gravel_venus", "tfg:rock/gravel_mercury", "tfg:rock/gravel_crackrack", "tfc:grass_path/silt", "tfc:grass_path/loam", "tfc:grass_path/sandy_loam", "tfc:grass_path/silty_loam", "rnr:hoggin"] + normal_path_block = ["tfc:rock/gravel/granite", "tfc:rock/gravel/diorite", "tfc:rock/gravel/gabbro", "tfc:rock/gravel/shale", "tfc:rock/gravel/claystone", "tfc:rock/gravel/limestone", "tfc:rock/gravel/conglomerate", "tfc:rock/gravel/dolomite", "tfc:rock/gravel/chert", "tfc:rock/gravel/schist", "tfc:rock/gravel/phyllite", "tfc:rock/gravel/slate", "tfc:rock/gravel/quartzite", "tfc:rock/gravel/dacite", "tfc:rock/gravel/andesite", "tfc:rock/gravel/basalt", "tfc:rock/gravel/rhyolite", "tfc:rock/gravel/chalk", "tfc:rock/gravel/marble", "tfg:rock/gravel_dripstone", "tfg:rock/gravel_deepslate", "tfg:rock/gravel_blackstone", "tfg:rock/gravel_moon", "tfg:rock/gravel_moon_deepslate", "tfg:rock/gravel_glacio", "tfg:rock/gravel_mars", "tfg:rock/gravel_venus", "tfg:rock/gravel_mercury", "tfg:rock/gravel_crackrack", "tfc:grass_path/silt", "tfc:grass_path/loam", "tfc:grass_path/sandy_loam", "tfc:grass_path/silty_loam", "tfg:grass/mars_path", "rnr:hoggin"] #Types of blocks valid as "Great" quality, great_path_block = ["rnr:rock/gravel_road/chert", "rnr:rock/gravel_road/chalk", "rnr:rock/gravel_road/rhyolite", "rnr:rock/gravel_road/basalt", "rnr:rock/gravel_road/andesite", "rnr:rock/gravel_road/claystone", "rnr:rock/gravel_road/limestone", "rnr:rock/gravel_road/conglomerate", "rnr:rock/gravel_road/dolomite", "rnr:rock/sett_road/granite", "rnr:rock/sett_road/diorite", "rnr:rock/sett_road/chalk", "rnr:rock/sett_road/rhyolite", "rnr:rock/sett_road/basalt", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/sett_road/andesite", "rnr:rock/cobbled_road/chert", "rnr:rock/cobbled_road/dolomite", "rnr:rock/gravel_road/granite", "rnr:rock/gravel_road/marble", "rnr:rock/gravel_road/schist", "rnr:rock/gravel_road/phyllite", "rnr:rock/gravel_road/slate", "rnr:rock/gravel_road/quartzite", "rnr:rock/gravel_road/dacite", "rnr:rock/macadam_road/rhyolite", "rnr:rock/macadam_road/chalk", "rnr:rock/macadam_road/chert", "rnr:rock/macadam_road/dolomite", "rnr:rock/macadam_road/conglomerate", "rnr:rock/macadam_road/limestone", "rnr:rock/macadam_road/gabbro", "rnr:rock/macadam_road/claystone", "rnr:rock/macadam_road/shale", "rnr:rock/macadam_road/gneiss", "rnr:rock/macadam_road/marble", "rnr:rock/macadam_road/schist", "rnr:rock/macadam_road/phyllite", "rnr:rock/macadam_road/slate", "rnr:rock/macadam_road/quartzite", "rnr:rock/macadam_road/dacite", "rnr:rock/macadam_road/andesite", "rnr:rock/macadam_road/basalt", "rnr:rock/gravel_road/diorite", "rnr:rock/gravel_road/gabbro", "rnr:rock/gravel_road/shale", "rnr:rock/macadam_road/diorite", "rnr:rock/macadam_road/granite", "rnr:rock/cobbled_road/conglomerate", "rnr:rock/cobbled_road/limestone", "rnr:rock/cobbled_road/claystone", "rnr:rock/cobbled_road/shale", "rnr:rock/cobbled_road/gabbro", "rnr:rock/cobbled_road/diorite", "rnr:rock/cobbled_road/granite", "rnr:rock/cobbled_road/phyllite", "rnr:rock/cobbled_road/schist", "rnr:rock/cobbled_road/slate", "rnr:rock/cobbled_road/quartzite", "rnr:rock/cobbled_road/dacite", "rnr:rock/cobbled_road/andesite", "rnr:rock/cobbled_road/rhyolite", "rnr:rock/cobbled_road/basalt", "rnr:rock/cobbled_road/chalk", "rnr:rock/cobbled_road/gneiss", "rnr:rock/cobbled_road/marble", "rnr:rock/sett_road/chert", "rnr:rock/sett_road/dolomite", "rnr:rock/sett_road/conglomerate", "rnr:rock/sett_road/limestone", "rnr:rock/sett_road/claystone", "rnr:rock/sett_road/shale", "rnr:rock/sett_road/gabbro", "rnr:rock/flagstones/gneiss", "rnr:rock/flagstones/marble", "rnr:black_sandstone_flagstones", "rnr:brown_sandstone_flagstones", "rnr:green_sandstone_flagstones", "rnr:pink_sandstone_flagstones", "rnr:red_sandstone_flagstones", "rnr:white_sandstone_flagstones", "rnr:yellow_sandstone_flagstones", "rnr:concrete_road_sett", "rnr:brick_road", "rnr:rock/sett_road/marble", "rnr:rock/sett_road/gneiss", "rnr:rock/sett_road/schist", "rnr:rock/sett_road/phyllite", "rnr:rock/sett_road/slate", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/flagstones/chert", "rnr:rock/flagstones/dolomite", "rnr:rock/flagstones/conglomerate", "rnr:rock/flagstones/limestone", "rnr:rock/flagstones/claystone", "rnr:rock/flagstones/shale", "rnr:rock/flagstones/gabbro", "rnr:rock/flagstones/diorite", "rnr:rock/flagstones/granite", "rnr:rock/flagstones/schist", "rnr:rock/flagstones/phyllite", "rnr:rock/flagstones/slate", "rnr:rock/flagstones/quartzite", "rnr:rock/flagstones/andesite", "rnr:rock/flagstones/dacite", "rnr:rock/flagstones/basalt", "rnr:rock/flagstones/rhyolite", "rnr:rock/flagstones/chalk"] diff --git a/kubejs/assets/tfg/blockstates/grass/amber_clay_mycelium.json b/kubejs/assets/tfg/blockstates/grass/amber_clay_mycelium.json index 03f7d4d1b..c381cd13b 100644 --- a/kubejs/assets/tfg/blockstates/grass/amber_clay_mycelium.json +++ b/kubejs/assets/tfg/blockstates/grass/amber_clay_mycelium.json @@ -1,24 +1,221 @@ { - "variants": { - "snowy=false": [ - { - "model": "tfg:block/grass/amber_clay" + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/amber_mycelium_top", + "x": 90 + } + }, + { + "when": { + "snowy": false }, - { - "model": "tfg:block/grass/amber_clay", + "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 }, - { - "model": "tfg:block/grass/amber_clay", + "apply": { + "model": "tfg:block/grass/amber_mycelium_top", "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": false }, - { - "model": "tfg:block/grass/amber_clay", + "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_clay_mycelium_side" + } + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_clay_mycelium_side", + "y": 90 + } + + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_clay_mycelium_side", + "y": 180 + } + + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_clay_mycelium_side", + "y": 270 + } + + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", "y": 270 } - ], - "snowy=true": { - "model": "tfg:block/grass/mars_snowy_clay" } - } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/grass/amber_kaolin_mycelium.json b/kubejs/assets/tfg/blockstates/grass/amber_kaolin_mycelium.json index 883367b79..414f95464 100644 --- a/kubejs/assets/tfg/blockstates/grass/amber_kaolin_mycelium.json +++ b/kubejs/assets/tfg/blockstates/grass/amber_kaolin_mycelium.json @@ -1,24 +1,221 @@ { - "variants": { - "snowy=false": [ - { - "model": "tfg:block/grass/amber_kaolin" + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/amber_mycelium_top", + "x": 90 + } + }, + { + "when": { + "snowy": false }, - { - "model": "tfg:block/grass/amber_kaolin", + "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 }, - { - "model": "tfg:block/grass/amber_kaolin", + "apply": { + "model": "tfg:block/grass/amber_mycelium_top", "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": false }, - { - "model": "tfg:block/grass/amber_kaolin", + "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_kaolin_mycelium_side" + } + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_kaolin_mycelium_side", + "y": 90 + } + + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_kaolin_mycelium_side", + "y": 180 + } + + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/amber_kaolin_mycelium_side", + "y": 270 + } + + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", "y": 270 } - ], - "snowy=true": { - "model": "tfg:block/grass/snowy_kaolin" } - } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/grass/mars_path.json b/kubejs/assets/tfg/blockstates/grass/mars_path.json new file mode 100644 index 000000000..6720ae4ef --- /dev/null +++ b/kubejs/assets/tfg/blockstates/grass/mars_path.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "tfg:block/grass/mars_path" }, + { "model": "tfg:block/grass/mars_path", "y": 90 }, + { "model": "tfg:block/grass/mars_path", "y": 180 }, + { "model": "tfg:block/grass/mars_path", "y": 270 } + ] + } +} diff --git a/kubejs/assets/tfg/blockstates/grass/rusticus_clay_mycelium.json b/kubejs/assets/tfg/blockstates/grass/rusticus_clay_mycelium.json index 5bd374511..afeed89fb 100644 --- a/kubejs/assets/tfg/blockstates/grass/rusticus_clay_mycelium.json +++ b/kubejs/assets/tfg/blockstates/grass/rusticus_clay_mycelium.json @@ -1,24 +1,260 @@ { - "variants": { - "snowy=false": [ - { - "model": "tfg:block/grass/rusticus_clay" + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "x": 90 + } + }, + { + "when": { + "snowy": false }, - { - "model": "tfg:block/grass/rusticus_clay", + "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 }, - { - "model": "tfg:block/grass/rusticus_clay", + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": true }, - { - "model": "tfg:block/grass/rusticus_clay", + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 270 + } + }, + { + "when": { + "north": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/rusticus_clay_mycelium_side" + } + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/rusticus_clay_mycelium_side", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/rusticus_clay_mycelium_side", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/rusticus_clay_mycelium_side", + "y": 270 + } + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", "y": 270 } - ], - "snowy=true": { - "model": "tfg:block/grass/mars_snowy_clay" } - } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/grass/rusticus_kaolin_mycelium.json b/kubejs/assets/tfg/blockstates/grass/rusticus_kaolin_mycelium.json index 9bc921e64..ac428fb05 100644 --- a/kubejs/assets/tfg/blockstates/grass/rusticus_kaolin_mycelium.json +++ b/kubejs/assets/tfg/blockstates/grass/rusticus_kaolin_mycelium.json @@ -1,24 +1,260 @@ { - "variants": { - "snowy=false": [ - { - "model": "tfg:block/grass/rusticus_kaolin" + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/rusticus_mycelium_top_1", + "x": 90 + } + }, + { + "when": { + "snowy": false }, - { - "model": "tfg:block/grass/rusticus_kaolin", + "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 }, - { - "model": "tfg:block/grass/rusticus_kaolin", + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": true }, - { - "model": "tfg:block/grass/rusticus_kaolin", + "apply": { + "model": "tfc:block/grass/sandy_loam/snowy_top", + "y": 270 + } + }, + { + "when": { + "north": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/rusticus_kaolin_mycelium_side" + } + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/rusticus_kaolin_mycelium_side", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/rusticus_kaolin_mycelium_side", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/rusticus_kaolin_mycelium_side", + "y": 270 + } + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", "y": 270 } - ], - "snowy=true": { - "model": "tfg:block/grass/snowy_kaolin" } - } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/grass/sangnum_clay_mycelium.json b/kubejs/assets/tfg/blockstates/grass/sangnum_clay_mycelium.json index 468453bbf..177108ecb 100644 --- a/kubejs/assets/tfg/blockstates/grass/sangnum_clay_mycelium.json +++ b/kubejs/assets/tfg/blockstates/grass/sangnum_clay_mycelium.json @@ -1,24 +1,221 @@ { - "variants": { - "snowy=false": [ - { - "model": "tfg:block/grass/sangnum_clay" + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top", + "x": 90 + } + }, + { + "when": { + "snowy": false }, - { - "model": "tfg:block/grass/sangnum_clay", + "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 }, - { - "model": "tfg:block/grass/sangnum_clay", + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top", "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": false }, - { - "model": "tfg:block/grass/sangnum_clay", + "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_clay_mycelium_side" + } + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_clay_mycelium_side", + "y": 90 + } + + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_clay_mycelium_side", + "y": 180 + } + + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_clay_mycelium_side", + "y": 270 + } + + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/mars_snowy_clay", "y": 270 } - ], - "snowy=true": { - "model": "tfg:block/grass/mars_snowy_clay" } - } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/grass/sangnum_kaolin_mycelium.json b/kubejs/assets/tfg/blockstates/grass/sangnum_kaolin_mycelium.json index d5c147c43..d9886b321 100644 --- a/kubejs/assets/tfg/blockstates/grass/sangnum_kaolin_mycelium.json +++ b/kubejs/assets/tfg/blockstates/grass/sangnum_kaolin_mycelium.json @@ -1,24 +1,221 @@ { - "variants": { - "snowy=false": [ - { - "model": "tfg:block/grass/sangnum_kaolin" + "multipart": [ + { + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top", + "x": 90 + } + }, + { + "when": { + "snowy": false }, - { - "model": "tfg:block/grass/sangnum_kaolin", + "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 }, - { - "model": "tfg:block/grass/sangnum_kaolin", + "apply": { + "model": "tfg:block/grass/sangnum_mycelium_top", "y": 180 + } + }, + { + "when": { + "west": true, + "snowy": false }, - { - "model": "tfg:block/grass/sangnum_kaolin", + "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_kaolin_mycelium_side" + } + }, + { + "when": { + "east": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_kaolin_mycelium_side", + "y": 90 + } + + }, + { + "when": { + "south": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_kaolin_mycelium_side", + "y": 180 + } + + }, + { + "when": { + "west": false, + "snowy": false + }, + "apply": { + "model": "tfg:block/grass/sangnum_kaolin_mycelium_side", + "y": 270 + } + + }, + { + "when": { + "north": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin" + } + }, + { + "when": { + "east": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", + "y": 90 + } + }, + { + "when": { + "south": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", + "y": 180 + } + }, + { + "when": { + "west": false, + "snowy": true + }, + "apply": { + "model": "tfg:block/grass/snowy_kaolin", "y": 270 } - ], - "snowy=true": { - "model": "tfg:block/grass/snowy_kaolin" } - } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/amber_clay_mycelium_side.json b/kubejs/assets/tfg/models/block/grass/amber_clay_mycelium_side.json new file mode 100644 index 000000000..2cb20fecd --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/amber_clay_mycelium_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_clay_dirt", + "overlay": "tfg:block/grass/amber_clay_side", + "particle": "tfg:block/grass/amber_clay_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/amber_kaolin_mycelium_side.json b/kubejs/assets/tfg/models/block/grass/amber_kaolin_mycelium_side.json new file mode 100644 index 000000000..0e52ac94f --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/amber_kaolin_mycelium_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfc:block/red_kaolin_clay", + "overlay": "tfg:block/grass/amber_kaolin_side", + "particle": "tfg:block/grass/amber_kaolin_side" + } +} \ 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 index 332dd9835..8c3284eae 100644 --- a/kubejs/assets/tfg/models/block/grass/mars_dirt_snowy_side.json +++ b/kubejs/assets/tfg/models/block/grass/mars_dirt_snowy_side.json @@ -1,6 +1,8 @@ { - "parent": "tfc:block/grass_snowy_side", + "parent": "tfc:block/grass_side", "textures": { - "texture": "tfg:block/grass/mars_dirt" + "texture": "tfg:block/grass/mars_dirt", + "overlay": "tfg:block/grass/snowy_dirt_side", + "particle": "tfg:block/grass/snowy_dirt_side" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/mars_path.json b/kubejs/assets/tfg/models/block/grass/mars_path.json new file mode 100644 index 000000000..b63fee9e5 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/mars_path.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_path", + "textures": { + "dirt": "tfg:block/grass/mars_dirt", + "top": "tfg:block/grass/mars_path", + "side": "tfg:block/grass/mars_dirt" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/rusticus_clay_mycelium_side.json b/kubejs/assets/tfg/models/block/grass/rusticus_clay_mycelium_side.json new file mode 100644 index 000000000..ead2c69f6 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/rusticus_clay_mycelium_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_clay_dirt", + "overlay": "tfg:block/grass/rusticus_clay_side", + "particle": "tfg:block/grass/rusticus_clay_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/rusticus_kaolin_mycelium_side.json b/kubejs/assets/tfg/models/block/grass/rusticus_kaolin_mycelium_side.json new file mode 100644 index 000000000..fa25b9909 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/rusticus_kaolin_mycelium_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfc:block/red_kaolin_clay", + "overlay": "tfg:block/grass/rusticus_kaolin_side", + "particle": "tfg:block/grass/rusticus_kaolin_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/sangnum_clay_mycelium_side.json b/kubejs/assets/tfg/models/block/grass/sangnum_clay_mycelium_side.json new file mode 100644 index 000000000..11f2fe878 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/sangnum_clay_mycelium_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfg:block/grass/mars_clay_dirt", + "overlay": "tfg:block/grass/sangnum_clay_side", + "particle": "tfg:block/grass/sangnum_clay_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/sangnum_kaolin_mycelium_side.json b/kubejs/assets/tfg/models/block/grass/sangnum_kaolin_mycelium_side.json new file mode 100644 index 000000000..b46ae5704 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/sangnum_kaolin_mycelium_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfc:block/grass_side", + "textures": { + "texture": "tfc:block/red_kaolin_clay", + "overlay": "tfg:block/grass/sangnum_kaolin_side", + "particle": "tfg:block/grass/sangnum_kaolin_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/grass/mars_clay_dirt.json b/kubejs/assets/tfg/models/item/grass/mars_clay_dirt.json new file mode 100644 index 000000000..cb3511aca --- /dev/null +++ b/kubejs/assets/tfg/models/item/grass/mars_clay_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/grass/mars_clay_dirt" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/grass/mars_path.json b/kubejs/assets/tfg/models/item/grass/mars_path.json new file mode 100644 index 000000000..01a94bba0 --- /dev/null +++ b/kubejs/assets/tfg/models/item/grass/mars_path.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/grass/mars_path" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/grass/mars_path.png b/kubejs/assets/tfg/textures/block/grass/mars_path.png new file mode 100644 index 000000000..b70d28553 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/grass/mars_path.png differ diff --git a/kubejs/assets/tfg/textures/block/grass/snowy_dirt_side.png b/kubejs/assets/tfg/textures/block/grass/snowy_dirt_side.png new file mode 100644 index 000000000..e2a8870e3 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/grass/snowy_dirt_side.png differ diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index 41b52c61a..707fe1360 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -102,6 +102,8 @@ function registerTFGCollapseRecipes(event) { 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') + event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/mars_farmland') + event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/mars_path') event.recipes.tfc.landslide('tfg:grass/mars_clay_dirt', 'tfg:grass/mars_clay_dirt') event.recipes.tfc.landslide('tfg:grass/mars_clay_dirt', 'tfg:grass/amber_clay_mycelium') diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 1400d6952..9b42dac5e 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -742,15 +742,20 @@ const registerTFGItemTags = (event) => { event.add('tfg:moon_plants', 'tfg:lunar_sprouts') event.add('minecraft:dirt', 'tfg:grass/mars_dirt') + event.add('minecraft:dirt', 'tfg:grass/mars_clay_dirt') event.add('tfc:dirt', 'tfg:grass/mars_dirt') + event.add('tfc:dirt', 'tfg:grass/mars_clay_dirt') event.add('tfc:grass', 'tfg:grass/amber_mycelium') + event.add('tfc:grass', 'tfg:grass/amber_clay_mycelium') event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') + event.add('tfc:grass', 'tfg:grass/rusticus_clay_mycelium') event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') + event.add('tfc:grass', 'tfg:grass/sangnum_clay_mycelium') event.add('tfc:farmland', 'tfg:grass/mars_farmland') - event.add('minecraft:mineable/shovel', 'tfg:grass/mars_dirt') - event.add('minecraft:mineable/shovel', 'tfg:grass/amber_mycelium') - event.add('minecraft:mineable/shovel', 'tfg:grass/rusticus_mycelium') - event.add('minecraft:mineable/shovel', 'tfg:grass/sangnum_mycelium') + event.add('tfc:paths', 'tfg:grass/mars_path') + event.add('tfc:kaolin_clay', 'tfg:grass/amber_kaolin_mycelium') + event.add('tfc:kaolin_clay', 'tfg:grass/rusticus_kaolin_mycelium') + event.add('tfc:kaolin_clay', 'tfg:grass/sangnum_kaolin_mycelium') // #endregion @@ -986,6 +991,7 @@ const registerTFGBlockTags = (event) => { event.add('tfc:dirt', 'tfg:grass/mars_dirt') event.add('tfc:dirt', 'tfg:grass/mars_clay_dirt') event.add('tfc:farmland', 'tfg:grass/mars_farmland') + event.add('tfc:paths', 'tfg:grass/mars_path') event.add('tfc:grass', 'tfg:grass/amber_mycelium') event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') @@ -999,9 +1005,11 @@ const registerTFGBlockTags = (event) => { 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('tfg:do_not_destroy_in_space', 'tfg:grass/mars_farmland') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/mars_path') event.add('tfc:can_landslide', 'tfg:grass/mars_dirt') event.add('tfc:can_landslide', 'tfg:grass/mars_clay_dirt') event.add('tfc:can_landslide', 'tfg:grass/mars_farmland') + event.add('tfc:can_landslide', 'tfg:grass/mars_path') 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') @@ -1011,12 +1019,25 @@ const registerTFGBlockTags = (event) => { event.add('tfc:can_landslide', 'tfg:grass/amber_kaolin_mycelium') event.add('tfc:can_landslide', 'tfg:grass/rusticus_kaolin_mycelium') event.add('tfc:can_landslide', 'tfg:grass/sangnum_kaolin_mycelium') - event.add('minecraft:mushroom_grow_block', '#tfc:dirt') - event.add('minecraft:mushroom_grow_block', '#tfc:grass') + event.add('minecraft:mineable/shovel', 'tfg:grass/mars_dirt') + event.add('minecraft:mineable/shovel', 'tfg:grass/mars_clay_dirt') + event.add('minecraft:mineable/shovel', 'tfg:grass/mars_path') event.add('minecraft:mineable/shovel', 'tfg:grass/mars_farmland') + event.add('minecraft:mineable/shovel', 'tfg:grass/amber_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/amber_clay_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/amber_kaolin_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/rusticus_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/rusticus_clay_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/rusticus_kaolin_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/sangnum_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/sangnum_clay_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/sangnum_kaolin_mycelium') event.add('tfc:bush_plantable_on', 'tfg:grass/mars_farmland') event.add('tfc:grass_plantable_on', 'tfg:grass/mars_farmland') event.add('tfc:creeping_plantable_on', 'tfg:grass/mars_farmland') + + event.add('minecraft:mushroom_grow_block', '#tfc:dirt') + event.add('minecraft:mushroom_grow_block', '#tfc:grass') // #endregion event.add('tfg:harvester_harvestable', '#tfc:fruit_tree_leaves') diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 815f56d5c..7ca737a60 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -1440,76 +1440,6 @@ function registerTFGSpaceBlocks(event) { .fullBlock(true) .opaque(true) - event.create('tfg:grass/amber_clay_mycelium') - .property(BlockProperties.SNOWY) - .soundType('wart_block') - .requiresTool(false) - .mapColor('terracotta_yellow') - .tagBlock('minecraft:mineable/shovel') - .tagBoth('tfc:dirt') - .fullBlock(true) - .opaque(true) - - event.create('tfg:grass/amber_kaolin_mycelium') - .property(BlockProperties.SNOWY) - .soundType('wart_block') - .requiresTool(false) - .mapColor('terracotta_yellow') - .tagBlock('minecraft:mineable/shovel') - .tagBoth('tfc:kaolin_clay') - .fullBlock(true) - .opaque(true) - - event.create('tfg:grass/rusticus_clay_mycelium') - .property(BlockProperties.SNOWY) - .soundType('wart_block') - .requiresTool(false) - .mapColor('terracotta_orange') - .tagBlock('minecraft:mineable/shovel') - .tagBoth('tfc:dirt') - .fullBlock(true) - .opaque(true) - - event.create('tfg:grass/rusticus_kaolin_mycelium') - .property(BlockProperties.SNOWY) - .soundType('wart_block') - .requiresTool(false) - .mapColor('terracotta_orange') - .tagBlock('minecraft:mineable/shovel') - .tagBoth('tfc:kaolin_clay') - .fullBlock(true) - .opaque(true) - - event.create('tfg:grass/sangnum_clay_mycelium') - .property(BlockProperties.SNOWY) - .soundType('wart_block') - .requiresTool(false) - .mapColor('terracotta_red') - .tagBlock('minecraft:mineable/shovel') - .tagBoth('tfc:dirt') - .fullBlock(true) - .opaque(true) - - event.create('tfg:grass/sangnum_kaolin_mycelium') - .property(BlockProperties.SNOWY) - .soundType('wart_block') - .requiresTool(false) - .mapColor('terracotta_red') - .tagBlock('minecraft:mineable/shovel') - .tagBoth('tfc:kaolin_clay') - .fullBlock(true) - .opaque(true) - - event.create('tfg:grass/mars_clay_dirt') - .property(BlockProperties.SNOWY) - .soundType('gravel') - .requiresTool(false) - .mapColor('dirt') - .tagBlock('minecraft:mineable/shovel') - .tagBoth('tfc:dirt') - .fullBlock(true) - .opaque(true) - event.create('tfg:groundcover/glider_feather', 'tfc:ground_cover') .box(4, 0, 4, 12, 2, 12) .soundType('wool')