diff --git a/build.gradle b/build.gradle index 1dba8b35..8da441ed 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,7 @@ minecraft { property 'forge.logging.console.level', 'debug' - args '--mod', 'unearthed', '--all', '--output', file('src/generated/resources/'), '--existing', sourceSets.main.resources.srcDirs[0] + args '--mod', 'unearthed', '--all', '--output', file('src/generated/resources/'), '--existing', sourceSets.main.resources.srcDirs[0], '--existing-mod', 'dynamictrees' source sourceSets.main } diff --git a/src/main/java/net/oriondevcorgitaco/unearthed/Unearthed.java b/src/main/java/net/oriondevcorgitaco/unearthed/Unearthed.java index 979d8dce..64f01a0b 100644 --- a/src/main/java/net/oriondevcorgitaco/unearthed/Unearthed.java +++ b/src/main/java/net/oriondevcorgitaco/unearthed/Unearthed.java @@ -43,15 +43,15 @@ public Unearthed() { FMLJavaModLoadingContext.get().getModEventBus().addListener(ClientSetup::init); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, UnearthedConfig.COMMON_CONFIG); BlockStatePropertiesMatch.init(); + + if (ModList.get().isLoaded("dynamictrees")) { + RegistryHandler.setup(MOD_ID); + } } public void ueCommonSetup(FMLCommonSetupEvent event) { BlockGeneratorReference.init(); UETags.init(); - - if (ModList.get().isLoaded("dynamictrees")){ - RegistryHandler.setup(MOD_ID); - } } @Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) diff --git a/src/main/java/net/oriondevcorgitaco/unearthed/datagen/DataGenerators.java b/src/main/java/net/oriondevcorgitaco/unearthed/datagen/DataGenerators.java index 2202fb20..4e8f07d5 100644 --- a/src/main/java/net/oriondevcorgitaco/unearthed/datagen/DataGenerators.java +++ b/src/main/java/net/oriondevcorgitaco/unearthed/datagen/DataGenerators.java @@ -1,11 +1,14 @@ package net.oriondevcorgitaco.unearthed.datagen; +import com.ferreusveritas.dynamictrees.api.GatherDataHelper; +import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; -import net.minecraft.data.ItemTagsProvider; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; +import net.oriondevcorgitaco.unearthed.Unearthed; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class DataGenerators { @@ -25,5 +28,8 @@ public static void gatherData(GatherDataEvent event) { generator.addProvider(new Languages(generator, "en_us")); generator.addProvider(new Languages(generator, "en_gb")); } + if (ModList.get().isLoaded("dynamictrees")) { + GatherDataHelper.gatherBlockStateAndModelData(Unearthed.MOD_ID, event, SoilProperties.REGISTRY); + } } } \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_beige_limestone_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_beige_limestone_grassy_regolith.json deleted file mode 100644 index bfd8e885..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_beige_limestone_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/beige_limestone_grassy_regolith" }, - { "model": "unearthed:block/beige_limestone_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/beige_limestone_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_beige_limestone_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_beige_limestone_regolith.json deleted file mode 100644 index 59ad5f1a..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_beige_limestone_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/beige_limestone_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_conglomerate_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_conglomerate_grassy_regolith.json deleted file mode 100644 index 84cb5816..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_conglomerate_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/conglomerate_grassy_regolith" }, - { "model": "unearthed:block/conglomerate_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/conglomerate_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_conglomerate_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_conglomerate_regolith.json deleted file mode 100644 index 0cb72ea9..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_conglomerate_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/conglomerate_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_dolomite_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_dolomite_grassy_regolith.json deleted file mode 100644 index c28d1edd..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_dolomite_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/dolomite_grassy_regolith" }, - { "model": "unearthed:block/dolomite_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/dolomite_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_dolomite_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_dolomite_regolith.json deleted file mode 100644 index 9ebef9b5..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_dolomite_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/dolomite_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_gabbro_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_gabbro_grassy_regolith.json deleted file mode 100644 index 7f84528e..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_gabbro_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/gabbro_grassy_regolith" }, - { "model": "unearthed:block/gabbro_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/gabbro_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_gabbro_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_gabbro_regolith.json deleted file mode 100644 index b0ab7d5a..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_gabbro_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/gabbro_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_granodiorite_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_granodiorite_grassy_regolith.json deleted file mode 100644 index e8848a5f..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_granodiorite_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/granodiorite_grassy_regolith" }, - { "model": "unearthed:block/granodiorite_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/granodiorite_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_granodiorite_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_granodiorite_regolith.json deleted file mode 100644 index 25373536..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_granodiorite_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/granodiorite_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_grey_limestone_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_grey_limestone_grassy_regolith.json deleted file mode 100644 index d42cae0b..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_grey_limestone_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/grey_limestone_grassy_regolith" }, - { "model": "unearthed:block/grey_limestone_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/grey_limestone_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_grey_limestone_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_grey_limestone_regolith.json deleted file mode 100644 index e37d057a..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_grey_limestone_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/grey_limestone_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_kimberlite_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_kimberlite_grassy_regolith.json deleted file mode 100644 index 25cae307..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_kimberlite_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/kimberlite_grassy_regolith" }, - { "model": "unearthed:block/kimberlite_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/kimberlite_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_kimberlite_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_kimberlite_regolith.json deleted file mode 100644 index 6c9433ee..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_kimberlite_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/kimberlite_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_limestone_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_limestone_grassy_regolith.json deleted file mode 100644 index 8c49cf9a..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_limestone_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/limestone_grassy_regolith" }, - { "model": "unearthed:block/limestone_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/limestone_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_limestone_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_limestone_regolith.json deleted file mode 100644 index a6e351e9..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_limestone_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/limestone_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_mudstone_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_mudstone_grassy_regolith.json deleted file mode 100644 index c436e03f..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_mudstone_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/mudstone_grassy_regolith" }, - { "model": "unearthed:block/mudstone_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/mudstone_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_mudstone_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_mudstone_regolith.json deleted file mode 100644 index fe3b50cc..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_mudstone_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/mudstone_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_phyllite_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_phyllite_grassy_regolith.json deleted file mode 100644 index 35498e05..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_phyllite_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/phyllite_grassy_regolith" }, - { "model": "unearthed:block/phyllite_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/phyllite_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_phyllite_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_phyllite_regolith.json deleted file mode 100644 index 933065d0..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_phyllite_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/phyllite_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_quartzite_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_quartzite_grassy_regolith.json deleted file mode 100644 index efaa9c54..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_quartzite_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/quartzite_grassy_regolith" }, - { "model": "unearthed:block/quartzite_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/quartzite_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_quartzite_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_quartzite_regolith.json deleted file mode 100644 index b9bb179d..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_quartzite_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/quartzite_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_rhyolite_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_rhyolite_grassy_regolith.json deleted file mode 100644 index 57771247..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_rhyolite_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/rhyolite_grassy_regolith" }, - { "model": "unearthed:block/rhyolite_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/rhyolite_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_rhyolite_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_rhyolite_regolith.json deleted file mode 100644 index 201fe1e2..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_rhyolite_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/rhyolite_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_sandstone_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_sandstone_grassy_regolith.json deleted file mode 100644 index 24c483e0..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_sandstone_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/sandstone_grassy_regolith" }, - { "model": "unearthed:block/sandstone_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/sandstone_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_sandstone_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_sandstone_regolith.json deleted file mode 100644 index d0d63d85..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_sandstone_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/sandstone_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_siltstone_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_siltstone_grassy_regolith.json deleted file mode 100644 index c085dba4..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_siltstone_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/siltstone_grassy_regolith" }, - { "model": "unearthed:block/siltstone_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/siltstone_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_siltstone_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_siltstone_regolith.json deleted file mode 100644 index c41b8477..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_siltstone_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/siltstone_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_slate_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_slate_grassy_regolith.json deleted file mode 100644 index bd88e28b..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_slate_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/slate_grassy_regolith" }, - { "model": "unearthed:block/slate_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/slate_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_slate_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_slate_regolith.json deleted file mode 100644 index b42b1d55..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_slate_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/slate_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_stone_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_stone_grassy_regolith.json deleted file mode 100644 index 6e83b4f2..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_stone_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/stone_grassy_regolith" }, - { "model": "unearthed:block/stone_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/stone_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_stone_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_stone_regolith.json deleted file mode 100644 index 0d7ba827..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_stone_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/stone_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_white_granite_grassy_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_white_granite_grassy_regolith.json deleted file mode 100644 index 58599129..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_white_granite_grassy_regolith.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { "apply": [ - { "model": "unearthed:block/white_granite_grassy_regolith" }, - { "model": "unearthed:block/white_granite_grassy_regolith", "y": 90 }, - { "model": "unearthed:block/white_granite_grassy_regolith", "y": 270 } - ] - }, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dynamictrees/blockstates/rooty_white_granite_regolith.json b/src/main/resources/assets/dynamictrees/blockstates/rooty_white_granite_regolith.json deleted file mode 100644 index 4fcf4065..00000000 --- a/src/main/resources/assets/dynamictrees/blockstates/rooty_white_granite_regolith.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unearthed:block/white_granite_regolith" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_beige_limestone_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_beige_limestone_grassy_regolith.json new file mode 100644 index 00000000..f36fa035 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_beige_limestone_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/beige_limestone_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_beige_limestone_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_beige_limestone_regolith.json new file mode 100644 index 00000000..5086be31 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_beige_limestone_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/beige_limestone_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_conglomerate_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_conglomerate_grassy_regolith.json new file mode 100644 index 00000000..633d4231 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_conglomerate_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/conglomerate_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_conglomerate_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_conglomerate_regolith.json new file mode 100644 index 00000000..28b37712 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_conglomerate_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/conglomerate_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_dolomite_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_dolomite_grassy_regolith.json new file mode 100644 index 00000000..d0bac6dc --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_dolomite_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/dolomite_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_dolomite_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_dolomite_regolith.json new file mode 100644 index 00000000..19205489 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_dolomite_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/dolomite_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_gabbro_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_gabbro_grassy_regolith.json new file mode 100644 index 00000000..d69ae791 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_gabbro_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/gabbro_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_gabbro_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_gabbro_regolith.json new file mode 100644 index 00000000..2553a1c0 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_gabbro_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/gabbro_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_granodiorite_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_granodiorite_grassy_regolith.json new file mode 100644 index 00000000..86d132d1 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_granodiorite_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/granodiorite_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_granodiorite_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_granodiorite_regolith.json new file mode 100644 index 00000000..b5a01683 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_granodiorite_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/granodiorite_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_grey_limestone_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_grey_limestone_grassy_regolith.json new file mode 100644 index 00000000..e43d0908 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_grey_limestone_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/grey_limestone_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_grey_limestone_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_grey_limestone_regolith.json new file mode 100644 index 00000000..2290273b --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_grey_limestone_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/grey_limestone_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_kimberlite_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_kimberlite_grassy_regolith.json new file mode 100644 index 00000000..9f501555 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_kimberlite_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/kimberlite_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_kimberlite_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_kimberlite_regolith.json new file mode 100644 index 00000000..63461804 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_kimberlite_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/kimberlite_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_limestone_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_limestone_grassy_regolith.json new file mode 100644 index 00000000..1cbb342e --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_limestone_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/limestone_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_limestone_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_limestone_regolith.json new file mode 100644 index 00000000..6f3538f9 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_limestone_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/limestone_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_mudstone_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_mudstone_grassy_regolith.json new file mode 100644 index 00000000..1e1fb77d --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_mudstone_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/mudstone_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_mudstone_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_mudstone_regolith.json new file mode 100644 index 00000000..db5c54c0 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_mudstone_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/mudstone_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_phyllite_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_phyllite_grassy_regolith.json new file mode 100644 index 00000000..151683f6 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_phyllite_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/phyllite_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_phyllite_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_phyllite_regolith.json new file mode 100644 index 00000000..dfb42725 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_phyllite_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/phyllite_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_quartzite_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_quartzite_grassy_regolith.json new file mode 100644 index 00000000..0fddcf53 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_quartzite_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/quartzite_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_quartzite_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_quartzite_regolith.json new file mode 100644 index 00000000..5a928521 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_quartzite_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/quartzite_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_rhyolite_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_rhyolite_grassy_regolith.json new file mode 100644 index 00000000..0693c6fb --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_rhyolite_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/rhyolite_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_rhyolite_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_rhyolite_regolith.json new file mode 100644 index 00000000..685809d6 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_rhyolite_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/rhyolite_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_sandstone_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_sandstone_grassy_regolith.json new file mode 100644 index 00000000..3457c097 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_sandstone_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/sandstone_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_sandstone_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_sandstone_regolith.json new file mode 100644 index 00000000..038b7367 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_sandstone_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/sandstone_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_siltstone_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_siltstone_grassy_regolith.json new file mode 100644 index 00000000..685cab43 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_siltstone_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/siltstone_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_siltstone_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_siltstone_regolith.json new file mode 100644 index 00000000..e00141ec --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_siltstone_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/siltstone_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_slate_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_slate_grassy_regolith.json new file mode 100644 index 00000000..b894d4a6 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_slate_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/slate_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_slate_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_slate_regolith.json new file mode 100644 index 00000000..a7f142d7 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_slate_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/slate_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_stone_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_stone_grassy_regolith.json new file mode 100644 index 00000000..90043af4 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_stone_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/stone_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_stone_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_stone_regolith.json new file mode 100644 index 00000000..a1f098f2 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_stone_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/stone_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_white_granite_grassy_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_white_granite_grassy_regolith.json new file mode 100644 index 00000000..efbac008 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_white_granite_grassy_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/white_granite_grassy_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unearthed/blockstates/rooty_white_granite_regolith.json b/src/main/resources/assets/unearthed/blockstates/rooty_white_granite_regolith.json new file mode 100644 index 00000000..364d2bf9 --- /dev/null +++ b/src/main/resources/assets/unearthed/blockstates/rooty_white_granite_regolith.json @@ -0,0 +1,14 @@ +{ + "multipart": [ + { + "apply": { + "model": "unearthed:block/white_granite_regolith" + } + }, + { + "apply": { + "model": "dynamictrees:block/roots" + } + } + ] +} \ No newline at end of file