diff --git a/src/main/resources/trees/dtbop/cap_properties/glowshroom.json b/_disabled_dtplus/cap_properties/glowshroom.json similarity index 100% rename from src/main/resources/trees/dtbop/cap_properties/glowshroom.json rename to _disabled_dtplus/cap_properties/glowshroom.json diff --git a/src/main/resources/trees/dtbop/cap_properties/toadstool.json b/_disabled_dtplus/cap_properties/toadstool.json similarity index 100% rename from src/main/resources/trees/dtbop/cap_properties/toadstool.json rename to _disabled_dtplus/cap_properties/toadstool.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/glowshroom_cap.json b/_disabled_dtplus/loot_table/blocks/glowshroom_cap.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/glowshroom_cap.json rename to _disabled_dtplus/loot_table/blocks/glowshroom_cap.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/toadstool_cap.json b/_disabled_dtplus/loot_table/blocks/toadstool_cap.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/toadstool_cap.json rename to _disabled_dtplus/loot_table/blocks/toadstool_cap.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/mushroom_caps/glowshroom.json b/_disabled_dtplus/loot_table/trees/mushroom_caps/glowshroom.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/mushroom_caps/glowshroom.json rename to _disabled_dtplus/loot_table/trees/mushroom_caps/glowshroom.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/mushroom_caps/toadstool.json b/_disabled_dtplus/loot_table/trees/mushroom_caps/toadstool.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/mushroom_caps/toadstool.json rename to _disabled_dtplus/loot_table/trees/mushroom_caps/toadstool.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/glowshroom.json b/_disabled_dtplus/loot_table/trees/voluntary/glowshroom.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/glowshroom.json rename to _disabled_dtplus/loot_table/trees/voluntary/glowshroom.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/toadstool.json b/_disabled_dtplus/loot_table/trees/voluntary/toadstool.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/toadstool.json rename to _disabled_dtplus/loot_table/trees/voluntary/toadstool.json diff --git a/src/main/resources/trees/dtbop/species/glowshroom.json b/_disabled_dtplus/species/glowshroom.json similarity index 100% rename from src/main/resources/trees/dtbop/species/glowshroom.json rename to _disabled_dtplus/species/glowshroom.json diff --git a/src/main/resources/trees/dtbop/species/mini_brown_mushroom.json b/_disabled_dtplus/species/mini_brown_mushroom.json similarity index 100% rename from src/main/resources/trees/dtbop/species/mini_brown_mushroom.json rename to _disabled_dtplus/species/mini_brown_mushroom.json diff --git a/src/main/resources/trees/dtbop/species/toadstool.json b/_disabled_dtplus/species/toadstool.json similarity index 100% rename from src/main/resources/trees/dtbop/species/toadstool.json rename to _disabled_dtplus/species/toadstool.json diff --git a/build.gradle b/build.gradle index a5c3e0e5..f52d770b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,122 +1,53 @@ -import me.modmuss50.mpp.ReleaseType - plugins { id 'java-library' id 'maven-publish' - id 'net.neoforged.moddev' version '2.0.75' + id 'net.fabricmc.fabric-loom' version '1.17.17' id 'idea' - id "me.modmuss50.mod-publish-plugin" version "0.8.4" } version = mod_version group = mod_group_id -repositories { - mavenLocal() - maven { url = "https://cursemaven.com" } - maven { url = "https://harleyoconnor.com/maven" } -} - base { archivesName = mod_id } -java.toolchain.languageVersion = JavaLanguageVersion.of(21) - -neoForge { - version = project.neo_version +java.toolchain.languageVersion = JavaLanguageVersion.of(25) - parchment { - mappingsVersion = project.parchment_mappings_version - minecraftVersion = project.minecraft_version - } - runs { - client { - client() - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id - } - - server { - server() - programArgument '--nogui' - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id - } - - gameTestServer { - type = "gameTestServer" - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id - } - - data { - data() - programArguments.addAll '--mod', project.mod_id, '--all', - '--output', file('src/generated/resources/').getAbsolutePath(), - '--existing', file('src/main/resources').getAbsolutePath(), - "--existing-mod", "dynamictrees", - "--existing-mod", "biomesoplenty" +repositories { + mavenLocal() + exclusiveContent { + forRepository { + maven { + name = 'Modrinth' + url = 'https://api.modrinth.com/maven' + } } - - // applies to all the run configs above - configureEach { - systemProperty 'forge.logging.markers', 'REGISTRIES' - - logLevel = org.slf4j.event.Level.DEBUG - } - } - mods { - "${mod_id}" { - sourceSet sourceSets.main + filter { + includeGroup 'maven.modrinth' } } + maven { url = 'https://raw.githubusercontent.com/Fuzss/modresources/main/maven/' } } -sourceSets.main.resources { srcDir 'src/generated/resources' } - dependencies { - //DynamicTrees - implementation "com.dtteam.dynamictrees:dynamictrees-neoforge-" + project.minecraft_version + ":" + project.dynamicTreesVersion - implementation "com.dtteam.dynamictreesplus:DynamicTreesPlus:" + project.dynamicTreesPlusVersion - //implementation "curse.maven:dynamictrees-252818:6111832" + minecraft "com.mojang:minecraft:${minecraft_version}" + implementation "net.fabricmc:fabric-loader:${fabric_loader_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - //DynmaicTrees Tools/Utilities - runtimeOnly "curse.maven:jade-324717:6011258" - runtimeOnly "curse.maven:jei-238222:5846880" - runtimeOnly "curse.maven:cc-tweaked-282001:5714512" - runtimeOnly "curse.maven:suggestion-provider-fix-469647:5598604" + // Dynamic Trees (from mavenLocal) + implementation "com.dtteam.dynamictrees:dynamictrees-fabric-26.2:${dynamicTreesVersion}" - //Biomes O Plenty - implementation "curse.maven:terrablender-940057:6054947" - implementation "curse.maven:biomes-o-plenty-220318:5855568" - implementation "curse.maven:glitchcore-955399:5660740" + // Biomes O' Plenty (compile-only compat) + compileOnly "maven.modrinth:biomes-o-plenty:${bopVersion}" + compileOnly "maven.modrinth:glitchcore:${glitchcoreVersion}" } -def changelogFile = file("build/changelog.txt") +processResources { + inputs.property 'mod_version', mod_version -publishMods { - file = jar.archiveFile - displayName = "${mod_name.replace(' ','')}-NeoForge-${minecraft_version} ${project.version}" - if (changelogFile.exists()) { - changelog.set(changelogFile.getText()) - } - type = ReleaseType.of(versionType.toUpperCase()) - modLoaders.add("neoforge") - - curseforge { - projectId = "289529" - projectSlug = "dtbop" // Required for discord webhook - accessToken = curseApiKey ?: System.getenv("CURSEFORGE_API_KEY") - minecraftVersions.add("1.21.1") - requires("dynamictrees") - requires("biomes-o-plenty") - optional("dynamictreesplus") - } - modrinth { - projectId = "8QHjGuhP" - accessToken = modrinthToken ?: System.getenv("MODRINTH_TOKEN") - minecraftVersions.add("1.21.1") - requires("vdjF5PL5") //dt - requires("HXF82T3G") //bop - optional("qaO9Dqpu") //dt+ + filesMatching('fabric.mod.json') { + expand 'mod_version': mod_version } } diff --git a/gradle.properties b/gradle.properties index c06200a6..6567e416 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,16 @@ mod_name=DynamicTreesBOP mod_id=dtbop -mod_version=3.4.0 +mod_version=3.5.0-fabric-alpha mod_group_id=therealeststu.dtbop mod_authors=mangoose, Max Hyper -minecraft_version=1.21.1 -parchment_mappings_version=2024.11.17 -neo_version=21.1.97 +minecraft_version=26.2 +fabric_loader_version=0.19.3 +fabric_version=0.155.2+26.2 -dynamicTreesVersion=1.5.0 -dynamicTreesPlusVersion=1.3.0-BETA04 - -versionType=stable -versionRecommended=true -updateCheckerPath=Add-ons/BOP.json +dynamicTreesVersion=1.8.0-BETA03 +bopVersion=26.2.0.0.26 +glitchcoreVersion=26.2.0.0.0 org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..f8e1ee31 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..5dd3c012 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d..adff685a 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -173,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -206,15 +203,14 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..c4bdd3ab 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index 90ae98fa..7a844ca3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,10 +2,15 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven { url = 'https://maven.neoforged.net/releases' } + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } } } plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' } + +rootProject.name = 'DynamicTrees-BOP' diff --git a/src/generated/resources/.cache/0069ca169c2de5d53f23a4ff03402b37e7235b5a b/src/generated/resources/.cache/0069ca169c2de5d53f23a4ff03402b37e7235b5a deleted file mode 100644 index 8c493a2f..00000000 --- a/src/generated/resources/.cache/0069ca169c2de5d53f23a4ff03402b37e7235b5a +++ /dev/null @@ -1,2 +0,0 @@ -// 1.21.1 2025-12-01T22:30:37.9435262 Languages: en_us for mod: dtbop -3afad95772e255495ee5bd43c90ca5cb0ce6b45c assets/dtbop/lang/en_us.json diff --git a/src/generated/resources/.cache/0851b20788e592b1bab76813dc345362998d2eca b/src/generated/resources/.cache/0851b20788e592b1bab76813dc345362998d2eca deleted file mode 100644 index 6f2a7cdc..00000000 --- a/src/generated/resources/.cache/0851b20788e592b1bab76813dc345362998d2eca +++ /dev/null @@ -1,2 +0,0 @@ -// 1.21.1 2025-12-01T13:19:00.5926539 atlases generator for dtbop -670fea57fa387dae01d6c86b9056d236c2ff6102 assets/minecraft/atlases/blocks.json diff --git a/src/generated/resources/.cache/449f59139f73553807c657f26d096524cc4a39e5 b/src/generated/resources/.cache/449f59139f73553807c657f26d096524cc4a39e5 deleted file mode 100644 index 90020cdb..00000000 --- a/src/generated/resources/.cache/449f59139f73553807c657f26d096524cc4a39e5 +++ /dev/null @@ -1,38 +0,0 @@ -// 1.21.1 2025-12-01T22:30:37.941447 Item Models: dtbop -ade5754df509f6d25d52becd0fa3b13557895d00 assets/dtbop/models/item/aspen_seed.json -757a773a2e30ec3a56956b78c1aa466d019a57c2 assets/dtbop/models/item/dark_poplar_seed.json -8387fc1da79a190fe364f0c818e919908add4803 assets/dtbop/models/item/dead_branch.json -dbff7764e5b9b880e2ed4b8d152285181e37bbc4 assets/dtbop/models/item/dying_seed.json -b5ad633a29b28a5a380737ea4c1e5719434c9586 assets/dtbop/models/item/fir_branch.json -a7a29a8d75b2e284f81589b095bf58ac1f3f0934 assets/dtbop/models/item/fir_seed.json -72addc9c5309de0ff993a49c3407919570a78683 assets/dtbop/models/item/flowering_oak_seed.json -50f1b8eabef02b1c9b3688e33f777ec3c732504c assets/dtbop/models/item/glowshroom_seed.json -ff3789715b68536d054f7091d3ece030b29fc2a3 assets/dtbop/models/item/hellbark_branch.json -a3c9ee6b7916fe29c80e0b5884baeba7994fe0b6 assets/dtbop/models/item/hellbark_seed.json -6adba7121ed8a55a2ac29ef4a03a55f07c241363 assets/dtbop/models/item/jacaranda_branch.json -032d730f89094f8ff2f56bf8cdcf0863497ecd67 assets/dtbop/models/item/jacaranda_seed.json -4266fe8ccaadaa1e77915fecae518645544500d2 assets/dtbop/models/item/magic_branch.json -d1ae1da063054c35887b89179fcf4ed6369f8efd assets/dtbop/models/item/magic_poplar_seed.json -bbe6a75648f35767f9cc3f26cc34f262de577c53 assets/dtbop/models/item/mahogany_branch.json -2140ad2fd60535a9489392bf78ad8c220378d1a6 assets/dtbop/models/item/mahogany_seed.json -4229d81021f705a8cfeec2b46cb190f087ea8b89 assets/dtbop/models/item/maple_branch.json -e347bbee2d063d701f4fb27f8bb401aa72ce127a assets/dtbop/models/item/mega_fir_seed.json -65d55ebf0232780956800fba457971031befedfb assets/dtbop/models/item/mega_umbran_seed.json -32da3cff73c6cd04caaa739dfa4a9b367c338fa3 assets/dtbop/models/item/orange_maple_seed.json -a2059bb15b2ccb41208b7995306abe37e7e11e7b assets/dtbop/models/item/palm_branch.json -aee61a71cf7db02c7c47c49aab4717a8bd848c94 assets/dtbop/models/item/palm_seed.json -e949f814f3692f8d95b3488ea36b1244045be09e assets/dtbop/models/item/pine_branch.json -44824f5d1f7429b2e4593c473648fff7b7f362f9 assets/dtbop/models/item/pine_seed.json -450593c24566743045f74edf58d4b31507b708f6 assets/dtbop/models/item/poplar_seed.json -4cb7ea9bcf6f850538b710b97b00e09c2539586c assets/dtbop/models/item/rainbow_birch_seed.json -31226fa39fbf28253dd57f35711dd923adec9760 assets/dtbop/models/item/redwood_branch.json -3056949cf390f772d26a629f2673240a09a6a3bb assets/dtbop/models/item/redwood_seed.json -56a5dd476967e6c88815814a154ce1fa3c32776b assets/dtbop/models/item/red_maple_seed.json -4e0c20b80a0bbe2e61dbdfe2ff14a68c910335f9 assets/dtbop/models/item/snowblossom_seed.json -dedd4155aea04122028381d8015741c8c9b64609 assets/dtbop/models/item/spruce_poplar_seed.json -a7222f070a679d9141020c8761e77ce3ad22bc8d assets/dtbop/models/item/toadstool_seed.json -9d0ff256a7a6e5700ca98041bf78331fc09cb35d assets/dtbop/models/item/umbran_branch.json -d5bed5109869e5263211316c4ff8020b8dafa112 assets/dtbop/models/item/umbran_seed.json -0d373da7df9af82084f2d79104506d804009c206 assets/dtbop/models/item/willow_branch.json -63b895f706373f70a095668ae02f94d48566d0c1 assets/dtbop/models/item/willow_seed.json -ce28805119196121e03d80a6fff3fab1a128da95 assets/dtbop/models/item/yellow_maple_seed.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d deleted file mode 100644 index 1a7763db..00000000 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ /dev/null @@ -1,134 +0,0 @@ -// 1.21.1 2025-12-01T22:30:37.941447 Loot Tables -dd2729e31597b4a7591caf6999834584a3153104 data/dtbop/loot_table/blocks/acacia_twiglet_leaves.json -64a8eb8206e1dcabbe5a120653d35e1c856aea03 data/dtbop/loot_table/blocks/acacia_undergrowth_leaves.json -0db1cc794e7724a2dfd9cc63f660fd0d558f54dc data/dtbop/loot_table/blocks/aspen_leaves.json -9c44167b664783eaf935fbf169b03bea0e008266 data/dtbop/loot_table/blocks/cherry_twiglet_leaves.json -2a0c71aee4d695df552c2a7a6e648488e2ec4c19 data/dtbop/loot_table/blocks/cypress_willow_leaves.json -bb6d260de24769a04116625e0a7d418ea4f0c917 data/dtbop/loot_table/blocks/dark_oak_twiglet_leaves.json -3dd3e2314e8f9ae4d0ca4552101519682d328f08 data/dtbop/loot_table/blocks/dark_poplar_leaves.json -93b0671ad39eb69bca332924875fb9f95381997f data/dtbop/loot_table/blocks/dying_leaves.json -cb2cc4858e65c74b1c34fdd008138a9a790fa4ef data/dtbop/loot_table/blocks/fir_leaves.json -189a58697586e7e909a628f72b65d1b00f721c8d data/dtbop/loot_table/blocks/flowering_oak_leaves.json -4df944a14e669d91332bbedef6889c21929a446b data/dtbop/loot_table/blocks/flowering_oak_undergrowth_leaves.json -c518387b6a08d0f2dce1b404a48c32d1d9ad6420 data/dtbop/loot_table/blocks/glowshroom_cap.json -a786aa1d339344d5b874a9f73f1328fee8da4a1c data/dtbop/loot_table/blocks/hellbark_bush_leaves.json -5fdb2b0bbd2c9209d0fb499fd1bce18230a6db05 data/dtbop/loot_table/blocks/hellbark_leaves.json -546d8d8159a301c09a9eaeeb615d5efcbbbed0e4 data/dtbop/loot_table/blocks/jacaranda_leaves.json -c8e62fa1bd057f64916c138f88de74aeae0c1086 data/dtbop/loot_table/blocks/jungle_twiglet_leaves.json -c70404de940aefc7288be329310ababa598917b1 data/dtbop/loot_table/blocks/magic_poplar_leaves.json -e39b1f61a2d76cad6e462a59c5db607200541ed2 data/dtbop/loot_table/blocks/mahogany_leaves.json -a03c146db80da42c03a53b506ff9eb1e0f7136e5 data/dtbop/loot_table/blocks/mangrove_twiglet_leaves.json -1f0cf23d9a7c20808c6e359d408ad1cb66ad22a3 data/dtbop/loot_table/blocks/maple_twiglet_leaves.json -3b11fea063bd7b17cce4f2af50d933b3ea0e6c82 data/dtbop/loot_table/blocks/mega_dark_oak_leaves.json -21d25df6869587bf634794b39232a38623c246db data/dtbop/loot_table/blocks/oak_twiglet_leaves.json -bf4f9e12122970ea0ba0a0211f1678e3001ab637 data/dtbop/loot_table/blocks/orange_maple_leaves.json -db3dbc4d68265c8f864c82a70f9502fe8345aafe data/dtbop/loot_table/blocks/palm_leaves.json -d9d96913ca8b1cf5a08fe431c51e847c1d484c88 data/dtbop/loot_table/blocks/pine_leaves.json -7e3a809c729ffd70e32f3d91f13e4961c1028c9c data/dtbop/loot_table/blocks/poplar_leaves.json -42ee6806cefaa38adb0e5fe04cae238a488d81db data/dtbop/loot_table/blocks/rainbow_birch_leaves.json -55433eeeecbb203490bb17f7271ae47fabec9221 data/dtbop/loot_table/blocks/redwood_leaves.json -85f8256e15791c3424145e3289e021cec94cc2c1 data/dtbop/loot_table/blocks/red_maple_leaves.json -0359b220223dc9e64a307d80bcea2242eadc1a3d data/dtbop/loot_table/blocks/silk_undergrowth_web.json -8374d2a9bc94b7abfc505d3c2ae4e1a9b28dd652 data/dtbop/loot_table/blocks/silk_web.json -ee48e451d46584a2572860ad9243d7cabe3550a0 data/dtbop/loot_table/blocks/snowblossom_leaves.json -bc8dd41e1d981f1f61545286956495d9f92cf401 data/dtbop/loot_table/blocks/snowblossom_twiglet_leaves.json -f8cae65b457131d4cd995449646ce8433ea6b4d7 data/dtbop/loot_table/blocks/sparse_acacia_leaves.json -70a0be2cb545b33dd37e68c9ff3c40d2792f0c12 data/dtbop/loot_table/blocks/sparse_oak_leaves.json -6288cdccc294b5ea1dee9c37f3971144409d460b data/dtbop/loot_table/blocks/spruce_poplar_leaves.json -980ae6c23af4e5030944050f215877786430f765 data/dtbop/loot_table/blocks/spruce_twiglet_leaves.json -7eb66ef9f34929a39950d98e2daa9bd384ae34cb data/dtbop/loot_table/blocks/spruce_undergrowth_leaves.json -2bb2d726cab2e5e46eb3950655e47f4ca21e522c data/dtbop/loot_table/blocks/toadstool_cap.json -e326d96ce43eb61ff1996528ab4ab18a415a33c5 data/dtbop/loot_table/blocks/umbran_leaves.json -69ae35ee77dc9622387be4e55d0b5db3514542c4 data/dtbop/loot_table/blocks/willow_leaves.json -65c18feea6dca94ba43dbb9f86e44458fee75e82 data/dtbop/loot_table/blocks/yellow_maple_leaves.json -b962b7a0dfc7828f77a1ff5d9af826484dbec410 data/dtbop/loot_table/trees/branches/dead.json -30ead038c2f18039823af81c5dc33998952b8187 data/dtbop/loot_table/trees/branches/fir.json -56bb5e39c874ce69165cbaaf0fad63e007525e70 data/dtbop/loot_table/trees/branches/hellbark.json -d5dc7a891ac7b7cbc2a280d4e4324dcb6c19211a data/dtbop/loot_table/trees/branches/jacaranda.json -2a9b0d0860b8a562c9ef01ea423b31b115c0ce16 data/dtbop/loot_table/trees/branches/magic.json -aca1a7fb844037c314ef83f086dbbab1025eada1 data/dtbop/loot_table/trees/branches/mahogany.json -b47bf5cc5b3379281d7ae0fec655c501d3f634dc data/dtbop/loot_table/trees/branches/maple.json -3d396427343dfbd5967a48c35a3ad82ca352921d data/dtbop/loot_table/trees/branches/palm.json -f23f964dc3efdda53843444b87bb2f84edf7e948 data/dtbop/loot_table/trees/branches/pine.json -4d979ee35d76676f5835adf5d1400010c20d3972 data/dtbop/loot_table/trees/branches/redwood.json -11e5bfcb1d472b688ecd3211f4a3ad501dd719d6 data/dtbop/loot_table/trees/branches/stripped_dead.json -76b805a22170660e5d8b035bfaa5ceacefa0970a data/dtbop/loot_table/trees/branches/stripped_fir.json -fca20e552061f889fd6494a22f800ea66fc81d76 data/dtbop/loot_table/trees/branches/stripped_hellbark.json -61b273757f0c19bd0653f92c4ac9b4a1c7c64549 data/dtbop/loot_table/trees/branches/stripped_jacaranda.json -298bb69f5509e0996b19f6552c4b5eef650258b1 data/dtbop/loot_table/trees/branches/stripped_magic.json -2155808ad42afd6b5401c54c6095fe9fea42b680 data/dtbop/loot_table/trees/branches/stripped_mahogany.json -10aef2a19a35c87e566a9da084d1f68502877015 data/dtbop/loot_table/trees/branches/stripped_maple.json -10be5a79cbfa725c2be949a32b87fece840de7aa data/dtbop/loot_table/trees/branches/stripped_palm.json -bed21b2ced55821e2a289ff9fe831e07948a2873 data/dtbop/loot_table/trees/branches/stripped_pine.json -2abf586a2fd6f3e1b744c8bbac180ba09201489f data/dtbop/loot_table/trees/branches/stripped_redwood.json -b14a701cd45b555f1606d1261dac90f39f1ae9eb data/dtbop/loot_table/trees/branches/stripped_umbran.json -9657fbf1e35e036b089503e94faffb5fcb507137 data/dtbop/loot_table/trees/branches/stripped_willow.json -713eeaff52face42113187209dc0a8fd824ed5ff data/dtbop/loot_table/trees/branches/umbran.json -d45564691c68d1b0fb683264bed4d86eaabaf97c data/dtbop/loot_table/trees/branches/willow.json -717f7643c28a65c637a02414c7fb6541af1d0163 data/dtbop/loot_table/trees/leaves/acacia_twiglet.json -6d5b89eea27530119380966c94f3c0794503f328 data/dtbop/loot_table/trees/leaves/acacia_undergrowth.json -3e1f4fee87acef4eab8db2ecdea9ff11d8319aff data/dtbop/loot_table/trees/leaves/aspen.json -03f361560d0c7d95fb3f890ec2b5213032ee0b16 data/dtbop/loot_table/trees/leaves/cherry_twiglet.json -3c500b565f2c3f638c586a880c1a50db231430df data/dtbop/loot_table/trees/leaves/cypress_willow.json -2fd577239246de801feaad0074d0840bc1a6eb3b data/dtbop/loot_table/trees/leaves/dark_oak_twiglet.json -f85934369f0160346c7b745273150ceef0003525 data/dtbop/loot_table/trees/leaves/dark_poplar.json -d593a5555385d2d7a3ea06e1622a635344aa8803 data/dtbop/loot_table/trees/leaves/dying.json -689429816210b4ac26e6924f4fff4b5d213371be data/dtbop/loot_table/trees/leaves/fir.json -936d56419a99b137a1ac64476c7d8aec45d00211 data/dtbop/loot_table/trees/leaves/flowering_oak.json -962300be9e97db702e2ebd9eeb6b01cb79479415 data/dtbop/loot_table/trees/leaves/flowering_oak_undergrowth.json -3b28471f177ea9279657d675eeffd6f5d4612150 data/dtbop/loot_table/trees/leaves/hellbark.json -411643174a807258cdd4c6092f3760546c1671a3 data/dtbop/loot_table/trees/leaves/hellbark_bush.json -baa6eb1c6b485de971285bf57a404dfbae03b5c2 data/dtbop/loot_table/trees/leaves/jacaranda.json -f0c56ff07ae1f1289e441b303d7711c6b7e0b5e5 data/dtbop/loot_table/trees/leaves/jungle_twiglet.json -8cb5a1a074407b078070afb0b6c3b6f9cbb744da data/dtbop/loot_table/trees/leaves/magic_poplar.json -ccd95a4994c9f2739b0b12aaeafde4a07c128f09 data/dtbop/loot_table/trees/leaves/mahogany.json -97e97eea91ea52e9aecb53d34bec3ec65af70696 data/dtbop/loot_table/trees/leaves/mangrove_twiglet.json -f8c3fde23539bce4adf7607600f6ae2d42cd34fc data/dtbop/loot_table/trees/leaves/maple_twiglet.json -f1276880db20348077b0bed40dbf6c6b76e7009d data/dtbop/loot_table/trees/leaves/mega_dark_oak.json -f0f1bfd4d7ae074b60914c1b5b294c8d11f7b276 data/dtbop/loot_table/trees/leaves/oak_twiglet.json -0d4a6ec1d54357a438987cec1ec53f77bd90be03 data/dtbop/loot_table/trees/leaves/orange_maple.json -4ac890006e33ef72725ea37d463fcf4aab1a6e8a data/dtbop/loot_table/trees/leaves/palm.json -79a41787a95550f4404c2ff422b6c9a175523bbe data/dtbop/loot_table/trees/leaves/pine.json -026988221906a5f680d9df512e5650357f72fa67 data/dtbop/loot_table/trees/leaves/poplar.json -6299ab9575e4b33ef7682e400e7d44e33e5c315a data/dtbop/loot_table/trees/leaves/rainbow_birch.json -3361a561a3c4278b46dabcf32e8ed8d02c0de968 data/dtbop/loot_table/trees/leaves/redwood.json -c48916fc66cd79c6cea5f2abaef3104da8b6dd1f data/dtbop/loot_table/trees/leaves/red_maple.json -60e85eeb9e9c4977bfd4d7557a97dee43e4da447 data/dtbop/loot_table/trees/leaves/silk.json -4b1ef9b45bf3030916f10e0302cfe02348bed981 data/dtbop/loot_table/trees/leaves/silk_undergrowth.json -0f73f4a3b836d476bc716784302b66b734080d4d data/dtbop/loot_table/trees/leaves/snowblossom.json -15f1b01d020c65138dd3de86803233a8cff5736b data/dtbop/loot_table/trees/leaves/snowblossom_twiglet.json -5d998e37cbc1cd74292f18028fb1a0b77e4a5707 data/dtbop/loot_table/trees/leaves/sparse_acacia.json -7c3a53f0e08d8b04928e88e190ae616ba4fe9f38 data/dtbop/loot_table/trees/leaves/sparse_oak.json -db74b2c1637e74a2d34a28a0ca2ff6976237b4cf data/dtbop/loot_table/trees/leaves/spruce_poplar.json -31adb1029bec8bc60fa25164cb90f766111e350c data/dtbop/loot_table/trees/leaves/spruce_twiglet.json -f6e37ddf10c606e79f8d9319f9b239374356a9c2 data/dtbop/loot_table/trees/leaves/spruce_undergrowth.json -86ef4d1fb68c04ad0a0cb19ad1de861630b445ba data/dtbop/loot_table/trees/leaves/umbran.json -9a71e755f220951b3c7b3896f266b138ed4ea478 data/dtbop/loot_table/trees/leaves/willow.json -1421316563f820d6f8a986d7a1658a0937167bbe data/dtbop/loot_table/trees/leaves/yellow_maple.json -8d339aef87a394f970a7c8d48d8bf1ba5faa4ec1 data/dtbop/loot_table/trees/mushroom_caps/glowshroom.json -faa7d18c06bee6060f227ecd7191881eba737153 data/dtbop/loot_table/trees/mushroom_caps/toadstool.json -c821be76392aced039bbc89073f396ceaaac717a data/dtbop/loot_table/trees/voluntary/aspen.json -376e651d731e339b2e65ec1d5d3c93952c46a17c data/dtbop/loot_table/trees/voluntary/dark_poplar.json -cffeb1fd356442b3607a06c2e27c4ca8301b909c data/dtbop/loot_table/trees/voluntary/dying.json -cdfca46b8b55990cb40be700cb07171feb3a447d data/dtbop/loot_table/trees/voluntary/fir.json -e88dd656cfaba5fd47cc13728a5296cabb719326 data/dtbop/loot_table/trees/voluntary/flowering_oak.json -9a1a0b05a178ff58cc79b8150d9c13fddea60415 data/dtbop/loot_table/trees/voluntary/glowshroom.json -73281e6f099d83c1d1aac1dda5a9b6bc7582c54f data/dtbop/loot_table/trees/voluntary/hellbark.json -95ffb3139149e4733b995b638ede8c33588ec689 data/dtbop/loot_table/trees/voluntary/jacaranda.json -fe48fec854d57285395c472db42849a38fa39178 data/dtbop/loot_table/trees/voluntary/magic_poplar.json -9353413253b0a8c07d21b8fcc8f161057574251e data/dtbop/loot_table/trees/voluntary/mahogany.json -49a4c71de93a227d02d80d83a2a9bd28493e0c3f data/dtbop/loot_table/trees/voluntary/mega_fir.json -12b287e6fe322ae786b6aff74a3eb425e2e27dd4 data/dtbop/loot_table/trees/voluntary/mega_umbran.json -f372dd9bcda27170b318a228e623a20c05877784 data/dtbop/loot_table/trees/voluntary/orange_maple.json -b4001463c65acccf9c8e81e4e142fc163657397d data/dtbop/loot_table/trees/voluntary/palm.json -b903cb1a91ac040b9e5d90ddc83ea755d6cd3ef7 data/dtbop/loot_table/trees/voluntary/pine.json -a5908ab00c7de745ac06b5409048710a72587292 data/dtbop/loot_table/trees/voluntary/poplar.json -221beb844ec3d59dff078b19a65d5fd4559ed42c data/dtbop/loot_table/trees/voluntary/rainbow_birch.json -efed628466285151f84b7aa5e905068f2ee17b64 data/dtbop/loot_table/trees/voluntary/redwood.json -4449c9c433fc08866c88b437fe40de78328aab8f data/dtbop/loot_table/trees/voluntary/red_maple.json -0e3659b65e15baf17e7a91888799711021672838 data/dtbop/loot_table/trees/voluntary/snowblossom.json -2ba0c43d6acbe88489f8893cad313fdfb9aaddb4 data/dtbop/loot_table/trees/voluntary/spruce_poplar.json -5f1d4cc529a886f5e2304e0a7943525f47f195ac data/dtbop/loot_table/trees/voluntary/toadstool.json -3c746b5b2665d1484f5495958283c73c3fe229c9 data/dtbop/loot_table/trees/voluntary/umbran.json -d56cc79017ff3f5f57e63328ccf8dc63f0b2b71a data/dtbop/loot_table/trees/voluntary/willow.json -f707e9357ad0c0792e68c7f1eac1b48bbaa678a0 data/dtbop/loot_table/trees/voluntary/yellow_maple.json diff --git a/src/generated/resources/.cache/75df2d9e042f833c17d6f2454c7b4de55a3bcc64 b/src/generated/resources/.cache/75df2d9e042f833c17d6f2454c7b4de55a3bcc64 deleted file mode 100644 index 20650221..00000000 --- a/src/generated/resources/.cache/75df2d9e042f833c17d6f2454c7b4de55a3bcc64 +++ /dev/null @@ -1,5 +0,0 @@ -// 1.21.1 2025-12-01T22:30:37.9469418 dtbop DT Item Tags -e5a7820bb4d937763dc8386a954f823085f0f5b5 data/dynamictrees/tags/item/branches.json -7e874c987272446ddd4249ed955e160c3abc537c data/dynamictrees/tags/item/branches_that_burn.json -6599bad7fdc6f370fa420e76a54f56df9e8d9dba data/dynamictrees/tags/item/fungus_caps.json -87c403e33de96262eba500bbc74e99c080cb128e data/dynamictrees/tags/item/seeds.json diff --git a/src/generated/resources/.cache/966c94fbc8a8ffde6970b7e2b557133c95999129 b/src/generated/resources/.cache/966c94fbc8a8ffde6970b7e2b557133c95999129 deleted file mode 100644 index 0ee49f55..00000000 --- a/src/generated/resources/.cache/966c94fbc8a8ffde6970b7e2b557133c95999129 +++ /dev/null @@ -1,9 +0,0 @@ -// 1.21.1 2025-12-01T22:30:37.9391942 dtbop DT Block Tags -e5a7820bb4d937763dc8386a954f823085f0f5b5 data/dynamictrees/tags/block/branches.json -7e874c987272446ddd4249ed955e160c3abc537c data/dynamictrees/tags/block/branches_that_burn.json -aaf6eda795a5e0bf63b4c560d2ea36b0adf3d9c5 data/dynamictrees/tags/block/fungus_caps.json -00da5c0899829864ed1ea6061451aca72d7ccc77 data/dynamictrees/tags/block/leaves.json -e4bdd5646c20f5a80de6bb267f3e0984de1c259d data/dynamictrees/tags/block/rooty_soil.json -639fe6d36678d4194b69da25780390c04d0b33a4 data/dynamictrees/tags/block/saplings.json -3710c770a26b1eb4b50177ab12d224e9ebc33c43 data/dynamictrees/tags/block/stripped_branches.json -f2cd407bc0efdbd15acf90de90d57f3cf5b43a4d data/dynamictrees/tags/block/stripped_branches_that_burn.json diff --git a/src/generated/resources/.cache/e0535b00759b7a044714c01332f1f5cc305ccbec b/src/generated/resources/.cache/e0535b00759b7a044714c01332f1f5cc305ccbec deleted file mode 100644 index 1e3dbd6e..00000000 --- a/src/generated/resources/.cache/e0535b00759b7a044714c01332f1f5cc305ccbec +++ /dev/null @@ -1,157 +0,0 @@ -// 1.21.1 2025-12-01T22:30:37.9449384 Block States: dtbop -2606791521eac27fa77ebbeeea442b8073802a51 assets/dtbop/blockstates/acacia_twiglet_leaves.json -2606791521eac27fa77ebbeeea442b8073802a51 assets/dtbop/blockstates/acacia_undergrowth_leaves.json -e65d59cb6b08d2f8698af8da787c5cc3b6a8c59b assets/dtbop/blockstates/aspen_leaves.json -f8d84d77f039d38d5a4501f69a66baf9642ef13e assets/dtbop/blockstates/aspen_sapling.json -7c076dbbe8e530a40b96a7c16cf2cd9ca2e76a45 assets/dtbop/blockstates/cherry_twiglet_leaves.json -73e97651b77d61776de74c7e9d2ef24913e4bdf5 assets/dtbop/blockstates/cypress_willow_leaves.json -22189459d4fa383ebe3c902b33ee2c18870d8776 assets/dtbop/blockstates/dark_oak_twiglet_leaves.json -22189459d4fa383ebe3c902b33ee2c18870d8776 assets/dtbop/blockstates/dark_poplar_leaves.json -ad28168fbceefd1782510c0463bff626cc06f28a assets/dtbop/blockstates/dark_poplar_sapling.json -62642f6930f49ccbec5d7452c231dfaca59684c6 assets/dtbop/blockstates/dead_branch.json -2053a6842c185875a1b81e62bd0169e5f70b2982 assets/dtbop/blockstates/dying_leaves.json -eff1c292aac1929d4e902df2ed1a2405c93ae814 assets/dtbop/blockstates/dying_sapling.json -b6aed705ea3e636a846bac6b55a67548e68e07c3 assets/dtbop/blockstates/fir_branch.json -d06545649c71cca4f8c624f0951e3111f489fac5 assets/dtbop/blockstates/fir_leaves.json -237b0d402f8cc4170e52861d0dbd9efb65fada93 assets/dtbop/blockstates/fir_sapling.json -0f53db4fc5fc9f80c1fbe519b49ca967863676e8 assets/dtbop/blockstates/flowering_oak_leaves.json -bea45e90221da9ce4a3769d29932b0bf86ac9d31 assets/dtbop/blockstates/flowering_oak_sapling.json -0f53db4fc5fc9f80c1fbe519b49ca967863676e8 assets/dtbop/blockstates/flowering_oak_undergrowth_leaves.json -94d34da37461e6c6a403725215ca0aee7ce6619a assets/dtbop/blockstates/glowshroom_cap.json -5f4970560740c3e307ae441cb2a07a032a6fb322 assets/dtbop/blockstates/glowshroom_cap_center.json -80b166e536c82c3c986bb81c3fa386db79f2607e assets/dtbop/blockstates/glowshroom_sapling.json -280cf305366acbe35bf80e63dd0b6225bc1a717b assets/dtbop/blockstates/hellbark_branch.json -637a3a278c8a53a39cf6452c61ba2ce4a0a53dd2 assets/dtbop/blockstates/hellbark_bush_leaves.json -637a3a278c8a53a39cf6452c61ba2ce4a0a53dd2 assets/dtbop/blockstates/hellbark_leaves.json -305e88475cee31fbd5d5f1b5c9dbf0e2d1283ab4 assets/dtbop/blockstates/hellbark_sapling.json -257b1a56c5067231a29c86eab487970d254242ec assets/dtbop/blockstates/jacaranda_branch.json -2f13532a6b04464bd5aca74eb59ddc8dc3c8266a assets/dtbop/blockstates/jacaranda_leaves.json -f8cee58b516346d43d1bab653274a37bf13c2e64 assets/dtbop/blockstates/jacaranda_sapling.json -a82f9fc1c2378f77e75442eb41b6eff31ae0c687 assets/dtbop/blockstates/jungle_twiglet_leaves.json -b0318295b24e7edec6f36226488184ea44ccad9c assets/dtbop/blockstates/magic_branch.json -31455f9b2b9d1229a170434246475307d33f9e3e assets/dtbop/blockstates/magic_poplar_leaves.json -481889efcce77f2abec000ea365ef950b33604f1 assets/dtbop/blockstates/magic_poplar_sapling.json -56e430a2116c6db5947450f4e9d586210a11753f assets/dtbop/blockstates/mahogany_branch.json -f4bb5d366073df89300a1d4ff63e3777667adc10 assets/dtbop/blockstates/mahogany_leaves.json -2ae57894b5be66f29ed53a1b4e05bbbad69062d1 assets/dtbop/blockstates/mahogany_sapling.json -e8323999fd52df15a0a4a6644543902710c6192a assets/dtbop/blockstates/mangrove_twiglet_leaves.json -54727d5d650c52c43b70721e4c5dc4ba82533386 assets/dtbop/blockstates/maple_branch.json -bd55aaa7c9268eb8645517953a9e651bac260450 assets/dtbop/blockstates/maple_twiglet_leaves.json -22189459d4fa383ebe3c902b33ee2c18870d8776 assets/dtbop/blockstates/mega_dark_oak_leaves.json -f87c299a4614a3a7e74c0ae4c6f7fd3cea3529df assets/dtbop/blockstates/mega_fir_sapling.json -26bd643e08fd012157bb721c1006da6e99c32c8a assets/dtbop/blockstates/mega_umbran_sapling.json -9b73d2419e07259eb9681640ac018a6aeb7e7e93 assets/dtbop/blockstates/oak_twiglet_leaves.json -510ac5801beb02d924febc4e9e06605647b0bf78 assets/dtbop/blockstates/orange_maple_leaves.json -4dae03e2793e795bb9542ab22869a648619eb56e assets/dtbop/blockstates/orange_maple_sapling.json -be6018f760569c794364897846788a136427ab38 assets/dtbop/blockstates/palm_branch.json -2460d3f46a93c9fb93c86f42f714c8b77e2e0d49 assets/dtbop/blockstates/palm_leaves.json -8ee7a30dde4b23b8e35d5293222ba504896fd228 assets/dtbop/blockstates/palm_sapling.json -17378858bc210bdde3da781db8618301bca6ffff assets/dtbop/blockstates/pine_branch.json -7ce9145b015a8c10885505b0136f44193617d227 assets/dtbop/blockstates/pine_leaves.json -2d5f572e7b46191a1b9d5e265e9b267296d56641 assets/dtbop/blockstates/pine_sapling.json -8ef838697c46c00a32d716cdcf4638eed23d1cc0 assets/dtbop/blockstates/poplar_leaves.json -000679a00cfb3b867c5fe94a3557a844da52bb9e assets/dtbop/blockstates/poplar_sapling.json -a2d11b00ee54bca18fd29d6537a9a79ccead1508 assets/dtbop/blockstates/rainbow_birch_leaves.json -e9d90911906c9476fd0b1aae3a0e728c7629d751 assets/dtbop/blockstates/rainbow_birch_sapling.json -6db34b1912d2a38a3a611f208fff48ad02a4a3a7 assets/dtbop/blockstates/redwood_branch.json -c41ed9f68687aeda5ef8ccadab773cdcf5219b90 assets/dtbop/blockstates/redwood_leaves.json -6d714257eabe725f59417b0e017685a16fde3f4d assets/dtbop/blockstates/redwood_root.json -e3e6a0668af9e3481562af7ead4b2891ffafa6fa assets/dtbop/blockstates/redwood_sapling.json -bd55aaa7c9268eb8645517953a9e651bac260450 assets/dtbop/blockstates/red_maple_leaves.json -b9b1e41b7298c91d36748cca318642f81080c5bb assets/dtbop/blockstates/red_maple_sapling.json -bf15524ff4c692f52a2ebc98e5366c27a27ba5bf assets/dtbop/blockstates/rooty_black_sand.json -fbbed88cb40b46d6a8f22bf82c1727edd6992896 assets/dtbop/blockstates/rooty_dried_salt.json -9c9d902a96af508fe7976eb743fd70616de4c5e3 assets/dtbop/blockstates/rooty_glowing_moss_block.json -1dfcb913df103c0572c4a133c96149cbc9514cd2 assets/dtbop/blockstates/rooty_mossy_black_sand.json -49d32f79d15eea8ab705129f4cb2c7930e47db6f assets/dtbop/blockstates/rooty_orange_sand.json -44f361dbe5e6d9837308697867cefdd6e05563c2 assets/dtbop/blockstates/rooty_origin_grass_block.json -3f974e24dc00734a32a110ebc1920a4b6d761f8d assets/dtbop/blockstates/rooty_white_sand.json -9025fdb602b6a9c1f69e5a77af976c442269f8dd assets/dtbop/blockstates/silk_undergrowth_web.json -9025fdb602b6a9c1f69e5a77af976c442269f8dd assets/dtbop/blockstates/silk_web.json -1c14c3e89a01450f714460407887535765720927 assets/dtbop/blockstates/snowblossom_leaves.json -fc44963f6fa26225f40caa1dea587ce2541a3383 assets/dtbop/blockstates/snowblossom_sapling.json -1c14c3e89a01450f714460407887535765720927 assets/dtbop/blockstates/snowblossom_twiglet_leaves.json -2606791521eac27fa77ebbeeea442b8073802a51 assets/dtbop/blockstates/sparse_acacia_leaves.json -9b73d2419e07259eb9681640ac018a6aeb7e7e93 assets/dtbop/blockstates/sparse_oak_leaves.json -ab47df46795bc4ee1d88b446b0305ee474c1ed9c assets/dtbop/blockstates/spruce_poplar_leaves.json -adfc93eb8d13eb81e6e2e1ca403bbc41349f403b assets/dtbop/blockstates/spruce_poplar_sapling.json -ab47df46795bc4ee1d88b446b0305ee474c1ed9c assets/dtbop/blockstates/spruce_twiglet_leaves.json -ab47df46795bc4ee1d88b446b0305ee474c1ed9c assets/dtbop/blockstates/spruce_undergrowth_leaves.json -8f7a2a72f513232b2fd70e03ee2e1d9398253bab assets/dtbop/blockstates/stripped_dead_branch.json -eeb0d4900508ea60015325403ca662d361e9b8f9 assets/dtbop/blockstates/stripped_fir_branch.json -aab0b551d292123222bdef203e8235460dfade17 assets/dtbop/blockstates/stripped_hellbark_branch.json -990c76830f3f9f2d3881fafcb9341397888e56df assets/dtbop/blockstates/stripped_jacaranda_branch.json -dc7586bfbf3768f398c72d57bdcf9e2a43e88ec4 assets/dtbop/blockstates/stripped_magic_branch.json -cfb21d3aa87c827bc5bd47f99e11a66a7aceb90c assets/dtbop/blockstates/stripped_mahogany_branch.json -1f7753f639dee4879f1a04fdd1e594631bb5c467 assets/dtbop/blockstates/stripped_maple_branch.json -a650eee8ed965a4a2174f92454a308182504384a assets/dtbop/blockstates/stripped_palm_branch.json -85eb12a632f74cc967602f2521dea563ca7bb6bc assets/dtbop/blockstates/stripped_pine_branch.json -417314c66f80d8267235815f68716e68af3c2a20 assets/dtbop/blockstates/stripped_redwood_branch.json -6269613c02392e0c7ecef6539549df249ff285a9 assets/dtbop/blockstates/stripped_umbran_branch.json -0db638cb8a155eb730ed7166938a609a51df258a assets/dtbop/blockstates/stripped_willow_branch.json -733983f875fa8d18a6069de27ce239059453519f assets/dtbop/blockstates/toadstool_cap.json -c93c89c39346b95fb3984a960bc48c4316673b65 assets/dtbop/blockstates/toadstool_cap_center.json -d188ca0b4b1de08c385f44b6136b99e2e2f0e315 assets/dtbop/blockstates/toadstool_sapling.json -37d1c8de530747ed78f41ef854ef085bd0b9dcaf assets/dtbop/blockstates/umbran_branch.json -8cec305f9c723c0cfaaffd7ebfcb57bef0213ab0 assets/dtbop/blockstates/umbran_leaves.json -5ff8333101698cd3f5e4a4b7ee2bafab3448efe2 assets/dtbop/blockstates/umbran_sapling.json -3b9040b7466d4accda72944294e86331930ac525 assets/dtbop/blockstates/willow_branch.json -73e97651b77d61776de74c7e9d2ef24913e4bdf5 assets/dtbop/blockstates/willow_leaves.json -cf41080ef770a588fab25b7782b6360059114420 assets/dtbop/blockstates/willow_sapling.json -e65d59cb6b08d2f8698af8da787c5cc3b6a8c59b assets/dtbop/blockstates/yellow_maple_leaves.json -bfd0b0f3960d3d176895c35079fad1854e9f97bc assets/dtbop/blockstates/yellow_maple_sapling.json -15f6a0a99fb08bd9797fe2fd7049120c30509572 assets/dtbop/models/block/dead_branch.json -b3b7873b463c20d625fe732613092e50ffbb2cd9 assets/dtbop/models/block/fir_branch.json -e15ded55ae1cf62161f1b5c8fe5e9f8eb8e71407 assets/dtbop/models/block/hellbark_branch.json -8973e3ecf4c3ea014a0cae6ff0711c747a4409ca assets/dtbop/models/block/jacaranda_branch.json -f846d129b57ba8b98260be23a42190d88d291571 assets/dtbop/models/block/magic_branch.json -cab3eb1a8fcc8222de6cca98f05b2e6615571fda assets/dtbop/models/block/mahogany_branch.json -b81db0a95717bac6713bc715eaa1a9d1e52812bb assets/dtbop/models/block/maple_branch.json -9ef74da64b30ea00430d5fd70c0f1a110c24fb4d assets/dtbop/models/block/mushroom/glowshroom_cap_center_age0.json -a193ff7167132b5db518759fd28fa4d2a076713a assets/dtbop/models/block/mushroom/toadstool_cap_center_age0.json -674bf83d8b8b53669a0f0978515a9251a57e5e7e assets/dtbop/models/block/palm_branch.json -31a341e5f4b803029fb38c7e6de699df4b346a3a assets/dtbop/models/block/palm_leaves/palm_core_bottom.json -f5bb6b2fbfe559fbe37d60e76933cbe905de2b6e assets/dtbop/models/block/palm_leaves/palm_core_top.json -4afdd4e7a31036723f56bcb4056dad558da0d45f assets/dtbop/models/block/palm_leaves/palm_frond.json -48c0bea6d10eace96996e74a0af0c62c0740074b assets/dtbop/models/block/pine_branch.json -7944d6792719005ebe2b1f4568f6488d541c4880 assets/dtbop/models/block/redwood_branch.json -033db798a08ee510f39b21b5afc685cdb22ab2d0 assets/dtbop/models/block/redwood_root.json -f7d802d69fe0253836c47f573cbdb6a1bfc826ae assets/dtbop/models/block/saplings/aspen.json -4a57237782717c8e918a299847aacd892ca6f5e6 assets/dtbop/models/block/saplings/dark_poplar.json -a87dced36d5152d42f259dfc16d2b25566e307a6 assets/dtbop/models/block/saplings/dying.json -35deccc7a72659e3e1187f3fca42708c5e4bd273 assets/dtbop/models/block/saplings/fir.json -7a849487d3813ef0bcd33e55299ef4e396af2777 assets/dtbop/models/block/saplings/flowering_oak.json -a98c24f39365992c596537e1ca234674e621cc3c assets/dtbop/models/block/saplings/glowshroom.json -bbc66a2b52d1fd74711f37ec758408f732ec5340 assets/dtbop/models/block/saplings/hellbark.json -9849566b6ae0acaea8e715f8178076e18e9f090c assets/dtbop/models/block/saplings/jacaranda.json -3f9149fa598ce1fd4fa7c8cb68264661b0382998 assets/dtbop/models/block/saplings/magic_poplar.json -dbeb468af4d3cb7624cd589f5d30fea88e4ba8d2 assets/dtbop/models/block/saplings/mahogany.json -7468885f3e2114641b8520378d1a3382a097fc93 assets/dtbop/models/block/saplings/mega_fir.json -ac2c2e67987b67d53b2622a2d9c6e954504855a3 assets/dtbop/models/block/saplings/mega_umbran.json -5d00c6ef45d81dacd21f1db2fba9d43194871efb assets/dtbop/models/block/saplings/orange_maple.json -bdde5f537cd72bb72df27b39bd8b292e2b6da6f1 assets/dtbop/models/block/saplings/palm.json -011fb26ee9faee526b7c25b847e7129204f2f3a1 assets/dtbop/models/block/saplings/pine.json -e85b6b5fb75c35a7306993653ed1e0e73cc9d566 assets/dtbop/models/block/saplings/poplar.json -2006a61f699d405da61a56613e2a393383694d6a assets/dtbop/models/block/saplings/rainbow_birch.json -c0f36166b4fabe68721c2f2b485834f293e26d33 assets/dtbop/models/block/saplings/redwood.json -944caf9fc61f69d06beb0054d6ad835a443c3962 assets/dtbop/models/block/saplings/red_maple.json -b8a345dcc6bb85e88253dcf9d8613f345fc9a474 assets/dtbop/models/block/saplings/snowblossom.json -82e19945531fbcaf8d88a55bd21673f281be1f2c assets/dtbop/models/block/saplings/spruce_poplar.json -0ea7a3e7616416b0c5f0311346e0fd89b4d60d81 assets/dtbop/models/block/saplings/toadstool.json -0c0e4e5f1721935b85bdbe2cdbb3c518e7a9188a assets/dtbop/models/block/saplings/umbran.json -135521c27c0242037373c33f36517f6261d01db3 assets/dtbop/models/block/saplings/willow.json -6680a82b60d1166c083e53431c1ee4b88505fcaf assets/dtbop/models/block/saplings/yellow_maple.json -4344900b26ca4e62ba737e66039934fccb4d69c1 assets/dtbop/models/block/stripped_dead_branch.json -a930fb556478aae42180ded516dd0b5ca9f60041 assets/dtbop/models/block/stripped_fir_branch.json -c9eb9a1862139663552af13c2b09df91b61d1c45 assets/dtbop/models/block/stripped_hellbark_branch.json -397cad4390b6a600b9b240e831ea33db21ea2b22 assets/dtbop/models/block/stripped_jacaranda_branch.json -3893b1ac25060d4c49bf96978c1f4608341f9459 assets/dtbop/models/block/stripped_magic_branch.json -43915c4b432f129596143a77e2cb60d131fa2d76 assets/dtbop/models/block/stripped_mahogany_branch.json -d6d6622fbe92889b7684e14f49ae497ce9860fe9 assets/dtbop/models/block/stripped_maple_branch.json -f154101a09d7a0fdbc403e90a5a963062b0544be assets/dtbop/models/block/stripped_palm_branch.json -b198a565981880a6657738f57ab1c9fd6170d219 assets/dtbop/models/block/stripped_pine_branch.json -67a8ea8d253eb5413f5c50aa21364f4e5314752a assets/dtbop/models/block/stripped_redwood_branch.json -791a70eefd73ebc26f3da2f7c2954569e1905d1f assets/dtbop/models/block/stripped_umbran_branch.json -8ec34f06696d4e379d223f1cfab62baccc304061 assets/dtbop/models/block/stripped_willow_branch.json -ff8f0de93e3c76fc31ed5aa7612815d080cde0f0 assets/dtbop/models/block/umbran_branch.json -2f92294ade7aef0ac8aa674faa6ebcbdcbae1e50 assets/dtbop/models/block/willow_branch.json diff --git a/src/generated/resources/assets/dtbop/blockstates/dead_branch.json b/src/generated/resources/assets/dtbop/blockstates/dead_branch.json deleted file mode 100644 index 25f56b41..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/dead_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/dead_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/fir_branch.json b/src/generated/resources/assets/dtbop/blockstates/fir_branch.json deleted file mode 100644 index e6264943..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/fir_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/fir_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/hellbark_branch.json b/src/generated/resources/assets/dtbop/blockstates/hellbark_branch.json deleted file mode 100644 index 2eb463f8..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/hellbark_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/hellbark_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/jacaranda_branch.json b/src/generated/resources/assets/dtbop/blockstates/jacaranda_branch.json deleted file mode 100644 index 6e013f14..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/jacaranda_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/jacaranda_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/magic_branch.json b/src/generated/resources/assets/dtbop/blockstates/magic_branch.json deleted file mode 100644 index 1649aba9..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/magic_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/magic_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/mahogany_branch.json b/src/generated/resources/assets/dtbop/blockstates/mahogany_branch.json deleted file mode 100644 index 49a669ea..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/mahogany_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/mahogany_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/maple_branch.json b/src/generated/resources/assets/dtbop/blockstates/maple_branch.json deleted file mode 100644 index 4f70ebe3..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/maple_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/maple_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/palm_branch.json b/src/generated/resources/assets/dtbop/blockstates/palm_branch.json deleted file mode 100644 index d478df62..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/palm_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/palm_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/pine_branch.json b/src/generated/resources/assets/dtbop/blockstates/pine_branch.json deleted file mode 100644 index 325fb4c6..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/pine_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/pine_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/rainbow_birch_leaves.json b/src/generated/resources/assets/dtbop/blockstates/rainbow_birch_leaves.json deleted file mode 100644 index 0c266b27..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/rainbow_birch_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "biomesoplenty:block/rainbow_birch_leaves" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/redwood_branch.json b/src/generated/resources/assets/dtbop/blockstates/redwood_branch.json deleted file mode 100644 index a02d3cbe..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/redwood_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/redwood_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/redwood_root.json b/src/generated/resources/assets/dtbop/blockstates/redwood_root.json deleted file mode 100644 index bf05a25d..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/redwood_root.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/redwood_root" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_dead_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_dead_branch.json deleted file mode 100644 index f3b56c36..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_dead_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_dead_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_fir_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_fir_branch.json deleted file mode 100644 index 429d4adf..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_fir_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_fir_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_hellbark_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_hellbark_branch.json deleted file mode 100644 index c7ab5d77..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_hellbark_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_hellbark_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_jacaranda_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_jacaranda_branch.json deleted file mode 100644 index b1a6a58e..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_jacaranda_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_jacaranda_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_magic_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_magic_branch.json deleted file mode 100644 index 071c4643..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_magic_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_magic_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_mahogany_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_mahogany_branch.json deleted file mode 100644 index 20fa2484..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_mahogany_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_mahogany_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_maple_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_maple_branch.json deleted file mode 100644 index d9d9a475..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_maple_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_maple_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_palm_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_palm_branch.json deleted file mode 100644 index f1978307..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_palm_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_palm_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_pine_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_pine_branch.json deleted file mode 100644 index 551705f4..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_pine_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_pine_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_redwood_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_redwood_branch.json deleted file mode 100644 index 119648d5..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_redwood_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_redwood_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_umbran_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_umbran_branch.json deleted file mode 100644 index d946be42..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_umbran_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_umbran_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/stripped_willow_branch.json b/src/generated/resources/assets/dtbop/blockstates/stripped_willow_branch.json deleted file mode 100644 index c86b28b8..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/stripped_willow_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/stripped_willow_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/umbran_branch.json b/src/generated/resources/assets/dtbop/blockstates/umbran_branch.json deleted file mode 100644 index a2e42bc0..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/umbran_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/umbran_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/willow_branch.json b/src/generated/resources/assets/dtbop/blockstates/willow_branch.json deleted file mode 100644 index c51f177f..00000000 --- a/src/generated/resources/assets/dtbop/blockstates/willow_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "dtbop:block/willow_branch" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/dead_branch.json b/src/generated/resources/assets/dtbop/models/block/dead_branch.json deleted file mode 100644 index 7523828c..00000000 --- a/src/generated/resources/assets/dtbop/models/block/dead_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/dead_log", - "rings": "biomesoplenty:block/dead_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/fir_branch.json b/src/generated/resources/assets/dtbop/models/block/fir_branch.json deleted file mode 100644 index c6e65ce3..00000000 --- a/src/generated/resources/assets/dtbop/models/block/fir_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/fir_log", - "rings": "biomesoplenty:block/fir_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/hellbark_branch.json b/src/generated/resources/assets/dtbop/models/block/hellbark_branch.json deleted file mode 100644 index 0035dd82..00000000 --- a/src/generated/resources/assets/dtbop/models/block/hellbark_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/hellbark_log", - "rings": "biomesoplenty:block/hellbark_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/jacaranda_branch.json b/src/generated/resources/assets/dtbop/models/block/jacaranda_branch.json deleted file mode 100644 index d0aa88ab..00000000 --- a/src/generated/resources/assets/dtbop/models/block/jacaranda_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/jacaranda_log", - "rings": "biomesoplenty:block/jacaranda_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/magic_branch.json b/src/generated/resources/assets/dtbop/models/block/magic_branch.json deleted file mode 100644 index 9b1bb26f..00000000 --- a/src/generated/resources/assets/dtbop/models/block/magic_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/magic_log", - "rings": "biomesoplenty:block/magic_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/mahogany_branch.json b/src/generated/resources/assets/dtbop/models/block/mahogany_branch.json deleted file mode 100644 index 97bdaf63..00000000 --- a/src/generated/resources/assets/dtbop/models/block/mahogany_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/mahogany_log", - "rings": "biomesoplenty:block/mahogany_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/maple_branch.json b/src/generated/resources/assets/dtbop/models/block/maple_branch.json deleted file mode 100644 index eeb1c393..00000000 --- a/src/generated/resources/assets/dtbop/models/block/maple_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/maple_log", - "rings": "biomesoplenty:block/maple_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/palm_branch.json b/src/generated/resources/assets/dtbop/models/block/palm_branch.json deleted file mode 100644 index 85160753..00000000 --- a/src/generated/resources/assets/dtbop/models/block/palm_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/palm_log", - "rings": "biomesoplenty:block/palm_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/palm_leaves/palm_frond.json b/src/generated/resources/assets/dtbop/models/block/palm_leaves/palm_frond.json deleted file mode 100644 index 8e9f6d9f..00000000 --- a/src/generated/resources/assets/dtbop/models/block/palm_leaves/palm_frond.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "loader": "dynamictrees:large_palm_fronds", - "textures": { - "frond": "dtbop:block/palm_frond" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/pine_branch.json b/src/generated/resources/assets/dtbop/models/block/pine_branch.json deleted file mode 100644 index 331b9183..00000000 --- a/src/generated/resources/assets/dtbop/models/block/pine_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/pine_log", - "rings": "biomesoplenty:block/pine_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/redwood_branch.json b/src/generated/resources/assets/dtbop/models/block/redwood_branch.json deleted file mode 100644 index db4604db..00000000 --- a/src/generated/resources/assets/dtbop/models/block/redwood_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/redwood_log", - "rings": "biomesoplenty:block/redwood_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/redwood_root.json b/src/generated/resources/assets/dtbop/models/block/redwood_root.json deleted file mode 100644 index d27e3c61..00000000 --- a/src/generated/resources/assets/dtbop/models/block/redwood_root.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "loader": "dynamictrees:surface_root", - "textures": { - "bark": "biomesoplenty:block/redwood_log" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_dead_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_dead_branch.json deleted file mode 100644 index 467ebe58..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_dead_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_dead_log", - "rings": "biomesoplenty:block/stripped_dead_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_fir_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_fir_branch.json deleted file mode 100644 index 57d9b785..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_fir_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_fir_log", - "rings": "biomesoplenty:block/stripped_fir_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_hellbark_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_hellbark_branch.json deleted file mode 100644 index 5edaa868..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_hellbark_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_hellbark_log", - "rings": "biomesoplenty:block/stripped_hellbark_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_jacaranda_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_jacaranda_branch.json deleted file mode 100644 index 42f2089f..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_jacaranda_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_jacaranda_log", - "rings": "biomesoplenty:block/stripped_jacaranda_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_magic_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_magic_branch.json deleted file mode 100644 index 5651c6ce..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_magic_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_magic_log", - "rings": "biomesoplenty:block/stripped_magic_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_mahogany_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_mahogany_branch.json deleted file mode 100644 index b128b7de..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_mahogany_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_mahogany_log", - "rings": "biomesoplenty:block/stripped_mahogany_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_maple_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_maple_branch.json deleted file mode 100644 index e9d201f8..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_maple_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_maple_log", - "rings": "biomesoplenty:block/stripped_maple_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_palm_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_palm_branch.json deleted file mode 100644 index 984ff563..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_palm_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_palm_log", - "rings": "biomesoplenty:block/stripped_palm_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_pine_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_pine_branch.json deleted file mode 100644 index 04b0f558..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_pine_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_pine_log", - "rings": "biomesoplenty:block/stripped_pine_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_redwood_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_redwood_branch.json deleted file mode 100644 index 934b4117..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_redwood_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_redwood_log", - "rings": "biomesoplenty:block/stripped_redwood_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_umbran_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_umbran_branch.json deleted file mode 100644 index 55d91803..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_umbran_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_umbran_log", - "rings": "biomesoplenty:block/stripped_umbran_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/stripped_willow_branch.json b/src/generated/resources/assets/dtbop/models/block/stripped_willow_branch.json deleted file mode 100644 index e8c6b777..00000000 --- a/src/generated/resources/assets/dtbop/models/block/stripped_willow_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/stripped_willow_log", - "rings": "biomesoplenty:block/stripped_willow_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/umbran_branch.json b/src/generated/resources/assets/dtbop/models/block/umbran_branch.json deleted file mode 100644 index 52857ec1..00000000 --- a/src/generated/resources/assets/dtbop/models/block/umbran_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/umbran_log", - "rings": "biomesoplenty:block/umbran_log_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/willow_branch.json b/src/generated/resources/assets/dtbop/models/block/willow_branch.json deleted file mode 100644 index b645f5f0..00000000 --- a/src/generated/resources/assets/dtbop/models/block/willow_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "loader": "dynamictrees:branch", - "textures": { - "bark": "biomesoplenty:block/willow_log", - "rings": "biomesoplenty:block/willow_log_top" - } -} \ No newline at end of file diff --git a/src/main/java/com/dtteam/dtbop/DTBOPPlusRegistries.java b/src/main/java/com/dtteam/dtbop/DTBOPPlusRegistries.java deleted file mode 100644 index ec1608cf..00000000 --- a/src/main/java/com/dtteam/dtbop/DTBOPPlusRegistries.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.dtteam.dtbop; - -import biomesoplenty.worldgen.feature.misc.*; - -import com.dtteam.dynamictrees.event.TypeRegistryEvent; -import com.dtteam.dynamictrees.api.worldgen.BiomePropertySelectors; -import com.dtteam.dynamictrees.api.worldgen.FeatureCanceller; -import com.dtteam.dynamictrees.tree.species.Species; -import com.dtteam.dynamictrees.worldgen.featurecancellation.MushroomFeatureCanceller; -import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration; -import net.neoforged.bus.api.SubscribeEvent; -import net.minecraft.core.registries.BuiltInRegistries; -import com.dtteam.dtbop.block.GlowShroomCapProperties; -import com.dtteam.dtbop.tree.GlowshroomSpecies; - -public class DTBOPPlusRegistries { - - public static final FeatureCanceller MUSHROOM_CANCELLER = new MushroomFeatureCanceller<>(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID,"mushroom"), HugeMushroomFeatureConfiguration.class){ - @Override - public boolean shouldCancel(final ConfiguredFeature configuredFeature, final BiomePropertySelectors.NormalFeatureCancellation featureCancellations) { - final ResourceLocation featureRegistryName = BuiltInRegistries.FEATURE.getKey(configuredFeature.feature()); - if (featureRegistryName == null) {return false;} - - if (configuredFeature.config() instanceof HugeMushroomFeatureConfiguration) { - return true; - } - - Feature f = configuredFeature.feature(); - - return f instanceof SmallRedMushroomFeature || - f instanceof HugeToadstoolFeature || - f instanceof SmallToadstoolFeature || - f instanceof SmallGlowshroomFeature || - f instanceof MediumGlowshroomFeature || - f instanceof HugeGlowshroomFeature || - f instanceof GiantGlowshroomFeature || - f instanceof SmallBrownMushroomFeature; - } - }; - - @SubscribeEvent - public static void onFeatureCancellerRegistry(final com.dtteam.dynamictrees.event.RegistryEvent event) { - if (event.isEntryOfType(FeatureCanceller.class)){ - event.getRegistry().registerAll(MUSHROOM_CANCELLER); - } - } - - @SubscribeEvent - public static void registerCapPropertiesType(final TypeRegistryEvent event) { - if (event.isEntryOfType(CapProperties.class)){ - event.registerType(DynamicTreesBOP.location("glowshroom"), GlowShroomCapProperties.TYPE); - } - } - - @SubscribeEvent - public static void registerSpeciesType(final TypeRegistryEvent event) { - if (event.isEntryOfType(Species.class)){ - event.registerType(DynamicTreesBOP.location("glowshroom"), GlowshroomSpecies.TYPE); - } - } - -} diff --git a/src/main/java/com/dtteam/dtbop/DTBOPRegistries.java b/src/main/java/com/dtteam/dtbop/DTBOPRegistries.java index 3d5c3411..fd71984f 100644 --- a/src/main/java/com/dtteam/dtbop/DTBOPRegistries.java +++ b/src/main/java/com/dtteam/dtbop/DTBOPRegistries.java @@ -1,116 +1,93 @@ package com.dtteam.dtbop; -import biomesoplenty.api.biome.BOPBiomes; -import biomesoplenty.worldgen.feature.misc.HugeToadstoolFeature; -import biomesoplenty.worldgen.feature.misc.SmallRedMushroomFeature; -import biomesoplenty.worldgen.feature.misc.SmallToadstoolFeature; +import com.dtteam.dtbop.block.CobwebLeavesProperties; +import com.dtteam.dtbop.cell.DTBOPCellKits; +import com.dtteam.dtbop.genfeature.DTBOPGenFeatures; +import com.dtteam.dtbop.growthlogic.DTBOPGrowthLogicKits; +import com.dtteam.dtbop.tree.Bush; +import com.dtteam.dtbop.tree.CypressSpecies; +import com.dtteam.dtbop.tree.GenOnStoneSpecies; +import com.dtteam.dtbop.tree.PoplarSpecies; +import com.dtteam.dtbop.tree.TwigletSpecies; import com.dtteam.dynamictrees.api.cell.CellKit; -import com.dtteam.dynamictrees.event.TypeRegistryEvent; -import com.dtteam.dynamictrees.api.worldgen.BiomePropertySelectors; -import com.dtteam.dynamictrees.api.worldgen.FeatureCanceller; +import com.dtteam.dynamictrees.block.CommonVoxelShapes; import com.dtteam.dynamictrees.block.leaves.LeavesProperties; -import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; -import com.dtteam.dynamictrees.systems.genfeature.BeeNestGenFeature; import com.dtteam.dynamictrees.systems.genfeature.GenFeature; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; import com.dtteam.dynamictrees.tree.species.Species; -import com.dtteam.dynamictrees.block.CommonVoxelShapes; -import com.dtteam.dynamictrees.worldgen.featurecancellation.MushroomFeatureCanceller; -import com.dtteam.dynamictrees.event.RegistryEvent; -import net.minecraft.core.Holder; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BiomeTags; -import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.neoforge.registries.RegisterEvent; -import net.neoforged.neoforge.registries.NeoForgeRegistries; -import net.neoforged.neoforge.common.Tags; -import net.neoforged.bus.api.SubscribeEvent; -import com.dtteam.dtbop.block.CobwebLeavesProperties; -import com.dtteam.dtbop.cell.DTBOPCellKits; -import com.dtteam.dtbop.genfeature.DTBOPGenFeatures; -import com.dtteam.dtbop.growthlogic.DTBOPGrowthLogicKits; -import com.dtteam.dtbop.tree.*; - -import java.util.Objects; -@EventBusSubscriber(bus=EventBusSubscriber.Bus.MOD) public class DTBOPRegistries { public static final VoxelShape GLOWSHROOM_AGE0 = Shapes.create(0, 0, 0, 1, 0.75, 1); - public static final VoxelShape TOADSTOOL_AGE0 = Shapes.create(2/16f, 0, 2/16f, 14/16f, 1, 14/16f); + public static final VoxelShape TOADSTOOL_AGE0 = Shapes.create(2 / 16f, 0, 2 / 16f, 14 / 16f, 1, 14 / 16f); public static final VoxelShape MUSHROOM_CAP_SHORT_ROUND = Block.box(5D, 3D, 5D, 11D, 7D, 11D); public static final VoxelShape ROUND_SHORT_MUSHROOM = Shapes.or(CommonVoxelShapes.SAPLING_TRUNK, MUSHROOM_CAP_SHORT_ROUND); public static final VoxelShape TOADSTOOL_CAP = Block.box(5.5D, 3.0D, 5.5D, 10.5D, 10.0D, 10.5D); public static final VoxelShape TOADSTOOL = Shapes.or(CommonVoxelShapes.SAPLING_TRUNK, TOADSTOOL_CAP); public static void setup() { - CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "glowshroom_age0").toString(), GLOWSHROOM_AGE0); - CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "toadstool_age0").toString(), TOADSTOOL_AGE0); - CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "round_short_mushroom").toString(), ROUND_SHORT_MUSHROOM); - CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "toadstool").toString(), TOADSTOOL); + registerVoxelShapes(); + registerGenFeatures(); + registerGrowthLogicKits(); + registerCellKits(); + registerLeavesPropertiesTypes(); + registerSpeciesTypes(); + + // Runs after all tree pack resources have been loaded, replacing the old block-registry-time linking. + Species.REGISTRY.runOnNextLock(DTBOPRegistries::onSpeciesRegistryLock); } - @SubscribeEvent - public static void onGenFeatureRegistry(final RegistryEvent event) { - if (event.isEntryOfType(GenFeature.class)){ - DTBOPGenFeatures.register(event.getRegistry()); - } + private static void registerVoxelShapes() { + CommonVoxelShapes.SHAPES.put(DynamicTreesBOP.location("glowshroom_age0").toString(), GLOWSHROOM_AGE0); + CommonVoxelShapes.SHAPES.put(DynamicTreesBOP.location("toadstool_age0").toString(), TOADSTOOL_AGE0); + CommonVoxelShapes.SHAPES.put(DynamicTreesBOP.location("round_short_mushroom").toString(), ROUND_SHORT_MUSHROOM); + CommonVoxelShapes.SHAPES.put(DynamicTreesBOP.location("toadstool").toString(), TOADSTOOL); } - @SubscribeEvent - public static void onGrowthLogicKitRegistry(final RegistryEvent event) { - if (event.isEntryOfType(GrowthLogicKit.class)){ - DTBOPGrowthLogicKits.register(event.getRegistry()); - } + private static void registerGenFeatures() { + DTBOPGenFeatures.register(GenFeature.REGISTRY); } - @SubscribeEvent - public static void onCellKitRegistry(final RegistryEvent event) { - if (event.isEntryOfType(CellKit.class)){ - DTBOPCellKits.register(event.getRegistry()); - } + private static void registerGrowthLogicKits() { + DTBOPGrowthLogicKits.register(GrowthLogicKit.REGISTRY); } - @SubscribeEvent - public static void registerLeavesPropertiesTypes(TypeRegistryEvent event) { - if (event.isEntryOfType(LeavesProperties.class)){ - event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "cobweb"), CobwebLeavesProperties.TYPE); - } + private static void registerCellKits() { + DTBOPCellKits.register(CellKit.REGISTRY); } - @SubscribeEvent - public static void registerSpeciesTypes(final TypeRegistryEvent event) { - if (event.isEntryOfType(Species.class)){ - event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "twiglet"), TwigletSpecies.TYPE); - event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "poplar"), PoplarSpecies.TYPE); - event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "cypress"), CypressSpecies.TYPE); - event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "generates_on_stone"), GenOnStoneSpecies.TYPE); - } + private static void registerLeavesPropertiesTypes() { + LeavesProperties.REGISTRY.registerType(DynamicTreesBOP.location("cobweb"), CobwebLeavesProperties.TYPE); } - @SubscribeEvent - public static void onBlocksRegistry(final RegisterEvent event) { + private static void registerSpeciesTypes() { + Species.REGISTRY.registerType(DynamicTreesBOP.location("twiglet"), TwigletSpecies.TYPE); + Species.REGISTRY.registerType(DynamicTreesBOP.location("poplar"), PoplarSpecies.TYPE); + Species.REGISTRY.registerType(DynamicTreesBOP.location("cypress"), CypressSpecies.TYPE); + Species.REGISTRY.registerType(DynamicTreesBOP.location("generates_on_stone"), GenOnStoneSpecies.TYPE); + } + + private static void onSpeciesRegistryLock() { Bush.INSTANCES.forEach(Bush::setup); - final Species floweringOak = Species.REGISTRY.get(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "flowering_oak")); - final Species floweringAppleOak = Species.REGISTRY.get(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "flowering_apple_oak")); - final Species infested = Species.REGISTRY.get(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "infested")); + final Species floweringOak = Species.REGISTRY.get(DynamicTreesBOP.location("flowering_oak")); + final Species floweringAppleOak = Species.REGISTRY.get(DynamicTreesBOP.location("flowering_apple_oak")); + final Species infested = Species.REGISTRY.get(DynamicTreesBOP.location("infested")); - LeavesProperties floweringLeaves = LeavesProperties.REGISTRY.get(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "flowering_oak")); + final LeavesProperties floweringLeaves = LeavesProperties.REGISTRY.get(DynamicTreesBOP.location("flowering_oak")); if (floweringOak.isValid() && floweringLeaves.isValid()) { floweringLeaves.setFamily(floweringOak.getFamily()); floweringOak.addValidLeafBlocks(floweringLeaves); } - if (floweringAppleOak.isValid()) - if (floweringLeaves.isValid()) floweringAppleOak.addValidLeafBlocks(floweringLeaves); + if (floweringAppleOak.isValid() && floweringLeaves.isValid()) { + floweringAppleOak.addValidLeafBlocks(floweringLeaves); + } if (infested.isValid()) { - LeavesProperties silkLeaves = LeavesProperties.REGISTRY.get(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "silk")); + final LeavesProperties silkLeaves = LeavesProperties.REGISTRY.get(DynamicTreesBOP.location("silk")); infested.addValidLeafBlocks(silkLeaves); } } diff --git a/src/main/java/com/dtteam/dtbop/DynamicTreesBOP.java b/src/main/java/com/dtteam/dtbop/DynamicTreesBOP.java index 62d0c9c2..e28a2bda 100644 --- a/src/main/java/com/dtteam/dtbop/DynamicTreesBOP.java +++ b/src/main/java/com/dtteam/dtbop/DynamicTreesBOP.java @@ -1,52 +1,27 @@ package com.dtteam.dtbop; -import com.dtteam.dynamictrees.block.leaves.LeavesProperties; -import com.dtteam.dynamictrees.block.soil.SoilProperties; -import com.dtteam.dynamictrees.data.GatherDataHelper; -import com.dtteam.dynamictrees.registry.NeoForgeRegistryHandler; -import com.dtteam.dynamictrees.tree.family.Family; -import com.dtteam.dynamictrees.tree.species.Species; -import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.fml.ModContainer; -import net.neoforged.fml.ModList; -import net.neoforged.fml.common.Mod; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import net.neoforged.neoforge.data.event.GatherDataEvent; +import com.dtteam.dynamictrees.api.DynamicTreesAddonEntrypoint; +import net.minecraft.resources.Identifier; + +/** + * Main entrypoint for the Dynamic Trees BOP addon on Fabric. + * + *

Dynamic Trees invokes {@link #onDynamicTreesPreSetup()} from its own {@code ModInitializer}, + * before it registers its own content and loads tree packs, so all addon registration happens + * here.

+ */ +public class DynamicTreesBOP implements DynamicTreesAddonEntrypoint { -// The value here should match an entry in the META-INF/mods.toml file -@Mod(DynamicTreesBOP.MOD_ID) -public class DynamicTreesBOP { public static final String MOD_ID = "dtbop"; - public DynamicTreesBOP(IEventBus eventBus, ModContainer container) { - eventBus.addListener(this::commonSetup); - eventBus.addListener(this::gatherData); - - if (ModList.get().isLoaded("dynamictreesplus")){ - eventBus.register(DTBOPPlusRegistries.class); - } - - NeoForgeRegistryHandler.setup(MOD_ID, eventBus); - } - - private void commonSetup(final FMLCommonSetupEvent event) { + @Override + public void onDynamicTreesPreSetup() { + DynamicTreesAddonEntrypoint.setupAddon(MOD_ID); DTBOPRegistries.setup(); } - private void gatherData(final GatherDataEvent event) { - GatherDataHelper.gatherAllData(MOD_ID, event, - SoilProperties.REGISTRY, - Family.REGISTRY, - Species.REGISTRY, - LeavesProperties.REGISTRY, - CapProperties.REGISTRY - ); - } - - public static ResourceLocation location (String name){ - return ResourceLocation.fromNamespaceAndPath(MOD_ID, name); + public static Identifier location(String name) { + return Identifier.fromNamespaceAndPath(MOD_ID, name); } } diff --git a/src/main/java/com/dtteam/dtbop/block/CobwebLeavesProperties.java b/src/main/java/com/dtteam/dtbop/block/CobwebLeavesProperties.java index c282a2a5..0cf713a1 100644 --- a/src/main/java/com/dtteam/dtbop/block/CobwebLeavesProperties.java +++ b/src/main/java/com/dtteam/dtbop/block/CobwebLeavesProperties.java @@ -6,28 +6,31 @@ import com.dtteam.dynamictrees.block.leaves.ScruffyLeavesProperties; import com.dtteam.dynamictrees.utility.CoordUtils; import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.InsideBlockEffectApplier; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; -import net.neoforged.neoforge.common.util.DeferredSoundType; import org.jetbrains.annotations.NotNull; -import javax.annotation.Nullable; - public class CobwebLeavesProperties extends ScruffyLeavesProperties { + public static final TypedRegistry.EntryType TYPE = TypedRegistry.newType(CobwebLeavesProperties::new); - public CobwebLeavesProperties(ResourceLocation registryName) { + private static final SoundType COBWEB_SOUND_TYPE = new SoundType(1.0F, 1.0F, + SoundEvents.VINE_STEP, SoundEvents.VINE_STEP, SoundEvents.VINE_STEP, + SoundEvents.GRASS_HIT, SoundEvents.VINE_STEP); + + public CobwebLeavesProperties(Identifier registryName) { super(registryName); } + @Override public String getBlockRegistryNameSuffix() { return "_web"; } @@ -35,33 +38,37 @@ public String getBlockRegistryNameSuffix() { private float leafChance = 0.66f; private int maxHydro = 1; - @Override public void setLeafChance (float leafChance){ + @Override + public void setLeafChance(float leafChance) { this.leafChance = leafChance; } - @Override public void setMaxHydro (int maxHydro) { + + @Override + public void setMaxHydro(int maxHydro) { this.maxHydro = maxHydro; } @Override protected @NotNull DynamicLeavesBlock createDynamicLeaves(BlockBehaviour.Properties properties) { - return new DynamicLeavesBlock(this, properties) { + return new DynamicLeavesBlock(getBlockRegistryName(), this, properties) { @Override - public void fallOn(Level level, BlockState blockState, BlockPos pos, Entity entity, float fallDistance) { + public void fallOn(Level level, BlockState blockState, BlockPos pos, Entity entity, double fallDistance) { } @Override - public void entityInside(BlockState state, Level level, BlockPos pos, Entity entity) { + protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entity, InsideBlockEffectApplier effectApplier, boolean isPrecise) { entity.makeStuckInBlock(state, new Vec3(0.25D, 0.05F, 0.25D)); } @Override - public @NotNull SoundType getSoundType(@NotNull BlockState state, @NotNull LevelReader level, @NotNull BlockPos pos, @Nullable Entity entity) { - return new DeferredSoundType(1.0F, 1.0F, () -> SoundEvents.VINE_STEP, () -> SoundEvents.VINE_STEP, () -> SoundEvents.VINE_STEP, () -> SoundEvents.GRASS_HIT, () -> SoundEvents.VINE_STEP); + protected @NotNull SoundType getSoundType(@NotNull BlockState state) { + return COBWEB_SOUND_TYPE; } + @Override public int getHydrationLevelFromNeighbors(LevelAccessor level, BlockPos pos, LeavesProperties leavesProperties) { int hydro = super.getHydrationLevelFromNeighbors(level, pos, leavesProperties); - if (hydro <= maxHydro){ + if (hydro <= maxHydro) { int hash = CoordUtils.coordHashCode(pos, 2) % 1000; float rand = hash / 1000f; if (rand >= leafChance) return 0; diff --git a/src/main/java/com/dtteam/dtbop/block/GlowShroomCapProperties.java b/src/main/java/com/dtteam/dtbop/block/GlowShroomCapProperties.java deleted file mode 100644 index 733d1b23..00000000 --- a/src/main/java/com/dtteam/dtbop/block/GlowShroomCapProperties.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.dtteam.dtbop.block; - -import com.dtteam.dynamictrees.api.registry.TypedRegistry; -import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; - -public class GlowShroomCapProperties extends CapProperties { - - public static final TypedRegistry.EntryType TYPE = TypedRegistry.newType(GlowShroomCapProperties::new); - - public GlowShroomCapProperties(ResourceLocation registryName) { - super(registryName); - } - - @Override - public BlockBehaviour.Properties getDefaultBlockProperties() { - return super.getDefaultBlockProperties() - .emissiveRendering((a,b,c)->true) - .hasPostProcess((a,b,c)->true); - } -} diff --git a/src/main/java/com/dtteam/dtbop/cell/DTBOPCellKits.java b/src/main/java/com/dtteam/dtbop/cell/DTBOPCellKits.java index c706f9e6..37a238aa 100644 --- a/src/main/java/com/dtteam/dtbop/cell/DTBOPCellKits.java +++ b/src/main/java/com/dtteam/dtbop/cell/DTBOPCellKits.java @@ -10,7 +10,7 @@ import com.dtteam.dynamictrees.systems.cell.NormalCell; import com.dtteam.dynamictrees.api.voxmap.SimpleVoxmap; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import com.dtteam.dtbop.DynamicTreesBOP; public class DTBOPCellKits { @@ -21,7 +21,7 @@ public static class SparseCellKit extends CellKit { protected final CellSolver solver = new CellKits.BasicSolver(new short[]{0x0211}); - public SparseCellKit(ResourceLocation registryName) { + public SparseCellKit(Identifier registryName) { super(registryName); } @@ -51,15 +51,15 @@ public int getDefaultHydration() { } } - public static final CellKit SPARSE = new SparseCellKit(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "sparse")); - public static final CellKit HELLBARK_SPARSE = new SparseCellKit(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "hellbark_sparse")) { + public static final CellKit SPARSE = new SparseCellKit(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "sparse")); + public static final CellKit HELLBARK_SPARSE = new SparseCellKit(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "hellbark_sparse")) { @Override public Cell getCellForBranch(int radius, int meta) { return radius <= 3 ? sparseBranch : CellNull.NULL_CELL; } }; - public static final CellKit POPLAR = new CellKit(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "poplar")) { + public static final CellKit POPLAR = new CellKit(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "poplar")) { private final Cell poplarBranch = new PoplarBranchCell(); private final Cell poplarTopBranch = new PoplarTopBranchCell(); @@ -110,7 +110,7 @@ public int getDefaultHydration() { }; - public static final CellKit MAHOGANY = new CellKit(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "mahogany")) { + public static final CellKit MAHOGANY = new CellKit(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "mahogany")) { private final Cell mahoganyBranch = new MahoganyBranchCell(); @@ -157,7 +157,7 @@ public int getDefaultHydration() { }; - public static final CellKit BRUSH = new CellKit(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "brush")) { + public static final CellKit BRUSH = new CellKit(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "brush")) { private final Cell branch = new Cell() { @Override @@ -216,7 +216,7 @@ public int getDefaultHydration() { }; - public static final CellKit EUCALYPTUS = new CellKit(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "eucalyptus")) { + public static final CellKit EUCALYPTUS = new CellKit(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "eucalyptus")) { private final Cell eucalyptusTopBranch = new EucalyptusTopBranchCell(); private final Cell eucalyptusBranch = new NormalCell(2); @@ -267,7 +267,7 @@ public int getDefaultHydration() { }; - public static final CellKit HELLBARK = new CellKit(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "hellbark")) { + public static final CellKit HELLBARK = new CellKit(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "hellbark")) { private final Cell hellbarkBranch = new Cell() { @Override diff --git a/src/main/java/com/dtteam/dtbop/genfeature/AlternativeLeavesGenFeature.java b/src/main/java/com/dtteam/dtbop/genfeature/AlternativeLeavesGenFeature.java index 85bf7ac2..33752475 100644 --- a/src/main/java/com/dtteam/dtbop/genfeature/AlternativeLeavesGenFeature.java +++ b/src/main/java/com/dtteam/dtbop/genfeature/AlternativeLeavesGenFeature.java @@ -12,7 +12,7 @@ import com.dtteam.dynamictrees.tree.species.Species; import com.dtteam.dynamictrees.api.voxmap.BlockPosBounds; import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; @@ -28,7 +28,7 @@ public class AlternativeLeavesGenFeature extends GenFeature { public static final ConfigurationProperty ALT_LEAVES = ConfigurationProperty.block("alternative_leaves"); - public AlternativeLeavesGenFeature(ResourceLocation registryName) { + public AlternativeLeavesGenFeature(Identifier registryName) { super(registryName); } @@ -116,11 +116,11 @@ private BlockState getSwapBlockState(GenFeatureConfiguration configuration, Leve if (originalLeaves != null && altLeaves != null) { if (worldgen || level.getRandom().nextFloat() < configuration.get(PLACE_CHANCE)) { if (state.getBlock() == originalLeaves) { - return altLeaves.properties.getDynamicLeavesState(state.getValue(LeavesBlock.DISTANCE)); + return altLeaves.getLeavesProperties().getDynamicLeavesState(state.getValue(LeavesBlock.DISTANCE)); } } else { if (state.getBlock() == altLeaves) { - return originalLeaves.properties.getDynamicLeavesState(state.getValue(LeavesBlock.DISTANCE)); + return originalLeaves.getLeavesProperties().getDynamicLeavesState(state.getValue(LeavesBlock.DISTANCE)); } } } diff --git a/src/main/java/com/dtteam/dtbop/genfeature/DTBOPGenFeatures.java b/src/main/java/com/dtteam/dtbop/genfeature/DTBOPGenFeatures.java index 37c55f7f..7d42953c 100644 --- a/src/main/java/com/dtteam/dtbop/genfeature/DTBOPGenFeatures.java +++ b/src/main/java/com/dtteam/dtbop/genfeature/DTBOPGenFeatures.java @@ -2,13 +2,13 @@ import com.dtteam.dynamictrees.api.registry.Registry; import com.dtteam.dynamictrees.systems.genfeature.GenFeature; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import com.dtteam.dtbop.DynamicTreesBOP; public class DTBOPGenFeatures { - public static final GenFeature ALT_LEAVES = new AlternativeLeavesGenFeature(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "alt_leaves")); - public static final GenFeature EXTRA_FLARE_BOTTOM = new ExtraBottomFlareGenFeature(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "extra_bottom_flare")); + public static final GenFeature ALT_LEAVES = new AlternativeLeavesGenFeature(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "alt_leaves")); + public static final GenFeature EXTRA_FLARE_BOTTOM = new ExtraBottomFlareGenFeature(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "extra_bottom_flare")); public static void register(final Registry registry) { registry.registerAll(EXTRA_FLARE_BOTTOM); diff --git a/src/main/java/com/dtteam/dtbop/genfeature/ExtraBottomFlareGenFeature.java b/src/main/java/com/dtteam/dtbop/genfeature/ExtraBottomFlareGenFeature.java index 4c0f457b..b431cf05 100644 --- a/src/main/java/com/dtteam/dtbop/genfeature/ExtraBottomFlareGenFeature.java +++ b/src/main/java/com/dtteam/dtbop/genfeature/ExtraBottomFlareGenFeature.java @@ -9,7 +9,7 @@ import com.dtteam.dynamictrees.tree.species.Species; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.LevelAccessor; public class ExtraBottomFlareGenFeature extends GenFeature { @@ -21,7 +21,7 @@ public class ExtraBottomFlareGenFeature extends GenFeature { public static final ConfigurationProperty SECONDARY_MIN_RADIUS = ConfigurationProperty.integer("secondary_min_radius"); - public ExtraBottomFlareGenFeature(ResourceLocation registryName) { + public ExtraBottomFlareGenFeature(Identifier registryName) { super(registryName); } diff --git a/src/main/java/com/dtteam/dtbop/growthlogic/CypressLogic.java b/src/main/java/com/dtteam/dtbop/growthlogic/CypressLogic.java index 2a6e3674..48cbdd31 100644 --- a/src/main/java/com/dtteam/dtbop/growthlogic/CypressLogic.java +++ b/src/main/java/com/dtteam/dtbop/growthlogic/CypressLogic.java @@ -10,12 +10,12 @@ import com.dtteam.dynamictrees.utility.CoordUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.Level; public class CypressLogic extends GrowthLogicKit { - public CypressLogic(ResourceLocation registryName) { + public CypressLogic(Identifier registryName) { super(registryName); } @@ -31,7 +31,7 @@ public int[] populateDirectionProbabilityMap(GrowthLogicKitConfiguration configu if (signal.energy >= 6) { if (signal.numSteps % 3 == 0) { for (Direction dir : CoordUtils.HORIZONTALS) { - if (TreeHelper.isBranch(context.level().getBlockState(context.pos().offset(dir.getNormal())))) { + if (TreeHelper.isBranch(context.level().getBlockState(context.pos().offset(dir.getUnitVec3i())))) { sideProb = 0; branchSide = dir; } diff --git a/src/main/java/com/dtteam/dtbop/growthlogic/DTBOPGrowthLogicKits.java b/src/main/java/com/dtteam/dtbop/growthlogic/DTBOPGrowthLogicKits.java index fae85b9e..976258bb 100644 --- a/src/main/java/com/dtteam/dtbop/growthlogic/DTBOPGrowthLogicKits.java +++ b/src/main/java/com/dtteam/dtbop/growthlogic/DTBOPGrowthLogicKits.java @@ -2,16 +2,16 @@ import com.dtteam.dynamictrees.api.registry.Registry; import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import com.dtteam.dtbop.DynamicTreesBOP; public class DTBOPGrowthLogicKits { - public static final GrowthLogicKit POPLAR = new PoplarLogic(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "poplar")); - public static final GrowthLogicKit CYPRESS = new CypressLogic(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "cypress")); - public static final GrowthLogicKit REDWOOD = new RedwoodLogic(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "redwood")); - public static final GrowthLogicKit SMALL_REDWOOD = new SmallRedwoodLogic(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "small_redwood")); - public static final GrowthLogicKit MAHOGANY = new MahoganyLogic(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "mahogany")); + public static final GrowthLogicKit POPLAR = new PoplarLogic(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "poplar")); + public static final GrowthLogicKit CYPRESS = new CypressLogic(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "cypress")); + public static final GrowthLogicKit REDWOOD = new RedwoodLogic(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "redwood")); + public static final GrowthLogicKit SMALL_REDWOOD = new SmallRedwoodLogic(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "small_redwood")); + public static final GrowthLogicKit MAHOGANY = new MahoganyLogic(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, "mahogany")); public static void register(final Registry registry) { registry.registerAll(POPLAR, CYPRESS, REDWOOD, SMALL_REDWOOD, MAHOGANY); diff --git a/src/main/java/com/dtteam/dtbop/growthlogic/MahoganyLogic.java b/src/main/java/com/dtteam/dtbop/growthlogic/MahoganyLogic.java index c576b234..5f89d4cc 100644 --- a/src/main/java/com/dtteam/dtbop/growthlogic/MahoganyLogic.java +++ b/src/main/java/com/dtteam/dtbop/growthlogic/MahoganyLogic.java @@ -6,11 +6,11 @@ import com.dtteam.dynamictrees.systems.growthlogic.context.DirectionSelectionContext; import com.dtteam.dynamictrees.systems.GrowSignal; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class MahoganyLogic extends GrowthLogicKit { - public MahoganyLogic(ResourceLocation registryName) { super(registryName); } + public MahoganyLogic(Identifier registryName) { super(registryName); } @Override public int[] populateDirectionProbabilityMap(GrowthLogicKitConfiguration configuration, diff --git a/src/main/java/com/dtteam/dtbop/growthlogic/PoplarLogic.java b/src/main/java/com/dtteam/dtbop/growthlogic/PoplarLogic.java index 77685586..95378992 100644 --- a/src/main/java/com/dtteam/dtbop/growthlogic/PoplarLogic.java +++ b/src/main/java/com/dtteam/dtbop/growthlogic/PoplarLogic.java @@ -10,14 +10,14 @@ import com.dtteam.dynamictrees.utility.CoordUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.Level; public class PoplarLogic extends GrowthLogicKit { public static final ConfigurationProperty LARGE = ConfigurationProperty.bool("large"); - public PoplarLogic(ResourceLocation registryName) { + public PoplarLogic(Identifier registryName) { super(registryName); } diff --git a/src/main/java/com/dtteam/dtbop/growthlogic/RedwoodLogic.java b/src/main/java/com/dtteam/dtbop/growthlogic/RedwoodLogic.java index 5ad85635..4c738165 100644 --- a/src/main/java/com/dtteam/dtbop/growthlogic/RedwoodLogic.java +++ b/src/main/java/com/dtteam/dtbop/growthlogic/RedwoodLogic.java @@ -14,13 +14,13 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; public class RedwoodLogic extends GrowthLogicKit { - public RedwoodLogic(ResourceLocation registryName) { + public RedwoodLogic(Identifier registryName) { super(registryName); } @@ -66,7 +66,7 @@ public Direction selectNewDirection(GrowthLogicKitConfiguration configuration, D // Create probability map for direction change for (Direction dir : Direction.values()) { if (!dir.equals(originDir)) { - BlockPos deltaPos = pos.offset(dir.getNormal()); + BlockPos deltaPos = pos.offset(dir.getUnitVec3i()); // Check probability for surrounding blocks // Typically Air:1, Leaves:2, Branches: 2+r if (signalY >= configuration.getLowestBranchHeight(context)) { diff --git a/src/main/java/com/dtteam/dtbop/growthlogic/SmallRedwoodLogic.java b/src/main/java/com/dtteam/dtbop/growthlogic/SmallRedwoodLogic.java index a959bea5..80daee08 100644 --- a/src/main/java/com/dtteam/dtbop/growthlogic/SmallRedwoodLogic.java +++ b/src/main/java/com/dtteam/dtbop/growthlogic/SmallRedwoodLogic.java @@ -5,12 +5,12 @@ import com.dtteam.dynamictrees.systems.growthlogic.context.PositionalSpeciesContext; import com.dtteam.dynamictrees.utility.CoordUtils; import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.Level; public class SmallRedwoodLogic extends ConiferLogic { - public SmallRedwoodLogic(ResourceLocation registryName) { + public SmallRedwoodLogic(Identifier registryName) { super(registryName); } diff --git a/src/main/java/com/dtteam/dtbop/tree/Bush.java b/src/main/java/com/dtteam/dtbop/tree/Bush.java index e0ae03f5..25380084 100644 --- a/src/main/java/com/dtteam/dtbop/tree/Bush.java +++ b/src/main/java/com/dtteam/dtbop/tree/Bush.java @@ -3,7 +3,7 @@ import com.dtteam.dynamictrees.systems.genfeature.BushGenFeature; import com.dtteam.dynamictrees.systems.genfeature.GenFeatures; import com.dtteam.dynamictrees.tree.species.Species; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.core.registries.BuiltInRegistries; @@ -16,14 +16,14 @@ public class Bush extends Species { public static List INSTANCES = new LinkedList<>(); - ResourceLocation log, leaves, altLeaves; + Identifier log, leaves, altLeaves; - public Bush(String name, ResourceLocation log, ResourceLocation leaves) { + public Bush(String name, Identifier log, Identifier leaves) { this(name, log, leaves, null); } - public Bush(String name, ResourceLocation log, ResourceLocation leaves, ResourceLocation altLeaves) { - this.setRegistryName(ResourceLocation.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, name)); + public Bush(String name, Identifier log, Identifier leaves, Identifier altLeaves) { + this.setRegistryName(Identifier.fromNamespaceAndPath(DynamicTreesBOP.MOD_ID, name)); this.setUnlocalizedName(this.getRegistryName().toString()); this.setStandardSoils(); this.log = log; @@ -34,11 +34,11 @@ public Bush(String name, ResourceLocation log, ResourceLocation leaves, Resource } public void setup() { - Block logBlock = BuiltInRegistries.BLOCK.get(log); - Block leavesBlock = BuiltInRegistries.BLOCK.get(leaves); + Block logBlock = BuiltInRegistries.BLOCK.get(log).map(holder -> holder.value()).orElse(Blocks.AIR); + Block leavesBlock = BuiltInRegistries.BLOCK.get(leaves).map(holder -> holder.value()).orElse(Blocks.AIR); Block altLeavesBlock = null; if (altLeaves != null) { - Block altLeafBlock = BuiltInRegistries.BLOCK.get(altLeaves); + Block altLeafBlock = BuiltInRegistries.BLOCK.get(altLeaves).map(holder -> holder.value()).orElse(Blocks.AIR); if (altLeafBlock != Blocks.AIR) altLeavesBlock = altLeafBlock; } this.addGenFeature(GenFeatures.BUSH.with(BushGenFeature.LOG, logBlock) diff --git a/src/main/java/com/dtteam/dtbop/tree/CypressSpecies.java b/src/main/java/com/dtteam/dtbop/tree/CypressSpecies.java index 88ad86af..532358c6 100644 --- a/src/main/java/com/dtteam/dtbop/tree/CypressSpecies.java +++ b/src/main/java/com/dtteam/dtbop/tree/CypressSpecies.java @@ -9,7 +9,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.state.BlockState; @@ -17,7 +17,7 @@ public class CypressSpecies extends Species { public static final TypedRegistry.EntryType TYPE = createDefaultType(CypressSpecies::new); - public CypressSpecies(ResourceLocation name, Family family, LeavesProperties leavesProperties) { + public CypressSpecies(Identifier name, Family family, LeavesProperties leavesProperties) { super(name, family, leavesProperties); } diff --git a/src/main/java/com/dtteam/dtbop/tree/GenOnStoneSpecies.java b/src/main/java/com/dtteam/dtbop/tree/GenOnStoneSpecies.java index 0c2a9e0b..823eb69e 100644 --- a/src/main/java/com/dtteam/dtbop/tree/GenOnStoneSpecies.java +++ b/src/main/java/com/dtteam/dtbop/tree/GenOnStoneSpecies.java @@ -6,7 +6,7 @@ import com.dtteam.dynamictrees.tree.family.Family; import com.dtteam.dynamictrees.tree.species.Species; import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; @@ -15,7 +15,7 @@ public class GenOnStoneSpecies extends Species { public static final TypedRegistry.EntryType TYPE = createDefaultType(GenOnStoneSpecies::new); - public GenOnStoneSpecies(ResourceLocation name, Family family, LeavesProperties leavesProperties) { + public GenOnStoneSpecies(Identifier name, Family family, LeavesProperties leavesProperties) { super(name, family, leavesProperties); } diff --git a/src/main/java/com/dtteam/dtbop/tree/GlowshroomSpecies.java b/src/main/java/com/dtteam/dtbop/tree/GlowshroomSpecies.java deleted file mode 100644 index 5133a1d2..00000000 --- a/src/main/java/com/dtteam/dtbop/tree/GlowshroomSpecies.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.dtteam.dtbop.tree; - -import com.dtteam.dynamictrees.api.registry.RegistryHandler; -import com.dtteam.dynamictrees.api.registry.TypedRegistry; -import com.dtteam.dynamictrees.block.sapling.DynamicSaplingBlock; -import com.dtteam.dynamictrees.tree.family.Family; -import com.dtteam.dynamictrees.tree.species.Species; -import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; -import com.dtteam.dynamictreesplus.tree.HugeMushroomSpecies; -import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.state.BlockState; - -public class GlowshroomSpecies extends HugeMushroomSpecies { - - public static final TypedRegistry.EntryType TYPE = createDefaultMushroomType(GlowshroomSpecies::new); - - public GlowshroomSpecies(ResourceLocation name, Family family, CapProperties capProperties) { - super(name, family, capProperties); - } - - public Species generateSapling() { - return !this.shouldGenerateSapling() || this.saplingBlock != null ? this : - this.setSapling(RegistryHandler.addBlock(this.getSaplingRegName(), () -> new DynamicSaplingBlock(this){ - @Override - public int getLightEmission(BlockState state, BlockGetter level, BlockPos pos) { - return 6; - } - - })); - } - -} diff --git a/src/main/java/com/dtteam/dtbop/tree/PoplarSpecies.java b/src/main/java/com/dtteam/dtbop/tree/PoplarSpecies.java index 865212e8..f250579c 100644 --- a/src/main/java/com/dtteam/dtbop/tree/PoplarSpecies.java +++ b/src/main/java/com/dtteam/dtbop/tree/PoplarSpecies.java @@ -11,7 +11,7 @@ import com.dtteam.dynamictrees.api.voxmap.SimpleVoxmap; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.state.BlockState; import com.dtteam.dtbop.cell.DTBOPLeafClusters; @@ -20,13 +20,13 @@ public class PoplarSpecies extends Species { public static final TypedRegistry.EntryType TYPE = createDefaultType(PoplarSpecies::new); - public PoplarSpecies(ResourceLocation name, Family family, LeavesProperties leavesProperties) { + public PoplarSpecies(Identifier name, Family family, LeavesProperties leavesProperties) { super(name, family, leavesProperties); } @Override - public NodeInspector getNodeInflator(SimpleVoxmap leafMap) { - return new NodeInflatorPoplar(this, leafMap); + public NodeInspector getNodeInflator(SimpleVoxmap leafMap, int maxRadius) { + return new NodeInflatorPoplar(this, leafMap, maxRadius); } public class NodeInflatorPoplar implements NodeInspector { @@ -36,10 +36,12 @@ public class NodeInflatorPoplar implements NodeInspector { Species species; SimpleVoxmap leafMap; + private final int maxRadius; - public NodeInflatorPoplar(Species species, SimpleVoxmap leafMap) { + public NodeInflatorPoplar(Species species, SimpleVoxmap leafMap, int maxRadius) { this.species = species; this.leafMap = leafMap; + this.maxRadius = Math.min(maxRadius, species.getMaxBranchRadius()); last = BlockPos.ZERO; } @@ -66,7 +68,7 @@ public boolean returnRun(BlockState state, LevelAccessor level, BlockPos pos, Di for (Direction dir : Direction.values()) { if (!dir.equals(fromDir)) { // Don't count where the signal originated from - BlockPos dPos = pos.offset(dir.getNormal()); + BlockPos dPos = pos.offset(dir.getUnitVec3i()); if (dPos.equals(last)) { // or the branch we just came back from isTwig = false; // on the return journey if the block we just came from is a branch we are obviously not the endpoint(twig) @@ -98,9 +100,8 @@ public boolean returnRun(BlockState state, LevelAccessor level, BlockPos pos, Di radius = (float) Math.sqrt(areaAccum) + (species.getTapering() * species.getWorldGenTaperingFactor()); //Ensure the branch is never inflated past it's species maximum - int maxRadius = species.getMaxBranchRadius(); - if (radius > maxRadius) { - radius = maxRadius; + if (radius > this.maxRadius) { + radius = this.maxRadius; } // Make sure that non-twig branches are at least radius 2 diff --git a/src/main/java/com/dtteam/dtbop/tree/TwigletSpecies.java b/src/main/java/com/dtteam/dtbop/tree/TwigletSpecies.java index ed6b2308..c8d25d9a 100644 --- a/src/main/java/com/dtteam/dtbop/tree/TwigletSpecies.java +++ b/src/main/java/com/dtteam/dtbop/tree/TwigletSpecies.java @@ -5,13 +5,13 @@ import com.dtteam.dynamictrees.systems.nodemapper.NetVolumeNode; import com.dtteam.dynamictrees.tree.family.Family; import com.dtteam.dynamictrees.tree.species.Species; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class TwigletSpecies extends Species { public static final TypedRegistry.EntryType TYPE = createDefaultType(TwigletSpecies::new); - public TwigletSpecies(ResourceLocation name, Family family, LeavesProperties leavesProperties) { + public TwigletSpecies(Identifier name, Family family, LeavesProperties leavesProperties) { super(name, family, leavesProperties); setBasicGrowingParameters(0.3f, 2.5f, 1, 2, 1.0f); } diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml deleted file mode 100644 index d175fa60..00000000 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ /dev/null @@ -1,52 +0,0 @@ -modLoader="javafml" -loaderVersion="[1,)" -license="MIT" - -[[mods]] #mandatory -modId="dtbop" #mandatory -version="${file.jarVersion}" #mandatory -displayName="Dynamic Trees for Biomes o' Plenty" #mandatory -updateJSONURL="https://github.com/DynamicTreesTeam/DynamicTreesVersionInfo/blob/master/Add-ons/BOP.json?raw=true" #optional -displayURL="https://www.curseforge.com/minecraft/mc-mods/dtbop" #optional -logoFile="" #optional -credits="ferreusveritas, Nyfaria, ISNing, Groupix05" #optional -authors="mangoose, Max Hyper" #optional - -description=''' -Compatibility Mod between Dynamic trees and Biomes o' plenty -''' - -[[dependencies.dtbop]] #optional - modId="neoforge" - type="required" - versionRange="[21.1.0,)" - ordering="NONE" - side="BOTH" - -[[dependencies.dtbop]] - modId="minecraft" - type="required" - versionRange="[1.21.1]" - ordering="NONE" - side="BOTH" - -[[dependencies.dtbop]] - modId="dynamictrees" - type="required" - versionRange="[1.5.0-BETA01,)" - ordering="AFTER" - side="BOTH" - -[[dependencies.dtbop]] - modId="dynamictreesplus" - type="optional" - versionRange="[1.2.0-BETA1,)" - ordering="AFTER" - side="BOTH" - -[[dependencies.dtbop]] - modId="biomesoplenty" - type="required" - versionRange="[21.1.0.7,)" - ordering="AFTER" - side="BOTH" diff --git a/src/generated/resources/assets/dtbop/blockstates/acacia_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/acacia_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/acacia_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/acacia_twiglet_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/acacia_undergrowth_leaves.json b/src/main/resources/assets/dtbop/blockstates/acacia_undergrowth_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/acacia_undergrowth_leaves.json rename to src/main/resources/assets/dtbop/blockstates/acacia_undergrowth_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/aspen_leaves.json b/src/main/resources/assets/dtbop/blockstates/aspen_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/aspen_leaves.json rename to src/main/resources/assets/dtbop/blockstates/aspen_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/aspen_sapling.json b/src/main/resources/assets/dtbop/blockstates/aspen_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/aspen_sapling.json rename to src/main/resources/assets/dtbop/blockstates/aspen_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/cherry_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/cherry_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/cherry_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/cherry_twiglet_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/cypress_willow_leaves.json b/src/main/resources/assets/dtbop/blockstates/cypress_willow_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/cypress_willow_leaves.json rename to src/main/resources/assets/dtbop/blockstates/cypress_willow_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/dark_oak_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/dark_oak_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/dark_oak_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/dark_oak_twiglet_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/dark_poplar_leaves.json b/src/main/resources/assets/dtbop/blockstates/dark_poplar_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/dark_poplar_leaves.json rename to src/main/resources/assets/dtbop/blockstates/dark_poplar_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/dark_poplar_sapling.json b/src/main/resources/assets/dtbop/blockstates/dark_poplar_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/dark_poplar_sapling.json rename to src/main/resources/assets/dtbop/blockstates/dark_poplar_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/dead_branch.json b/src/main/resources/assets/dtbop/blockstates/dead_branch.json new file mode 100644 index 00000000..a378eb89 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/dead_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:dead", + "textures": { + "bark": "biomesoplenty:block/dead_log", + "rings": "biomesoplenty:block/dead_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/dying_leaves.json b/src/main/resources/assets/dtbop/blockstates/dying_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/dying_leaves.json rename to src/main/resources/assets/dtbop/blockstates/dying_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/dying_sapling.json b/src/main/resources/assets/dtbop/blockstates/dying_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/dying_sapling.json rename to src/main/resources/assets/dtbop/blockstates/dying_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/fir_branch.json b/src/main/resources/assets/dtbop/blockstates/fir_branch.json new file mode 100644 index 00000000..181936c8 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/fir_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:fir", + "textures": { + "bark": "biomesoplenty:block/fir_log", + "rings": "biomesoplenty:block/fir_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/fir_leaves.json b/src/main/resources/assets/dtbop/blockstates/fir_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/fir_leaves.json rename to src/main/resources/assets/dtbop/blockstates/fir_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/fir_sapling.json b/src/main/resources/assets/dtbop/blockstates/fir_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/fir_sapling.json rename to src/main/resources/assets/dtbop/blockstates/fir_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/flowering_oak_leaves.json b/src/main/resources/assets/dtbop/blockstates/flowering_oak_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/flowering_oak_leaves.json rename to src/main/resources/assets/dtbop/blockstates/flowering_oak_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/flowering_oak_sapling.json b/src/main/resources/assets/dtbop/blockstates/flowering_oak_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/flowering_oak_sapling.json rename to src/main/resources/assets/dtbop/blockstates/flowering_oak_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/flowering_oak_undergrowth_leaves.json b/src/main/resources/assets/dtbop/blockstates/flowering_oak_undergrowth_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/flowering_oak_undergrowth_leaves.json rename to src/main/resources/assets/dtbop/blockstates/flowering_oak_undergrowth_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/glowshroom_cap.json b/src/main/resources/assets/dtbop/blockstates/glowshroom_cap.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/glowshroom_cap.json rename to src/main/resources/assets/dtbop/blockstates/glowshroom_cap.json diff --git a/src/generated/resources/assets/dtbop/blockstates/glowshroom_cap_center.json b/src/main/resources/assets/dtbop/blockstates/glowshroom_cap_center.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/glowshroom_cap_center.json rename to src/main/resources/assets/dtbop/blockstates/glowshroom_cap_center.json diff --git a/src/generated/resources/assets/dtbop/blockstates/glowshroom_sapling.json b/src/main/resources/assets/dtbop/blockstates/glowshroom_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/glowshroom_sapling.json rename to src/main/resources/assets/dtbop/blockstates/glowshroom_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/hellbark_branch.json b/src/main/resources/assets/dtbop/blockstates/hellbark_branch.json new file mode 100644 index 00000000..c3023556 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/hellbark_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:hellbark", + "textures": { + "bark": "biomesoplenty:block/hellbark_log", + "rings": "biomesoplenty:block/hellbark_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/hellbark_bush_leaves.json b/src/main/resources/assets/dtbop/blockstates/hellbark_bush_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/hellbark_bush_leaves.json rename to src/main/resources/assets/dtbop/blockstates/hellbark_bush_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/hellbark_leaves.json b/src/main/resources/assets/dtbop/blockstates/hellbark_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/hellbark_leaves.json rename to src/main/resources/assets/dtbop/blockstates/hellbark_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/hellbark_sapling.json b/src/main/resources/assets/dtbop/blockstates/hellbark_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/hellbark_sapling.json rename to src/main/resources/assets/dtbop/blockstates/hellbark_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/jacaranda_branch.json b/src/main/resources/assets/dtbop/blockstates/jacaranda_branch.json new file mode 100644 index 00000000..c863d6fe --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/jacaranda_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:jacaranda", + "textures": { + "bark": "biomesoplenty:block/jacaranda_log", + "rings": "biomesoplenty:block/jacaranda_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/jacaranda_leaves.json b/src/main/resources/assets/dtbop/blockstates/jacaranda_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/jacaranda_leaves.json rename to src/main/resources/assets/dtbop/blockstates/jacaranda_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/jacaranda_sapling.json b/src/main/resources/assets/dtbop/blockstates/jacaranda_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/jacaranda_sapling.json rename to src/main/resources/assets/dtbop/blockstates/jacaranda_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/jungle_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/jungle_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/jungle_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/jungle_twiglet_leaves.json diff --git a/src/main/resources/assets/dtbop/blockstates/magic_branch.json b/src/main/resources/assets/dtbop/blockstates/magic_branch.json new file mode 100644 index 00000000..00aa600c --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/magic_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:magic", + "textures": { + "bark": "biomesoplenty:block/magic_log", + "rings": "biomesoplenty:block/magic_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/magic_poplar_leaves.json b/src/main/resources/assets/dtbop/blockstates/magic_poplar_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/magic_poplar_leaves.json rename to src/main/resources/assets/dtbop/blockstates/magic_poplar_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/magic_poplar_sapling.json b/src/main/resources/assets/dtbop/blockstates/magic_poplar_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/magic_poplar_sapling.json rename to src/main/resources/assets/dtbop/blockstates/magic_poplar_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/mahogany_branch.json b/src/main/resources/assets/dtbop/blockstates/mahogany_branch.json new file mode 100644 index 00000000..072afef8 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/mahogany_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:mahogany", + "textures": { + "bark": "biomesoplenty:block/mahogany_log", + "rings": "biomesoplenty:block/mahogany_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/mahogany_leaves.json b/src/main/resources/assets/dtbop/blockstates/mahogany_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/mahogany_leaves.json rename to src/main/resources/assets/dtbop/blockstates/mahogany_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/mahogany_sapling.json b/src/main/resources/assets/dtbop/blockstates/mahogany_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/mahogany_sapling.json rename to src/main/resources/assets/dtbop/blockstates/mahogany_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/mangrove_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/mangrove_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/mangrove_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/mangrove_twiglet_leaves.json diff --git a/src/main/resources/assets/dtbop/blockstates/maple_branch.json b/src/main/resources/assets/dtbop/blockstates/maple_branch.json new file mode 100644 index 00000000..906ea133 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/maple_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:maple", + "textures": { + "bark": "biomesoplenty:block/maple_log", + "rings": "biomesoplenty:block/maple_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/maple_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/maple_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/maple_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/maple_twiglet_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/mega_dark_oak_leaves.json b/src/main/resources/assets/dtbop/blockstates/mega_dark_oak_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/mega_dark_oak_leaves.json rename to src/main/resources/assets/dtbop/blockstates/mega_dark_oak_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/mega_fir_sapling.json b/src/main/resources/assets/dtbop/blockstates/mega_fir_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/mega_fir_sapling.json rename to src/main/resources/assets/dtbop/blockstates/mega_fir_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/mega_umbran_sapling.json b/src/main/resources/assets/dtbop/blockstates/mega_umbran_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/mega_umbran_sapling.json rename to src/main/resources/assets/dtbop/blockstates/mega_umbran_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/oak_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/oak_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/oak_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/oak_twiglet_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/orange_maple_leaves.json b/src/main/resources/assets/dtbop/blockstates/orange_maple_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/orange_maple_leaves.json rename to src/main/resources/assets/dtbop/blockstates/orange_maple_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/orange_maple_sapling.json b/src/main/resources/assets/dtbop/blockstates/orange_maple_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/orange_maple_sapling.json rename to src/main/resources/assets/dtbop/blockstates/orange_maple_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/palm_branch.json b/src/main/resources/assets/dtbop/blockstates/palm_branch.json new file mode 100644 index 00000000..0fdcde0d --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/palm_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:palm", + "textures": { + "bark": "biomesoplenty:block/palm_log", + "rings": "biomesoplenty:block/palm_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/palm_leaves.json b/src/main/resources/assets/dtbop/blockstates/palm_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/palm_leaves.json rename to src/main/resources/assets/dtbop/blockstates/palm_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/palm_sapling.json b/src/main/resources/assets/dtbop/blockstates/palm_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/palm_sapling.json rename to src/main/resources/assets/dtbop/blockstates/palm_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/pine_branch.json b/src/main/resources/assets/dtbop/blockstates/pine_branch.json new file mode 100644 index 00000000..d7cd1d5b --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/pine_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:pine", + "textures": { + "bark": "biomesoplenty:block/pine_log", + "rings": "biomesoplenty:block/pine_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/pine_leaves.json b/src/main/resources/assets/dtbop/blockstates/pine_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/pine_leaves.json rename to src/main/resources/assets/dtbop/blockstates/pine_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/pine_sapling.json b/src/main/resources/assets/dtbop/blockstates/pine_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/pine_sapling.json rename to src/main/resources/assets/dtbop/blockstates/pine_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/poplar_leaves.json b/src/main/resources/assets/dtbop/blockstates/poplar_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/poplar_leaves.json rename to src/main/resources/assets/dtbop/blockstates/poplar_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/poplar_sapling.json b/src/main/resources/assets/dtbop/blockstates/poplar_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/poplar_sapling.json rename to src/main/resources/assets/dtbop/blockstates/poplar_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/rainbow_birch_leaves.json b/src/main/resources/assets/dtbop/blockstates/rainbow_birch_leaves.json new file mode 100644 index 00000000..45a5921d --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/rainbow_birch_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "minecraft:block/birch_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/blockstates/rainbow_birch_sapling.json b/src/main/resources/assets/dtbop/blockstates/rainbow_birch_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/rainbow_birch_sapling.json rename to src/main/resources/assets/dtbop/blockstates/rainbow_birch_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/red_maple_leaves.json b/src/main/resources/assets/dtbop/blockstates/red_maple_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/red_maple_leaves.json rename to src/main/resources/assets/dtbop/blockstates/red_maple_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/red_maple_sapling.json b/src/main/resources/assets/dtbop/blockstates/red_maple_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/red_maple_sapling.json rename to src/main/resources/assets/dtbop/blockstates/red_maple_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/redwood_branch.json b/src/main/resources/assets/dtbop/blockstates/redwood_branch.json new file mode 100644 index 00000000..5a663a5a --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/redwood_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:redwood", + "textures": { + "bark": "biomesoplenty:block/redwood_log", + "rings": "biomesoplenty:block/redwood_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/redwood_leaves.json b/src/main/resources/assets/dtbop/blockstates/redwood_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/redwood_leaves.json rename to src/main/resources/assets/dtbop/blockstates/redwood_leaves.json diff --git a/src/main/resources/assets/dtbop/blockstates/redwood_root.json b/src/main/resources/assets/dtbop/blockstates/redwood_root.json new file mode 100644 index 00000000..6006046a --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/redwood_root.json @@ -0,0 +1,11 @@ +{ + "variants": { + "": { + "type": "dynamictrees:surface_root", + "fabric:type": "dynamictrees:surface_root", + "textures": { + "bark": "biomesoplenty:block/redwood_log" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/redwood_sapling.json b/src/main/resources/assets/dtbop/blockstates/redwood_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/redwood_sapling.json rename to src/main/resources/assets/dtbop/blockstates/redwood_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/rooty_black_sand.json b/src/main/resources/assets/dtbop/blockstates/rooty_black_sand.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/rooty_black_sand.json rename to src/main/resources/assets/dtbop/blockstates/rooty_black_sand.json diff --git a/src/generated/resources/assets/dtbop/blockstates/rooty_dried_salt.json b/src/main/resources/assets/dtbop/blockstates/rooty_dried_salt.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/rooty_dried_salt.json rename to src/main/resources/assets/dtbop/blockstates/rooty_dried_salt.json diff --git a/src/generated/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json b/src/main/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json rename to src/main/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json diff --git a/src/generated/resources/assets/dtbop/blockstates/rooty_mossy_black_sand.json b/src/main/resources/assets/dtbop/blockstates/rooty_mossy_black_sand.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/rooty_mossy_black_sand.json rename to src/main/resources/assets/dtbop/blockstates/rooty_mossy_black_sand.json diff --git a/src/generated/resources/assets/dtbop/blockstates/rooty_orange_sand.json b/src/main/resources/assets/dtbop/blockstates/rooty_orange_sand.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/rooty_orange_sand.json rename to src/main/resources/assets/dtbop/blockstates/rooty_orange_sand.json diff --git a/src/generated/resources/assets/dtbop/blockstates/rooty_origin_grass_block.json b/src/main/resources/assets/dtbop/blockstates/rooty_origin_grass_block.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/rooty_origin_grass_block.json rename to src/main/resources/assets/dtbop/blockstates/rooty_origin_grass_block.json diff --git a/src/generated/resources/assets/dtbop/blockstates/rooty_white_sand.json b/src/main/resources/assets/dtbop/blockstates/rooty_white_sand.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/rooty_white_sand.json rename to src/main/resources/assets/dtbop/blockstates/rooty_white_sand.json diff --git a/src/generated/resources/assets/dtbop/blockstates/silk_undergrowth_web.json b/src/main/resources/assets/dtbop/blockstates/silk_undergrowth_web.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/silk_undergrowth_web.json rename to src/main/resources/assets/dtbop/blockstates/silk_undergrowth_web.json diff --git a/src/generated/resources/assets/dtbop/blockstates/silk_web.json b/src/main/resources/assets/dtbop/blockstates/silk_web.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/silk_web.json rename to src/main/resources/assets/dtbop/blockstates/silk_web.json diff --git a/src/generated/resources/assets/dtbop/blockstates/snowblossom_leaves.json b/src/main/resources/assets/dtbop/blockstates/snowblossom_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/snowblossom_leaves.json rename to src/main/resources/assets/dtbop/blockstates/snowblossom_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/snowblossom_sapling.json b/src/main/resources/assets/dtbop/blockstates/snowblossom_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/snowblossom_sapling.json rename to src/main/resources/assets/dtbop/blockstates/snowblossom_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/snowblossom_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/snowblossom_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/snowblossom_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/snowblossom_twiglet_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/sparse_acacia_leaves.json b/src/main/resources/assets/dtbop/blockstates/sparse_acacia_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/sparse_acacia_leaves.json rename to src/main/resources/assets/dtbop/blockstates/sparse_acacia_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/sparse_oak_leaves.json b/src/main/resources/assets/dtbop/blockstates/sparse_oak_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/sparse_oak_leaves.json rename to src/main/resources/assets/dtbop/blockstates/sparse_oak_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/spruce_poplar_leaves.json b/src/main/resources/assets/dtbop/blockstates/spruce_poplar_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/spruce_poplar_leaves.json rename to src/main/resources/assets/dtbop/blockstates/spruce_poplar_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/spruce_poplar_sapling.json b/src/main/resources/assets/dtbop/blockstates/spruce_poplar_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/spruce_poplar_sapling.json rename to src/main/resources/assets/dtbop/blockstates/spruce_poplar_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/spruce_twiglet_leaves.json b/src/main/resources/assets/dtbop/blockstates/spruce_twiglet_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/spruce_twiglet_leaves.json rename to src/main/resources/assets/dtbop/blockstates/spruce_twiglet_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/spruce_undergrowth_leaves.json b/src/main/resources/assets/dtbop/blockstates/spruce_undergrowth_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/spruce_undergrowth_leaves.json rename to src/main/resources/assets/dtbop/blockstates/spruce_undergrowth_leaves.json diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_dead_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_dead_branch.json new file mode 100644 index 00000000..2312e1cf --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_dead_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:dead", + "textures": { + "bark": "biomesoplenty:block/stripped_dead_log", + "rings": "biomesoplenty:block/stripped_dead_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_fir_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_fir_branch.json new file mode 100644 index 00000000..a72fe98a --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_fir_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:fir", + "textures": { + "bark": "biomesoplenty:block/stripped_fir_log", + "rings": "biomesoplenty:block/stripped_fir_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_hellbark_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_hellbark_branch.json new file mode 100644 index 00000000..50ba7895 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_hellbark_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:hellbark", + "textures": { + "bark": "biomesoplenty:block/stripped_hellbark_log", + "rings": "biomesoplenty:block/stripped_hellbark_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_jacaranda_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_jacaranda_branch.json new file mode 100644 index 00000000..b2a6c0af --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_jacaranda_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:jacaranda", + "textures": { + "bark": "biomesoplenty:block/stripped_jacaranda_log", + "rings": "biomesoplenty:block/stripped_jacaranda_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_magic_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_magic_branch.json new file mode 100644 index 00000000..36455e79 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_magic_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:magic", + "textures": { + "bark": "biomesoplenty:block/stripped_magic_log", + "rings": "biomesoplenty:block/stripped_magic_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_mahogany_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_mahogany_branch.json new file mode 100644 index 00000000..6d3905e9 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_mahogany_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:mahogany", + "textures": { + "bark": "biomesoplenty:block/stripped_mahogany_log", + "rings": "biomesoplenty:block/stripped_mahogany_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_maple_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_maple_branch.json new file mode 100644 index 00000000..9d2a5d8a --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_maple_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:maple", + "textures": { + "bark": "biomesoplenty:block/stripped_maple_log", + "rings": "biomesoplenty:block/stripped_maple_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_palm_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_palm_branch.json new file mode 100644 index 00000000..6e33671e --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_palm_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:palm", + "textures": { + "bark": "biomesoplenty:block/stripped_palm_log", + "rings": "biomesoplenty:block/stripped_palm_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_pine_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_pine_branch.json new file mode 100644 index 00000000..6e7f387e --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_pine_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:pine", + "textures": { + "bark": "biomesoplenty:block/stripped_pine_log", + "rings": "biomesoplenty:block/stripped_pine_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_redwood_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_redwood_branch.json new file mode 100644 index 00000000..abd93af5 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_redwood_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:redwood", + "textures": { + "bark": "biomesoplenty:block/stripped_redwood_log", + "rings": "biomesoplenty:block/stripped_redwood_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_umbran_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_umbran_branch.json new file mode 100644 index 00000000..ef2d17c8 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_umbran_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:umbran", + "textures": { + "bark": "biomesoplenty:block/stripped_umbran_log", + "rings": "biomesoplenty:block/stripped_umbran_log_top" + } + } + } +} diff --git a/src/main/resources/assets/dtbop/blockstates/stripped_willow_branch.json b/src/main/resources/assets/dtbop/blockstates/stripped_willow_branch.json new file mode 100644 index 00000000..19ae6f65 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/stripped_willow_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:willow", + "textures": { + "bark": "biomesoplenty:block/stripped_willow_log", + "rings": "biomesoplenty:block/stripped_willow_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/toadstool_cap.json b/src/main/resources/assets/dtbop/blockstates/toadstool_cap.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/toadstool_cap.json rename to src/main/resources/assets/dtbop/blockstates/toadstool_cap.json diff --git a/src/generated/resources/assets/dtbop/blockstates/toadstool_cap_center.json b/src/main/resources/assets/dtbop/blockstates/toadstool_cap_center.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/toadstool_cap_center.json rename to src/main/resources/assets/dtbop/blockstates/toadstool_cap_center.json diff --git a/src/generated/resources/assets/dtbop/blockstates/toadstool_sapling.json b/src/main/resources/assets/dtbop/blockstates/toadstool_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/toadstool_sapling.json rename to src/main/resources/assets/dtbop/blockstates/toadstool_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/umbran_branch.json b/src/main/resources/assets/dtbop/blockstates/umbran_branch.json new file mode 100644 index 00000000..1213fd97 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/umbran_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:umbran", + "textures": { + "bark": "biomesoplenty:block/umbran_log", + "rings": "biomesoplenty:block/umbran_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/umbran_leaves.json b/src/main/resources/assets/dtbop/blockstates/umbran_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/umbran_leaves.json rename to src/main/resources/assets/dtbop/blockstates/umbran_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/umbran_sapling.json b/src/main/resources/assets/dtbop/blockstates/umbran_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/umbran_sapling.json rename to src/main/resources/assets/dtbop/blockstates/umbran_sapling.json diff --git a/src/main/resources/assets/dtbop/blockstates/willow_branch.json b/src/main/resources/assets/dtbop/blockstates/willow_branch.json new file mode 100644 index 00000000..ee9ccd66 --- /dev/null +++ b/src/main/resources/assets/dtbop/blockstates/willow_branch.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": { + "type": "dynamictrees:branch", + "fabric:type": "dynamictrees:branch", + "family": "dtbop:willow", + "textures": { + "bark": "biomesoplenty:block/willow_log", + "rings": "biomesoplenty:block/willow_log_top" + } + } + } +} diff --git a/src/generated/resources/assets/dtbop/blockstates/willow_leaves.json b/src/main/resources/assets/dtbop/blockstates/willow_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/willow_leaves.json rename to src/main/resources/assets/dtbop/blockstates/willow_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/willow_sapling.json b/src/main/resources/assets/dtbop/blockstates/willow_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/willow_sapling.json rename to src/main/resources/assets/dtbop/blockstates/willow_sapling.json diff --git a/src/generated/resources/assets/dtbop/blockstates/yellow_maple_leaves.json b/src/main/resources/assets/dtbop/blockstates/yellow_maple_leaves.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/yellow_maple_leaves.json rename to src/main/resources/assets/dtbop/blockstates/yellow_maple_leaves.json diff --git a/src/generated/resources/assets/dtbop/blockstates/yellow_maple_sapling.json b/src/main/resources/assets/dtbop/blockstates/yellow_maple_sapling.json similarity index 100% rename from src/generated/resources/assets/dtbop/blockstates/yellow_maple_sapling.json rename to src/main/resources/assets/dtbop/blockstates/yellow_maple_sapling.json diff --git a/src/generated/resources/assets/dtbop/lang/en_us.json b/src/main/resources/assets/dtbop/lang/en_us.json similarity index 100% rename from src/generated/resources/assets/dtbop/lang/en_us.json rename to src/main/resources/assets/dtbop/lang/en_us.json diff --git a/src/main/resources/assets/dtbop/models/block/large_roots_water.json b/src/main/resources/assets/dtbop/models/block/large_roots_water.json index 97c32618..862e4abd 100644 --- a/src/main/resources/assets/dtbop/models/block/large_roots_water.json +++ b/src/main/resources/assets/dtbop/models/block/large_roots_water.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "parent": "block/tinted_cross", - "texture_size": [68, 48], + "texture_size": [128, 64], "textures": { "1": "dtbop:block/large_water_roots" }, diff --git a/src/generated/resources/assets/dtbop/models/block/mushroom/glowshroom_cap_center_age0.json b/src/main/resources/assets/dtbop/models/block/mushroom/glowshroom_cap_center_age0.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/mushroom/glowshroom_cap_center_age0.json rename to src/main/resources/assets/dtbop/models/block/mushroom/glowshroom_cap_center_age0.json diff --git a/src/generated/resources/assets/dtbop/models/block/mushroom/toadstool_cap_center_age0.json b/src/main/resources/assets/dtbop/models/block/mushroom/toadstool_cap_center_age0.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/mushroom/toadstool_cap_center_age0.json rename to src/main/resources/assets/dtbop/models/block/mushroom/toadstool_cap_center_age0.json diff --git a/src/generated/resources/assets/dtbop/models/block/palm_leaves/palm_core_bottom.json b/src/main/resources/assets/dtbop/models/block/palm_leaves/palm_core_bottom.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/palm_leaves/palm_core_bottom.json rename to src/main/resources/assets/dtbop/models/block/palm_leaves/palm_core_bottom.json diff --git a/src/generated/resources/assets/dtbop/models/block/palm_leaves/palm_core_top.json b/src/main/resources/assets/dtbop/models/block/palm_leaves/palm_core_top.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/palm_leaves/palm_core_top.json rename to src/main/resources/assets/dtbop/models/block/palm_leaves/palm_core_top.json diff --git a/src/main/resources/assets/dtbop/models/block/palm_leaves/palm_frond.json b/src/main/resources/assets/dtbop/models/block/palm_leaves/palm_frond.json new file mode 100644 index 00000000..ee3bd8a2 --- /dev/null +++ b/src/main/resources/assets/dtbop/models/block/palm_leaves/palm_frond.json @@ -0,0 +1,4 @@ +{ + "__comment": "TODO 26.2 port: DT core has no 26.2 loader for 'dynamictrees:large_palm_fronds' yet; render regular palm leaves as a placeholder so the model parses cleanly.", + "parent": "biomesoplenty:block/palm_leaves" +} diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/aspen.json b/src/main/resources/assets/dtbop/models/block/saplings/aspen.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/aspen.json rename to src/main/resources/assets/dtbop/models/block/saplings/aspen.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/dark_poplar.json b/src/main/resources/assets/dtbop/models/block/saplings/dark_poplar.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/dark_poplar.json rename to src/main/resources/assets/dtbop/models/block/saplings/dark_poplar.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/dying.json b/src/main/resources/assets/dtbop/models/block/saplings/dying.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/dying.json rename to src/main/resources/assets/dtbop/models/block/saplings/dying.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/fir.json b/src/main/resources/assets/dtbop/models/block/saplings/fir.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/fir.json rename to src/main/resources/assets/dtbop/models/block/saplings/fir.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/flowering_oak.json b/src/main/resources/assets/dtbop/models/block/saplings/flowering_oak.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/flowering_oak.json rename to src/main/resources/assets/dtbop/models/block/saplings/flowering_oak.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/glowshroom.json b/src/main/resources/assets/dtbop/models/block/saplings/glowshroom.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/glowshroom.json rename to src/main/resources/assets/dtbop/models/block/saplings/glowshroom.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/hellbark.json b/src/main/resources/assets/dtbop/models/block/saplings/hellbark.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/hellbark.json rename to src/main/resources/assets/dtbop/models/block/saplings/hellbark.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/jacaranda.json b/src/main/resources/assets/dtbop/models/block/saplings/jacaranda.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/jacaranda.json rename to src/main/resources/assets/dtbop/models/block/saplings/jacaranda.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/magic_poplar.json b/src/main/resources/assets/dtbop/models/block/saplings/magic_poplar.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/magic_poplar.json rename to src/main/resources/assets/dtbop/models/block/saplings/magic_poplar.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/mahogany.json b/src/main/resources/assets/dtbop/models/block/saplings/mahogany.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/mahogany.json rename to src/main/resources/assets/dtbop/models/block/saplings/mahogany.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/mega_fir.json b/src/main/resources/assets/dtbop/models/block/saplings/mega_fir.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/mega_fir.json rename to src/main/resources/assets/dtbop/models/block/saplings/mega_fir.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/mega_umbran.json b/src/main/resources/assets/dtbop/models/block/saplings/mega_umbran.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/mega_umbran.json rename to src/main/resources/assets/dtbop/models/block/saplings/mega_umbran.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/orange_maple.json b/src/main/resources/assets/dtbop/models/block/saplings/orange_maple.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/orange_maple.json rename to src/main/resources/assets/dtbop/models/block/saplings/orange_maple.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/palm.json b/src/main/resources/assets/dtbop/models/block/saplings/palm.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/palm.json rename to src/main/resources/assets/dtbop/models/block/saplings/palm.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/pine.json b/src/main/resources/assets/dtbop/models/block/saplings/pine.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/pine.json rename to src/main/resources/assets/dtbop/models/block/saplings/pine.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/poplar.json b/src/main/resources/assets/dtbop/models/block/saplings/poplar.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/poplar.json rename to src/main/resources/assets/dtbop/models/block/saplings/poplar.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/rainbow_birch.json b/src/main/resources/assets/dtbop/models/block/saplings/rainbow_birch.json similarity index 73% rename from src/generated/resources/assets/dtbop/models/block/saplings/rainbow_birch.json rename to src/main/resources/assets/dtbop/models/block/saplings/rainbow_birch.json index dc388414..4e1fd525 100644 --- a/src/generated/resources/assets/dtbop/models/block/saplings/rainbow_birch.json +++ b/src/main/resources/assets/dtbop/models/block/saplings/rainbow_birch.json @@ -2,7 +2,7 @@ "parent": "dynamictrees:block/smartmodel/sapling", "render_type": "minecraft:cutout_mipped", "textures": { - "leaves": "biomesoplenty:block/rainbow_birch_leaves", + "leaves": "minecraft:block/birch_leaves", "log": "minecraft:block/birch_log" } } \ No newline at end of file diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/red_maple.json b/src/main/resources/assets/dtbop/models/block/saplings/red_maple.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/red_maple.json rename to src/main/resources/assets/dtbop/models/block/saplings/red_maple.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/redwood.json b/src/main/resources/assets/dtbop/models/block/saplings/redwood.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/redwood.json rename to src/main/resources/assets/dtbop/models/block/saplings/redwood.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/snowblossom.json b/src/main/resources/assets/dtbop/models/block/saplings/snowblossom.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/snowblossom.json rename to src/main/resources/assets/dtbop/models/block/saplings/snowblossom.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/spruce_poplar.json b/src/main/resources/assets/dtbop/models/block/saplings/spruce_poplar.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/spruce_poplar.json rename to src/main/resources/assets/dtbop/models/block/saplings/spruce_poplar.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/toadstool.json b/src/main/resources/assets/dtbop/models/block/saplings/toadstool.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/toadstool.json rename to src/main/resources/assets/dtbop/models/block/saplings/toadstool.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/umbran.json b/src/main/resources/assets/dtbop/models/block/saplings/umbran.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/umbran.json rename to src/main/resources/assets/dtbop/models/block/saplings/umbran.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/willow.json b/src/main/resources/assets/dtbop/models/block/saplings/willow.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/willow.json rename to src/main/resources/assets/dtbop/models/block/saplings/willow.json diff --git a/src/generated/resources/assets/dtbop/models/block/saplings/yellow_maple.json b/src/main/resources/assets/dtbop/models/block/saplings/yellow_maple.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/block/saplings/yellow_maple.json rename to src/main/resources/assets/dtbop/models/block/saplings/yellow_maple.json diff --git a/src/generated/resources/assets/dtbop/models/item/aspen_seed.json b/src/main/resources/assets/dtbop/models/item/aspen_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/aspen_seed.json rename to src/main/resources/assets/dtbop/models/item/aspen_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/dark_poplar_seed.json b/src/main/resources/assets/dtbop/models/item/dark_poplar_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/dark_poplar_seed.json rename to src/main/resources/assets/dtbop/models/item/dark_poplar_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/dead_branch.json b/src/main/resources/assets/dtbop/models/item/dead_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/dead_branch.json rename to src/main/resources/assets/dtbop/models/item/dead_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/dying_seed.json b/src/main/resources/assets/dtbop/models/item/dying_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/dying_seed.json rename to src/main/resources/assets/dtbop/models/item/dying_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/fir_branch.json b/src/main/resources/assets/dtbop/models/item/fir_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/fir_branch.json rename to src/main/resources/assets/dtbop/models/item/fir_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/fir_seed.json b/src/main/resources/assets/dtbop/models/item/fir_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/fir_seed.json rename to src/main/resources/assets/dtbop/models/item/fir_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/flowering_oak_seed.json b/src/main/resources/assets/dtbop/models/item/flowering_oak_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/flowering_oak_seed.json rename to src/main/resources/assets/dtbop/models/item/flowering_oak_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/glowshroom_seed.json b/src/main/resources/assets/dtbop/models/item/glowshroom_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/glowshroom_seed.json rename to src/main/resources/assets/dtbop/models/item/glowshroom_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/hellbark_branch.json b/src/main/resources/assets/dtbop/models/item/hellbark_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/hellbark_branch.json rename to src/main/resources/assets/dtbop/models/item/hellbark_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/hellbark_seed.json b/src/main/resources/assets/dtbop/models/item/hellbark_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/hellbark_seed.json rename to src/main/resources/assets/dtbop/models/item/hellbark_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/jacaranda_branch.json b/src/main/resources/assets/dtbop/models/item/jacaranda_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/jacaranda_branch.json rename to src/main/resources/assets/dtbop/models/item/jacaranda_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/jacaranda_seed.json b/src/main/resources/assets/dtbop/models/item/jacaranda_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/jacaranda_seed.json rename to src/main/resources/assets/dtbop/models/item/jacaranda_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/magic_branch.json b/src/main/resources/assets/dtbop/models/item/magic_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/magic_branch.json rename to src/main/resources/assets/dtbop/models/item/magic_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/magic_poplar_seed.json b/src/main/resources/assets/dtbop/models/item/magic_poplar_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/magic_poplar_seed.json rename to src/main/resources/assets/dtbop/models/item/magic_poplar_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/mahogany_branch.json b/src/main/resources/assets/dtbop/models/item/mahogany_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/mahogany_branch.json rename to src/main/resources/assets/dtbop/models/item/mahogany_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/mahogany_seed.json b/src/main/resources/assets/dtbop/models/item/mahogany_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/mahogany_seed.json rename to src/main/resources/assets/dtbop/models/item/mahogany_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/maple_branch.json b/src/main/resources/assets/dtbop/models/item/maple_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/maple_branch.json rename to src/main/resources/assets/dtbop/models/item/maple_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/mega_fir_seed.json b/src/main/resources/assets/dtbop/models/item/mega_fir_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/mega_fir_seed.json rename to src/main/resources/assets/dtbop/models/item/mega_fir_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/mega_umbran_seed.json b/src/main/resources/assets/dtbop/models/item/mega_umbran_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/mega_umbran_seed.json rename to src/main/resources/assets/dtbop/models/item/mega_umbran_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/orange_maple_seed.json b/src/main/resources/assets/dtbop/models/item/orange_maple_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/orange_maple_seed.json rename to src/main/resources/assets/dtbop/models/item/orange_maple_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/palm_branch.json b/src/main/resources/assets/dtbop/models/item/palm_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/palm_branch.json rename to src/main/resources/assets/dtbop/models/item/palm_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/palm_seed.json b/src/main/resources/assets/dtbop/models/item/palm_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/palm_seed.json rename to src/main/resources/assets/dtbop/models/item/palm_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/pine_branch.json b/src/main/resources/assets/dtbop/models/item/pine_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/pine_branch.json rename to src/main/resources/assets/dtbop/models/item/pine_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/pine_seed.json b/src/main/resources/assets/dtbop/models/item/pine_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/pine_seed.json rename to src/main/resources/assets/dtbop/models/item/pine_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/poplar_seed.json b/src/main/resources/assets/dtbop/models/item/poplar_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/poplar_seed.json rename to src/main/resources/assets/dtbop/models/item/poplar_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/rainbow_birch_seed.json b/src/main/resources/assets/dtbop/models/item/rainbow_birch_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/rainbow_birch_seed.json rename to src/main/resources/assets/dtbop/models/item/rainbow_birch_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/red_maple_seed.json b/src/main/resources/assets/dtbop/models/item/red_maple_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/red_maple_seed.json rename to src/main/resources/assets/dtbop/models/item/red_maple_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/redwood_branch.json b/src/main/resources/assets/dtbop/models/item/redwood_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/redwood_branch.json rename to src/main/resources/assets/dtbop/models/item/redwood_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/redwood_seed.json b/src/main/resources/assets/dtbop/models/item/redwood_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/redwood_seed.json rename to src/main/resources/assets/dtbop/models/item/redwood_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/snowblossom_seed.json b/src/main/resources/assets/dtbop/models/item/snowblossom_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/snowblossom_seed.json rename to src/main/resources/assets/dtbop/models/item/snowblossom_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/spruce_poplar_seed.json b/src/main/resources/assets/dtbop/models/item/spruce_poplar_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/spruce_poplar_seed.json rename to src/main/resources/assets/dtbop/models/item/spruce_poplar_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/toadstool_seed.json b/src/main/resources/assets/dtbop/models/item/toadstool_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/toadstool_seed.json rename to src/main/resources/assets/dtbop/models/item/toadstool_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/umbran_branch.json b/src/main/resources/assets/dtbop/models/item/umbran_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/umbran_branch.json rename to src/main/resources/assets/dtbop/models/item/umbran_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/umbran_seed.json b/src/main/resources/assets/dtbop/models/item/umbran_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/umbran_seed.json rename to src/main/resources/assets/dtbop/models/item/umbran_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/willow_branch.json b/src/main/resources/assets/dtbop/models/item/willow_branch.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/willow_branch.json rename to src/main/resources/assets/dtbop/models/item/willow_branch.json diff --git a/src/generated/resources/assets/dtbop/models/item/willow_seed.json b/src/main/resources/assets/dtbop/models/item/willow_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/willow_seed.json rename to src/main/resources/assets/dtbop/models/item/willow_seed.json diff --git a/src/generated/resources/assets/dtbop/models/item/yellow_maple_seed.json b/src/main/resources/assets/dtbop/models/item/yellow_maple_seed.json similarity index 100% rename from src/generated/resources/assets/dtbop/models/item/yellow_maple_seed.json rename to src/main/resources/assets/dtbop/models/item/yellow_maple_seed.json diff --git a/src/main/resources/assets/dtbop/textures/block/large_water_roots.png b/src/main/resources/assets/dtbop/textures/block/large_water_roots.png index f1e7cc91..52ac27d3 100644 Binary files a/src/main/resources/assets/dtbop/textures/block/large_water_roots.png and b/src/main/resources/assets/dtbop/textures/block/large_water_roots.png differ diff --git a/src/generated/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json similarity index 100% rename from src/generated/resources/assets/minecraft/atlases/blocks.json rename to src/main/resources/assets/minecraft/atlases/blocks.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/acacia_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/acacia_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/acacia_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/acacia_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/acacia_undergrowth_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/acacia_undergrowth_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/acacia_undergrowth_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/acacia_undergrowth_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/aspen_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/aspen_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/aspen_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/aspen_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/cherry_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/cherry_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/cherry_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/cherry_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/cypress_willow_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/cypress_willow_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/cypress_willow_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/cypress_willow_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/dark_oak_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/dark_oak_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/dark_oak_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/dark_oak_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/dark_poplar_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/dark_poplar_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/dark_poplar_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/dark_poplar_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/dying_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/dying_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/dying_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/dying_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/fir_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/fir_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/fir_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/fir_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/flowering_oak_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/flowering_oak_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/flowering_oak_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/flowering_oak_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/flowering_oak_undergrowth_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/flowering_oak_undergrowth_leaves.json similarity index 99% rename from src/generated/resources/data/dtbop/loot_table/blocks/flowering_oak_undergrowth_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/flowering_oak_undergrowth_leaves.json index fdcc3178..d13ad61a 100644 --- a/src/generated/resources/data/dtbop/loot_table/blocks/flowering_oak_undergrowth_leaves.json +++ b/src/main/resources/data/dtbop/loot_table/blocks/flowering_oak_undergrowth_leaves.json @@ -128,7 +128,7 @@ "function": "minecraft:explosion_decay" } ], - "name": "minecraft:air" + "name": "minecraft:stick" } ], "rolls": 1.0 diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/hellbark_bush_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/hellbark_bush_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/hellbark_bush_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/hellbark_bush_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/hellbark_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/hellbark_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/hellbark_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/hellbark_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/jacaranda_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/jacaranda_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/jacaranda_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/jacaranda_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/jungle_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/jungle_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/jungle_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/jungle_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/magic_poplar_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/magic_poplar_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/magic_poplar_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/magic_poplar_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/mahogany_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/mahogany_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/mahogany_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/mahogany_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/mangrove_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/mangrove_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/mangrove_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/mangrove_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/maple_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/maple_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/maple_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/maple_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/mega_dark_oak_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/mega_dark_oak_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/mega_dark_oak_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/mega_dark_oak_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/oak_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/oak_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/oak_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/oak_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/orange_maple_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/orange_maple_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/orange_maple_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/orange_maple_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/palm_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/palm_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/palm_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/palm_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/pine_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/pine_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/pine_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/pine_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/poplar_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/poplar_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/poplar_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/poplar_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/rainbow_birch_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/rainbow_birch_leaves.json similarity index 98% rename from src/generated/resources/data/dtbop/loot_table/blocks/rainbow_birch_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/rainbow_birch_leaves.json index b144a3fa..660e4916 100644 --- a/src/generated/resources/data/dtbop/loot_table/blocks/rainbow_birch_leaves.json +++ b/src/main/resources/data/dtbop/loot_table/blocks/rainbow_birch_leaves.json @@ -37,7 +37,7 @@ ] } ], - "name": "biomesoplenty:rainbow_birch_leaves" + "name": "minecraft:birch_leaves" }, { "type": "dynamictrees:seed_item", diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/red_maple_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/red_maple_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/red_maple_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/red_maple_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/redwood_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/redwood_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/redwood_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/redwood_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/silk_undergrowth_web.json b/src/main/resources/data/dtbop/loot_table/blocks/silk_undergrowth_web.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/silk_undergrowth_web.json rename to src/main/resources/data/dtbop/loot_table/blocks/silk_undergrowth_web.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/silk_web.json b/src/main/resources/data/dtbop/loot_table/blocks/silk_web.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/silk_web.json rename to src/main/resources/data/dtbop/loot_table/blocks/silk_web.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/snowblossom_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/snowblossom_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/snowblossom_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/snowblossom_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/snowblossom_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/snowblossom_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/snowblossom_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/snowblossom_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/sparse_acacia_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/sparse_acacia_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/sparse_acacia_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/sparse_acacia_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/sparse_oak_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/sparse_oak_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/sparse_oak_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/sparse_oak_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/spruce_poplar_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/spruce_poplar_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/spruce_poplar_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/spruce_poplar_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/spruce_twiglet_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/spruce_twiglet_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/spruce_twiglet_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/spruce_twiglet_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/spruce_undergrowth_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/spruce_undergrowth_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/spruce_undergrowth_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/spruce_undergrowth_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/umbran_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/umbran_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/umbran_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/umbran_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/willow_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/willow_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/willow_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/willow_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/blocks/yellow_maple_leaves.json b/src/main/resources/data/dtbop/loot_table/blocks/yellow_maple_leaves.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/blocks/yellow_maple_leaves.json rename to src/main/resources/data/dtbop/loot_table/blocks/yellow_maple_leaves.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/dead.json b/src/main/resources/data/dtbop/loot_table/trees/branches/dead.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/dead.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/dead.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/fir.json b/src/main/resources/data/dtbop/loot_table/trees/branches/fir.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/fir.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/fir.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/hellbark.json b/src/main/resources/data/dtbop/loot_table/trees/branches/hellbark.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/hellbark.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/hellbark.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/jacaranda.json b/src/main/resources/data/dtbop/loot_table/trees/branches/jacaranda.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/jacaranda.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/jacaranda.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/magic.json b/src/main/resources/data/dtbop/loot_table/trees/branches/magic.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/magic.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/magic.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/mahogany.json b/src/main/resources/data/dtbop/loot_table/trees/branches/mahogany.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/mahogany.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/mahogany.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/maple.json b/src/main/resources/data/dtbop/loot_table/trees/branches/maple.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/maple.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/maple.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/palm.json b/src/main/resources/data/dtbop/loot_table/trees/branches/palm.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/palm.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/palm.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/pine.json b/src/main/resources/data/dtbop/loot_table/trees/branches/pine.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/pine.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/pine.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/redwood.json b/src/main/resources/data/dtbop/loot_table/trees/branches/redwood.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/redwood.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/redwood.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_dead.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_dead.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_dead.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_dead.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_fir.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_fir.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_fir.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_fir.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_hellbark.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_hellbark.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_hellbark.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_hellbark.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_jacaranda.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_jacaranda.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_jacaranda.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_jacaranda.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_magic.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_magic.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_magic.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_magic.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_mahogany.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_mahogany.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_mahogany.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_mahogany.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_maple.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_maple.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_maple.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_maple.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_palm.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_palm.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_palm.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_palm.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_pine.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_pine.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_pine.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_pine.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_redwood.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_redwood.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_redwood.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_redwood.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_umbran.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_umbran.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_umbran.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_umbran.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_willow.json b/src/main/resources/data/dtbop/loot_table/trees/branches/stripped_willow.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/stripped_willow.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/stripped_willow.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/umbran.json b/src/main/resources/data/dtbop/loot_table/trees/branches/umbran.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/umbran.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/umbran.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/branches/willow.json b/src/main/resources/data/dtbop/loot_table/trees/branches/willow.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/branches/willow.json rename to src/main/resources/data/dtbop/loot_table/trees/branches/willow.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/acacia_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/acacia_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/acacia_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/acacia_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/acacia_undergrowth.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/acacia_undergrowth.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/acacia_undergrowth.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/acacia_undergrowth.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/aspen.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/aspen.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/aspen.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/aspen.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/cherry_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/cherry_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/cherry_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/cherry_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/cypress_willow.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/cypress_willow.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/cypress_willow.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/cypress_willow.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/dark_oak_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/dark_oak_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/dark_oak_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/dark_oak_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/dark_poplar.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/dark_poplar.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/dark_poplar.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/dark_poplar.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/dying.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/dying.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/dying.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/dying.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/fir.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/fir.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/fir.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/fir.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/flowering_oak.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/flowering_oak.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/flowering_oak.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/flowering_oak.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/flowering_oak_undergrowth.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/flowering_oak_undergrowth.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/flowering_oak_undergrowth.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/flowering_oak_undergrowth.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/hellbark.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/hellbark.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/hellbark.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/hellbark.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/hellbark_bush.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/hellbark_bush.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/hellbark_bush.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/hellbark_bush.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/jacaranda.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/jacaranda.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/jacaranda.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/jacaranda.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/jungle_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/jungle_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/jungle_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/jungle_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/magic_poplar.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/magic_poplar.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/magic_poplar.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/magic_poplar.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/mahogany.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/mahogany.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/mahogany.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/mahogany.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/mangrove_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/mangrove_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/mangrove_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/mangrove_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/maple_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/maple_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/maple_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/maple_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/mega_dark_oak.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/mega_dark_oak.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/mega_dark_oak.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/mega_dark_oak.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/oak_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/oak_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/oak_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/oak_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/orange_maple.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/orange_maple.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/orange_maple.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/orange_maple.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/palm.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/palm.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/palm.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/palm.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/pine.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/pine.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/pine.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/pine.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/poplar.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/poplar.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/poplar.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/poplar.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/rainbow_birch.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/rainbow_birch.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/rainbow_birch.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/rainbow_birch.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/red_maple.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/red_maple.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/red_maple.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/red_maple.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/redwood.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/redwood.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/redwood.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/redwood.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/silk.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/silk.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/silk.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/silk.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/silk_undergrowth.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/silk_undergrowth.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/silk_undergrowth.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/silk_undergrowth.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/snowblossom.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/snowblossom.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/snowblossom.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/snowblossom.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/snowblossom_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/snowblossom_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/snowblossom_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/snowblossom_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/sparse_acacia.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/sparse_acacia.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/sparse_acacia.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/sparse_acacia.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/sparse_oak.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/sparse_oak.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/sparse_oak.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/sparse_oak.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/spruce_poplar.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/spruce_poplar.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/spruce_poplar.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/spruce_poplar.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/spruce_twiglet.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/spruce_twiglet.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/spruce_twiglet.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/spruce_twiglet.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/spruce_undergrowth.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/spruce_undergrowth.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/spruce_undergrowth.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/spruce_undergrowth.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/umbran.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/umbran.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/umbran.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/umbran.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/willow.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/willow.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/willow.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/willow.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/leaves/yellow_maple.json b/src/main/resources/data/dtbop/loot_table/trees/leaves/yellow_maple.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/leaves/yellow_maple.json rename to src/main/resources/data/dtbop/loot_table/trees/leaves/yellow_maple.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/aspen.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/aspen.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/aspen.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/aspen.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/dark_poplar.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/dark_poplar.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/dark_poplar.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/dark_poplar.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/dying.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/dying.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/dying.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/dying.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/fir.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/fir.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/fir.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/fir.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/flowering_oak.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/flowering_oak.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/flowering_oak.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/flowering_oak.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/hellbark.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/hellbark.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/hellbark.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/hellbark.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/jacaranda.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/jacaranda.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/jacaranda.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/jacaranda.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/magic_poplar.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/magic_poplar.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/magic_poplar.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/magic_poplar.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/mahogany.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/mahogany.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/mahogany.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/mahogany.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/mega_fir.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/mega_fir.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/mega_fir.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/mega_fir.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/mega_umbran.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/mega_umbran.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/mega_umbran.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/mega_umbran.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/orange_maple.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/orange_maple.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/orange_maple.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/orange_maple.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/palm.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/palm.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/palm.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/palm.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/pine.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/pine.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/pine.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/pine.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/poplar.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/poplar.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/poplar.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/poplar.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/rainbow_birch.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/rainbow_birch.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/rainbow_birch.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/rainbow_birch.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/red_maple.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/red_maple.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/red_maple.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/red_maple.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/redwood.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/redwood.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/redwood.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/redwood.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/snowblossom.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/snowblossom.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/snowblossom.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/snowblossom.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/spruce_poplar.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/spruce_poplar.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/spruce_poplar.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/spruce_poplar.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/umbran.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/umbran.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/umbran.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/umbran.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/willow.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/willow.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/willow.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/willow.json diff --git a/src/generated/resources/data/dtbop/loot_table/trees/voluntary/yellow_maple.json b/src/main/resources/data/dtbop/loot_table/trees/voluntary/yellow_maple.json similarity index 100% rename from src/generated/resources/data/dtbop/loot_table/trees/voluntary/yellow_maple.json rename to src/main/resources/data/dtbop/loot_table/trees/voluntary/yellow_maple.json diff --git a/src/generated/resources/data/dynamictrees/tags/block/branches.json b/src/main/resources/data/dynamictrees/tags/block/branches.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/block/branches.json rename to src/main/resources/data/dynamictrees/tags/block/branches.json diff --git a/src/generated/resources/data/dynamictrees/tags/block/branches_that_burn.json b/src/main/resources/data/dynamictrees/tags/block/branches_that_burn.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/block/branches_that_burn.json rename to src/main/resources/data/dynamictrees/tags/block/branches_that_burn.json diff --git a/src/main/resources/data/dynamictrees/tags/blocks/foliage.json b/src/main/resources/data/dynamictrees/tags/block/foliage.json similarity index 100% rename from src/main/resources/data/dynamictrees/tags/blocks/foliage.json rename to src/main/resources/data/dynamictrees/tags/block/foliage.json diff --git a/src/generated/resources/data/dynamictrees/tags/block/fungus_caps.json b/src/main/resources/data/dynamictrees/tags/block/fungus_caps.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/block/fungus_caps.json rename to src/main/resources/data/dynamictrees/tags/block/fungus_caps.json diff --git a/src/generated/resources/data/dynamictrees/tags/block/leaves.json b/src/main/resources/data/dynamictrees/tags/block/leaves.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/block/leaves.json rename to src/main/resources/data/dynamictrees/tags/block/leaves.json diff --git a/src/generated/resources/data/dynamictrees/tags/block/rooty_soil.json b/src/main/resources/data/dynamictrees/tags/block/rooty_soil.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/block/rooty_soil.json rename to src/main/resources/data/dynamictrees/tags/block/rooty_soil.json diff --git a/src/generated/resources/data/dynamictrees/tags/block/saplings.json b/src/main/resources/data/dynamictrees/tags/block/saplings.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/block/saplings.json rename to src/main/resources/data/dynamictrees/tags/block/saplings.json diff --git a/src/generated/resources/data/dynamictrees/tags/block/stripped_branches.json b/src/main/resources/data/dynamictrees/tags/block/stripped_branches.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/block/stripped_branches.json rename to src/main/resources/data/dynamictrees/tags/block/stripped_branches.json diff --git a/src/generated/resources/data/dynamictrees/tags/block/stripped_branches_that_burn.json b/src/main/resources/data/dynamictrees/tags/block/stripped_branches_that_burn.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/block/stripped_branches_that_burn.json rename to src/main/resources/data/dynamictrees/tags/block/stripped_branches_that_burn.json diff --git a/src/generated/resources/data/dynamictrees/tags/item/branches.json b/src/main/resources/data/dynamictrees/tags/item/branches.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/item/branches.json rename to src/main/resources/data/dynamictrees/tags/item/branches.json diff --git a/src/generated/resources/data/dynamictrees/tags/item/branches_that_burn.json b/src/main/resources/data/dynamictrees/tags/item/branches_that_burn.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/item/branches_that_burn.json rename to src/main/resources/data/dynamictrees/tags/item/branches_that_burn.json diff --git a/src/generated/resources/data/dynamictrees/tags/item/fungus_caps.json b/src/main/resources/data/dynamictrees/tags/item/fungus_caps.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/item/fungus_caps.json rename to src/main/resources/data/dynamictrees/tags/item/fungus_caps.json diff --git a/src/generated/resources/data/dynamictrees/tags/item/seeds.json b/src/main/resources/data/dynamictrees/tags/item/seeds.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/item/seeds.json rename to src/main/resources/data/dynamictrees/tags/item/seeds.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 00000000..ac9034b3 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,28 @@ +{ + "schemaVersion": 1, + "id": "dtbop", + "version": "${mod_version}", + "name": "Dynamic Trees for Biomes o' Plenty", + "description": "Compatibility Mod between Dynamic Trees and Biomes o' Plenty", + "authors": [ + "mangoose", + "Max Hyper" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/dtbop", + "sources": "https://github.com/DynamicTreesTeam/DynamicTreesBOP" + }, + "license": "MIT", + "environment": "*", + "entrypoints": { + "dynamictrees": [ + "com.dtteam.dtbop.DynamicTreesBOP" + ] + }, + "depends": { + "fabricloader": ">=0.19.3", + "minecraft": "26.2", + "dynamictrees": "*", + "biomesoplenty": "*" + } +} diff --git a/src/main/resources/trees/dtbop/leaves_properties/rainbow_birch.json b/src/main/resources/trees/dtbop/leaves_properties/rainbow_birch.json index a1997dc7..5cca3650 100644 --- a/src/main/resources/trees/dtbop/leaves_properties/rainbow_birch.json +++ b/src/main/resources/trees/dtbop/leaves_properties/rainbow_birch.json @@ -1,3 +1,3 @@ { - "primitive_leaves": "biomesoplenty:rainbow_birch_leaves" + "primitive_leaves": "minecraft:birch_leaves" } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/acacia_twiglet.json b/src/main/resources/trees/dtbop/species/acacia_twiglet.json index 51380b29..3aa3fb9a 100644 --- a/src/main/resources/trees/dtbop/species/acacia_twiglet.json +++ b/src/main/resources/trees/dtbop/species/acacia_twiglet.json @@ -2,10 +2,7 @@ "type": "dtbop:twiglet", "family": "acacia", "leaves_properties": "dtbop:acacia_twiglet", - "environment_factors" : { - "cold": 0.5, - "dry": 1.05 - }, + "preferred_climate": "arid", "perfect_biomes": { "name": "biomesoplenty:.*scrublands.*" }, "acceptable_soils": ["dirt_like", "sand_like"] } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/alps_spruce.json b/src/main/resources/trees/dtbop/species/alps_spruce.json index 5bc89de5..6fc9d296 100644 --- a/src/main/resources/trees/dtbop/species/alps_spruce.json +++ b/src/main/resources/trees/dtbop/species/alps_spruce.json @@ -8,11 +8,7 @@ "growth_rate": 0.9, "growth_logic_kit": "conifer", "leaves_properties": "spruce", - "environment_factors" : { - "hot": 0.50, - "dry": 0.25, - "wet": 0.75 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "coniferous" }, "mega_species": "mega_spruce", "acceptable_soils": ["dirt_like", "gravel_like"], diff --git a/src/main/resources/trees/dtbop/species/aspen.json b/src/main/resources/trees/dtbop/species/aspen.json index 346e588c..cdad72ae 100644 --- a/src/main/resources/trees/dtbop/species/aspen.json +++ b/src/main/resources/trees/dtbop/species/aspen.json @@ -9,13 +9,8 @@ "growth_rate": 1.5, "growth_logic_kit": "conifer", "leaves_properties":"dtbop:aspen", - "environment_factors": { - "#forge:is_hot": 0.50, - "#forge:is_dry": 0.25, - "#forge:is_wet": 0.75 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "biomesoplenty:aspen_glade" }, - "primitive_sapling":"biomesoplenty:aspen_sapling", "lang_overrides": { "seed": "Aspen Catkin" } diff --git a/src/main/resources/trees/dtbop/species/cherry_twiglet.json b/src/main/resources/trees/dtbop/species/cherry_twiglet.json index 6fd0cdc8..8fe8a8fd 100644 --- a/src/main/resources/trees/dtbop/species/cherry_twiglet.json +++ b/src/main/resources/trees/dtbop/species/cherry_twiglet.json @@ -2,10 +2,6 @@ "type": "dtbop:twiglet", "family": "cherry", "leaves_properties": "dtbop:cherry_twiglet", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5, - "cold": 1.05 - }, + "preferred_climate": "cold", "perfect_biomes": { "type": "biomesoplenty:jacaranda_glade" } } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/cypress_willow.json b/src/main/resources/trees/dtbop/species/cypress_willow.json index b5ccd749..052155f2 100644 --- a/src/main/resources/trees/dtbop/species/cypress_willow.json +++ b/src/main/resources/trees/dtbop/species/cypress_willow.json @@ -10,10 +10,7 @@ "max_branch_radius": 16, "growth_logic_kit": "dtbop:cypress", "leaves_properties": "dtbop:cypress_willow", - "environment_factors" : { - "hot": 0.7, - "dry": 0.5 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "swamp", "overworld" ] }, "acceptable_soils": [ "water_like", "dirt_like", "mud_like" ], "features": [ diff --git a/src/main/resources/trees/dtbop/species/dark_oak_twiglet.json b/src/main/resources/trees/dtbop/species/dark_oak_twiglet.json index 1dbc1ddc..453355ab 100644 --- a/src/main/resources/trees/dtbop/species/dark_oak_twiglet.json +++ b/src/main/resources/trees/dtbop/species/dark_oak_twiglet.json @@ -2,11 +2,7 @@ "type": "dtbop:twiglet", "family": "dark_oak", "leaves_properties": "dtbop:dark_oak_twiglet", - "environment_factors" : { - "dry": 0.5, - "cold": 0.7, - "wet": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": ["dead", "swamp"] }, "acceptable_soils": ["dirt_like", "sand_like"] } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/dying.json b/src/main/resources/trees/dtbop/species/dying.json index f80898eb..d9dc970e 100644 --- a/src/main/resources/trees/dtbop/species/dying.json +++ b/src/main/resources/trees/dtbop/species/dying.json @@ -6,11 +6,7 @@ "signal_energy": 12.0, "growth_rate": 0.5, "leaves_properties": "dtbop:dying", - "environment_factors" : { - "lush": 0.75, - "spooky": 1.05, - "dead": 1.05 - }, + "preferred_climate": "temperate", "always_show_on_waila": true, "primitive_sapling": "biomesoplenty:dead_sapling", "acceptable_soils": ["dirt_like", "sand_like"], diff --git a/src/main/resources/trees/dtbop/species/fir.json b/src/main/resources/trees/dtbop/species/fir.json index 91d47b9b..ba0bc5ab 100644 --- a/src/main/resources/trees/dtbop/species/fir.json +++ b/src/main/resources/trees/dtbop/species/fir.json @@ -9,11 +9,7 @@ "growth_rate": 0.9, "growth_logic_kit": "dtbop:small_conifer", "leaves_properties": "dtbop:fir", - "environment_factors" : { - "hot": 0.50, - "dry": 0.25, - "wet": 0.75 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "coniferous" }, "primitive_sapling": "biomesoplenty:fir_sapling", "mega_species": "dtbop:mega_fir", diff --git a/src/main/resources/trees/dtbop/species/flowering_apple_oak.json b/src/main/resources/trees/dtbop/species/flowering_apple_oak.json index 169de9c6..b52dc04b 100644 --- a/src/main/resources/trees/dtbop/species/flowering_apple_oak.json +++ b/src/main/resources/trees/dtbop/species/flowering_apple_oak.json @@ -6,11 +6,7 @@ "lowest_branch_height": 4, "growth_rate": 0.7, "leaves_properties": "oak", - "environment_factors" : { - "cold": 0.75, - "hot": 0.75, - "dry": 0.25 - }, + "preferred_climate": "temperate", "use_seed_of_other_species": "dynamictrees:apple_oak", "perfect_biomes": { "name": "biomesoplenty:orchard" }, "fruits": [ diff --git a/src/main/resources/trees/dtbop/species/flowering_oak.json b/src/main/resources/trees/dtbop/species/flowering_oak.json index 5cac2f93..d5e25205 100644 --- a/src/main/resources/trees/dtbop/species/flowering_oak.json +++ b/src/main/resources/trees/dtbop/species/flowering_oak.json @@ -6,12 +6,7 @@ "signal_energy": 12.0, "growth_rate": 0.8, "leaves_properties": "oak", - "environment_factors" : { - "cold": 0.75, - "hot": 0.5, - "dry": 0.5, - "forest": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "biomesoplenty:flowering_oak_sapling", "features" : [ diff --git a/src/main/resources/trees/dtbop/species/hellbark.json b/src/main/resources/trees/dtbop/species/hellbark.json index 8522ab4c..13d83b9a 100644 --- a/src/main/resources/trees/dtbop/species/hellbark.json +++ b/src/main/resources/trees/dtbop/species/hellbark.json @@ -8,10 +8,7 @@ "lowest_branch_height": 2, "soil_longevity": 1, "leaves_properties": "dtbop:hellbark", - "environment_factors" : { - "cold": 0.5, - "nether": 1.05 - }, + "preferred_climate": "none", "always_show_on_waila": false, "perfect_biomes": { "type": "nether" }, "acceptable_soils": [ "nether_like", "dirt_like" ], diff --git a/src/main/resources/trees/dtbop/species/hellbark_bush.json b/src/main/resources/trees/dtbop/species/hellbark_bush.json index 420b5471..81d2ba63 100644 --- a/src/main/resources/trees/dtbop/species/hellbark_bush.json +++ b/src/main/resources/trees/dtbop/species/hellbark_bush.json @@ -7,10 +7,7 @@ "lowest_branch_height": 1, "growth_rate": 1.0, "leaves_properties": "dtbop:hellbark_bush", - "environment_factors" : { - "cold": 0.5, - "nether": 1.05 - }, + "preferred_climate": "none", "always_show_on_waila": true, "generate_seed": false, "generate_sapling": false, diff --git a/src/main/resources/trees/dtbop/species/infested.json b/src/main/resources/trees/dtbop/species/infested.json index 8e128b34..1f607f0e 100644 --- a/src/main/resources/trees/dtbop/species/infested.json +++ b/src/main/resources/trees/dtbop/species/infested.json @@ -4,11 +4,7 @@ "signal_energy": 12.0, "growth_rate": 0.5, "leaves_properties": "dtbop:dying", - "environment_factors" : { - "lush": 0.75, - "spooky": 1.05, - "dead": 1.05 - }, + "preferred_climate": "temperate", "primitive_sapling": "biomesoplenty:dead_sapling", "perfect_biomes": { "name": "biomesoplenty:silkglade" }, "features" : [ diff --git a/src/main/resources/trees/dtbop/species/jacaranda.json b/src/main/resources/trees/dtbop/species/jacaranda.json index cc15523d..89d69cb4 100644 --- a/src/main/resources/trees/dtbop/species/jacaranda.json +++ b/src/main/resources/trees/dtbop/species/jacaranda.json @@ -6,10 +6,7 @@ "signal_energy": 12.0, "growth_rate": 0.9, "leaves_properties": "dtbop:jacaranda", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "lush", "overworld" ] }, "primitive_sapling": "biomesoplenty:jacaranda_sapling", "features" : [ diff --git a/src/main/resources/trees/dtbop/species/jungle_twiglet.json b/src/main/resources/trees/dtbop/species/jungle_twiglet.json index db38a038..f73673ea 100644 --- a/src/main/resources/trees/dtbop/species/jungle_twiglet.json +++ b/src/main/resources/trees/dtbop/species/jungle_twiglet.json @@ -2,10 +2,6 @@ "type": "dtbop:twiglet", "family": "jungle", "leaves_properties": "dtbop:jungle_twiglet", - "environment_factors" : { - "snowy": 0.25, - "hot": 1.05, - "dry": 0.75 - }, + "preferred_climate": "temperate", "perfect_biomes": { "name": "biomesoplenty:tropics" } } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/mahogany.json b/src/main/resources/trees/dtbop/species/mahogany.json index 12224120..662539c9 100644 --- a/src/main/resources/trees/dtbop/species/mahogany.json +++ b/src/main/resources/trees/dtbop/species/mahogany.json @@ -9,12 +9,7 @@ "growth_rate": 0.9, "growth_logic_kit": "dtbop:mahogany", "leaves_properties": "dtbop:mahogany", - "environment_factors" : { - "cold": 0.15, - "dry": 0.20, - "hot": 1.1, - "wet": 1.1 - }, + "preferred_climate": "tropical", "perfect_biomes": { "types": [ "jungle", "overworld" ] }, "primitive_sapling": "biomesoplenty:mahogany_sapling", "lang_overrides": { diff --git a/src/main/resources/trees/dtbop/species/mangrove_twiglet.json b/src/main/resources/trees/dtbop/species/mangrove_twiglet.json index 95638465..ad1c17a6 100644 --- a/src/main/resources/trees/dtbop/species/mangrove_twiglet.json +++ b/src/main/resources/trees/dtbop/species/mangrove_twiglet.json @@ -2,10 +2,6 @@ "type": "dtbop:twiglet", "family": "mangrove", "leaves_properties": "dtbop:mangrove_twiglet", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5, - "cold": 1.05 - }, + "preferred_climate": "cold", "perfect_biomes": { "type": "biomesoplenty:bog" } } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/maple_twiglet.json b/src/main/resources/trees/dtbop/species/maple_twiglet.json index 278c7a16..5c44c196 100644 --- a/src/main/resources/trees/dtbop/species/maple_twiglet.json +++ b/src/main/resources/trees/dtbop/species/maple_twiglet.json @@ -2,10 +2,6 @@ "type": "dtbop:twiglet", "family": "dtbop:maple", "leaves_properties": "dtbop:maple_twiglet", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5, - "cold": 1.05 - }, + "preferred_climate": "cold", "perfect_biomes": { "type": "biomesoplenty:tundra.*" } } diff --git a/src/main/resources/trees/dtbop/species/mega_dark_oak.json b/src/main/resources/trees/dtbop/species/mega_dark_oak.json index 6bb87abe..3622ff12 100644 --- a/src/main/resources/trees/dtbop/species/mega_dark_oak.json +++ b/src/main/resources/trees/dtbop/species/mega_dark_oak.json @@ -8,12 +8,7 @@ "max_branch_radius": 24, "soil_longevity": 45, "leaves_properties": "dtbop:mega_dark_oak", - "environment_factors" : { - "hot": 0.8, - "dry": 0.8, - "magic": 1.1, - "forest": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "biomesoplenty:mystic.*" }, "features" : [ { diff --git a/src/main/resources/trees/dtbop/species/mega_fir.json b/src/main/resources/trees/dtbop/species/mega_fir.json index 7da6c90e..f3ac63fa 100644 --- a/src/main/resources/trees/dtbop/species/mega_fir.json +++ b/src/main/resources/trees/dtbop/species/mega_fir.json @@ -9,11 +9,7 @@ "max_branch_radius": 24, "growth_logic_kit": "dtbop:fir", "leaves_properties": "dtbop:fir", - "environment_factors" : { - "hot": 0.50, - "dry": 0.25, - "wet": 0.75 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "coniferous" }, "common_override": { "name": "biomesoplenty:coniferous_forest" }, "features" : [ diff --git a/src/main/resources/trees/dtbop/species/mega_umbran.json b/src/main/resources/trees/dtbop/species/mega_umbran.json index d00518da..e38fb718 100644 --- a/src/main/resources/trees/dtbop/species/mega_umbran.json +++ b/src/main/resources/trees/dtbop/species/mega_umbran.json @@ -9,15 +9,7 @@ "max_branch_radius": 24, "growth_logic_kit": "dtbop:fir", "leaves_properties": "dtbop:umbran", - "environment_factors" : { - "cold": 0.75, - "hot": 0.50, - "dry": 0.50, - "forest": 1.05, - "spooky": 1.1, - "dead": 1.1, - "magical": 1.1 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "coniferous" }, "common_override": { "name": "biomesoplenty:ominous_woods" }, "features" : [ diff --git a/src/main/resources/trees/dtbop/species/oak_twiglet.json b/src/main/resources/trees/dtbop/species/oak_twiglet.json index 8e32de49..12091cf4 100644 --- a/src/main/resources/trees/dtbop/species/oak_twiglet.json +++ b/src/main/resources/trees/dtbop/species/oak_twiglet.json @@ -2,9 +2,6 @@ "type": "dtbop:twiglet", "family": "oak", "leaves_properties": "dtbop:oak_twiglet", - "environment_factors" : { - "hot": 0.7, - "dry": 0.7 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "biomesoplenty:seasonal.*" } } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/orange_maple.json b/src/main/resources/trees/dtbop/species/orange_maple.json index bc537b90..01eb22d3 100644 --- a/src/main/resources/trees/dtbop/species/orange_maple.json +++ b/src/main/resources/trees/dtbop/species/orange_maple.json @@ -8,11 +8,7 @@ "up_probability": 4, "growth_rate": 1.05, "leaves_properties": "dtbop:orange_maple", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5, - "forest": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "biomesoplenty:seasonal.*" }, "primitive_sapling": "biomesoplenty:orange_maple_sapling", "lang_overrides": { diff --git a/src/main/resources/trees/dtbop/species/palm.json b/src/main/resources/trees/dtbop/species/palm.json index f0e2fdeb..e092dc6a 100644 --- a/src/main/resources/trees/dtbop/species/palm.json +++ b/src/main/resources/trees/dtbop/species/palm.json @@ -7,11 +7,7 @@ "signal_energy": 7.0, "growth_rate": 0.9, "leaves_properties": "dtbop:palm", - "environment_factors" : { - "cold": 0.75, - "hot": 1.1, - "dry": 1.1 - }, + "preferred_climate": "arid", "transformable": false, "perfect_biomes": { "name": "biomesoplenty:tropics" }, "primitive_sapling": "biomesoplenty:palm_sapling", diff --git a/src/main/resources/trees/dtbop/species/pine.json b/src/main/resources/trees/dtbop/species/pine.json index b1db8c7d..32fe0941 100644 --- a/src/main/resources/trees/dtbop/species/pine.json +++ b/src/main/resources/trees/dtbop/species/pine.json @@ -6,10 +6,7 @@ "signal_energy": 12.0, "growth_rate": 0.8, "leaves_properties": "dtbop:pine", - "environment_factors" : { - "wet": 0.75, - "plains": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "biomesoplenty:hot_springs" }, "primitive_sapling": "biomesoplenty:pine_sapling", "lang_overrides": { diff --git a/src/main/resources/trees/dtbop/species/rainbow_birch.json b/src/main/resources/trees/dtbop/species/rainbow_birch.json index 9f29369f..ea34b8ea 100644 --- a/src/main/resources/trees/dtbop/species/rainbow_birch.json +++ b/src/main/resources/trees/dtbop/species/rainbow_birch.json @@ -6,13 +6,8 @@ "signal_energy": 12.0, "growth_rate": 0.8, "leaves_properties": "dtbop:rainbow_birch", - "environment_factors" : { - "hot": 0.7, - "dry": 0.7, - "forest": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "lush", "magical", "overworld" ] }, - "primitive_sapling": "biomesoplenty:rainbow_birch_sapling", "features" : [ "bee_nest" ], diff --git a/src/main/resources/trees/dtbop/species/red_maple.json b/src/main/resources/trees/dtbop/species/red_maple.json index ba7d5465..da1845be 100644 --- a/src/main/resources/trees/dtbop/species/red_maple.json +++ b/src/main/resources/trees/dtbop/species/red_maple.json @@ -8,11 +8,7 @@ "up_probability": 4, "growth_rate": 1.05, "leaves_properties": "dtbop:red_maple", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5, - "forest": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "biomesoplenty:seasonal.*" }, "primitive_sapling": "biomesoplenty:red_maple_sapling", "lang_overrides": { diff --git a/src/main/resources/trees/dtbop/species/redwood.json b/src/main/resources/trees/dtbop/species/redwood.json index f28838d7..d8229de2 100644 --- a/src/main/resources/trees/dtbop/species/redwood.json +++ b/src/main/resources/trees/dtbop/species/redwood.json @@ -11,11 +11,7 @@ "max_branch_radius": 24, "growth_logic_kit": "dtbop:redwood", "leaves_properties": "dtbop:redwood", - "environment_factors" : { - "hot": 0.50, - "dry": 0.25, - "forest": 1.05 - }, + "preferred_climate": "temperate", "always_show_on_waila": false, "world_gen_leaf_map_height": 60, "perfect_biomes": { "name": ".*redwood.*" }, diff --git a/src/main/resources/trees/dtbop/species/short_jungle.json b/src/main/resources/trees/dtbop/species/short_jungle.json index c339b661..5806ee10 100644 --- a/src/main/resources/trees/dtbop/species/short_jungle.json +++ b/src/main/resources/trees/dtbop/species/short_jungle.json @@ -7,12 +7,7 @@ "growth_rate": 0.8, "growth_logic_kit": "dtbop:mahogany", "leaves_properties": "jungle", - "environment_factors" : { - "cold": 0.15, - "dry": 0.2, - "hot": 1.1, - "wet": 1.1 - }, + "preferred_climate": "tropical", "perfect_biomes": { "type": "jungle" }, "mega_species": "mega_jungle", "features" : [ diff --git a/src/main/resources/trees/dtbop/species/silk.json b/src/main/resources/trees/dtbop/species/silk.json index 8733470f..408fb633 100644 --- a/src/main/resources/trees/dtbop/species/silk.json +++ b/src/main/resources/trees/dtbop/species/silk.json @@ -4,11 +4,7 @@ "signal_energy": 12.0, "growth_rate": 0.5, "leaves_properties": "dtbop:silk", - "environment_factors" : { - "lush": 0.75, - "spooky": 1.05, - "dead": 1.05 - }, + "preferred_climate": "temperate", "primitive_sapling": "biomesoplenty:dead_sapling", "perfect_biomes": { "name": "biomesoplenty:silkglade" } } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/small_redwood.json b/src/main/resources/trees/dtbop/species/small_redwood.json index 8ce6b7bd..18c26094 100644 --- a/src/main/resources/trees/dtbop/species/small_redwood.json +++ b/src/main/resources/trees/dtbop/species/small_redwood.json @@ -8,11 +8,7 @@ "soil_longevity": 2, "growth_logic_kit": "dtbop:small_redwood", "leaves_properties": "dtbop:redwood", - "environment_factors" : { - "hot": 0.50, - "dry": 0.25, - "wet": 0.75 - }, + "preferred_climate": "temperate", "generate_seed": false, "generate_sapling": false, "perfect_biomes": { "name": ".*redwood.*" }, diff --git a/src/main/resources/trees/dtbop/species/snowblossom.json b/src/main/resources/trees/dtbop/species/snowblossom.json index 3d1a1f11..5a9e0f49 100644 --- a/src/main/resources/trees/dtbop/species/snowblossom.json +++ b/src/main/resources/trees/dtbop/species/snowblossom.json @@ -6,12 +6,7 @@ "signal_energy": 12.0, "growth_rate": 0.8, "leaves_properties": "dtbop:snowblossom", - "environment_factors" : { - "cold": 0.75, - "hot": 0.5, - "dry": 0.5, - "forest": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "lush", "overworld" ], "name": ".*blossom.*" }, "primitive_sapling": "biomesoplenty:snowblossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtbop/species/snowblossom_twiglet.json b/src/main/resources/trees/dtbop/species/snowblossom_twiglet.json index c9587b71..749119a1 100644 --- a/src/main/resources/trees/dtbop/species/snowblossom_twiglet.json +++ b/src/main/resources/trees/dtbop/species/snowblossom_twiglet.json @@ -2,10 +2,6 @@ "type": "dtbop:twiglet", "family": "cherry", "leaves_properties": "dtbop:snowblossom_twiglet", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5, - "cold": 1.05 - }, + "preferred_climate": "cold", "perfect_biomes": { "type": "biomesoplenty:jacaranda_glade" } } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/sparse_acacia.json b/src/main/resources/trees/dtbop/species/sparse_acacia.json index 270379d7..c07f7a61 100644 --- a/src/main/resources/trees/dtbop/species/sparse_acacia.json +++ b/src/main/resources/trees/dtbop/species/sparse_acacia.json @@ -4,11 +4,7 @@ "signal_energy": 12.0, "growth_rate": 0.8, "leaves_properties": "dtbop:sparse_acacia", - "environment_factors" : { - "cold": 0.75, - "snowy": 0.5, - "dry": 1.05 - }, + "preferred_climate": "arid", "perfect_biomes": { "types": [ "desert", "overworld" ] }, "acceptable_soils": ["dirt_like", "sand_like"] } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/sparse_oak.json b/src/main/resources/trees/dtbop/species/sparse_oak.json index be2c8286..01974d69 100644 --- a/src/main/resources/trees/dtbop/species/sparse_oak.json +++ b/src/main/resources/trees/dtbop/species/sparse_oak.json @@ -4,10 +4,7 @@ "signal_energy": 12.0, "growth_rate": 0.8, "leaves_properties": "dtbop:sparse_oak", - "environment_factors" : { - "wet": 0.75, - "plains": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "plains", "overworld" ] }, "features" : [ { diff --git a/src/main/resources/trees/dtbop/species/spruce_twiglet.json b/src/main/resources/trees/dtbop/species/spruce_twiglet.json index 7e7f99f0..149387cb 100644 --- a/src/main/resources/trees/dtbop/species/spruce_twiglet.json +++ b/src/main/resources/trees/dtbop/species/spruce_twiglet.json @@ -2,10 +2,6 @@ "type": "dtbop:twiglet", "family": "spruce", "leaves_properties": "dtbop:spruce_twiglet", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5, - "cold": 1.05 - }, + "preferred_climate": "cold", "perfect_biomes": { "type": "biomesoplenty:tundra.*" } } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/tall_dying.json b/src/main/resources/trees/dtbop/species/tall_dying.json index 3ef5aadd..b937f42d 100644 --- a/src/main/resources/trees/dtbop/species/tall_dying.json +++ b/src/main/resources/trees/dtbop/species/tall_dying.json @@ -4,10 +4,6 @@ "signal_energy": 24.0, "growth_rate": 0.5, "leaves_properties": "dtbop:dying", - "environment_factors" : { - "lush": 0.75, - "spooky": 1.05, - "dead": 1.05 - }, + "preferred_climate": "temperate", "primitive_sapling": "biomesoplenty:dead_sapling" } \ No newline at end of file diff --git a/src/main/resources/trees/dtbop/species/umbran.json b/src/main/resources/trees/dtbop/species/umbran.json index 9f4c084c..2303c34f 100644 --- a/src/main/resources/trees/dtbop/species/umbran.json +++ b/src/main/resources/trees/dtbop/species/umbran.json @@ -9,11 +9,7 @@ "growth_rate": 0.9, "growth_logic_kit": "dtbop:small_conifer", "leaves_properties": "dtbop:umbran", - "environment_factors" : { - "hot": 0.50, - "dry": 0.25, - "wet": 0.75 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "coniferous" }, "primitive_sapling": "biomesoplenty:umbran_sapling", "mega_species": "dtbop:mega_umbran", diff --git a/src/main/resources/trees/dtbop/species/willow.json b/src/main/resources/trees/dtbop/species/willow.json index 2ffc1f55..35813864 100644 --- a/src/main/resources/trees/dtbop/species/willow.json +++ b/src/main/resources/trees/dtbop/species/willow.json @@ -6,10 +6,7 @@ "signal_energy": 12.0, "growth_rate": 0.8, "leaves_properties": "dtbop:willow", - "environment_factors" : { - "hot": 0.7, - "dry": 0.5 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "swamp", "overworld" ] }, "primitive_sapling": "biomesoplenty:willow_sapling", "features" : [ diff --git a/src/main/resources/trees/dtbop/species/yellow_maple.json b/src/main/resources/trees/dtbop/species/yellow_maple.json index 17398a23..9b615f6d 100644 --- a/src/main/resources/trees/dtbop/species/yellow_maple.json +++ b/src/main/resources/trees/dtbop/species/yellow_maple.json @@ -8,11 +8,7 @@ "up_probability": 4, "growth_rate": 1.05, "leaves_properties": "dtbop:yellow_maple", - "environment_factors" : { - "hot": 0.5, - "dry": 0.5, - "forest": 1.05 - }, + "preferred_climate": "temperate", "perfect_biomes": { "type": "biomesoplenty:seasonal.*" }, "primitive_sapling": "biomesoplenty:yellow_maple_sapling", "lang_overrides": { diff --git a/src/main/resources/trees/dtbop/world_gen/default.json b/src/main/resources/trees/dtbop/world_gen/default.json index dccfc9af..0279f9bc 100644 --- a/src/main/resources/trees/dtbop/world_gen/default.json +++ b/src/main/resources/trees/dtbop/world_gen/default.json @@ -1,57 +1,67 @@ [ { - "select": { "name": "biomesoplenty:tropics" }, + "select": { + "name": "biomesoplenty:tropics" + }, "apply": { - "species" : { - "random" : { - "dtbop:palm" : 6, - "dtbop:flowering_oak_undergrowth" : 2, - "dtbop:jungle_twiglet" : 2, - "cocoa" : 1 + "species": { + "random": { + "dtbop:palm": 6, + "dtbop:flowering_oak_undergrowth": 2, + "dtbop:jungle_twiglet": 2, + "cocoa": 1 } }, - "density": [ 5.0 ], + "density": [ + 5.0 + ], "chance": 1.0, - "forestness" : 0.5 + "forestness": 0.5 } }, { - "select": { "name": "biomesoplenty:rainforest" }, + "select": { + "name": "biomesoplenty:rainforest" + }, "apply": { - "species" : { - "random" : { - "dtbop:mahogany" : 9, - "dtbop:short_jungle" : 2, - "cocoa" : 1 + "species": { + "random": { + "dtbop:mahogany": 9, + "dtbop:short_jungle": 2, + "cocoa": 1 } }, "density": 1.0, "chance": 1.0, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:rocky_rainforest" }, + "select": { + "name": "biomesoplenty:rocky_rainforest" + }, "apply": { - "species" : { - "random" : { - "dtbop:mahogany" : 1, - "dtbop:jungle_twiglet" : 6, - "oak_undergrowth" : 2 + "species": { + "random": { + "dtbop:mahogany": 1, + "dtbop:jungle_twiglet": 6, + "oak_undergrowth": 2 } }, "density": 1.0, "chance": 1.0, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:floodplain" }, + "select": { + "name": "biomesoplenty:floodplain" + }, "apply": { - "species" : { - "random" : { - "dtbop:sparse_oak" : 1, - "oak_undergrowth" : 1 + "species": { + "random": { + "dtbop:sparse_oak": 1, + "oak_undergrowth": 1 } }, "density": 0.5, @@ -59,27 +69,31 @@ } }, { - "select": { "name": "biomesoplenty:auroral_garden" }, + "select": { + "name": "biomesoplenty:auroral_garden" + }, "apply": { - "species" : { - "random" : { - "dtbop:rainbow_birch" : 6, - "dtbop:fir" : 3, - "oak_undergrowth" : 1 + "species": { + "random": { + "dtbop:rainbow_birch": 6, + "dtbop:fir": 3, + "oak_undergrowth": 1 } }, "density": 0.5, "chance": 0.8, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:jade_cliffs" }, + "select": { + "name": "biomesoplenty:jade_cliffs" + }, "apply": { - "species" : { - "random" : { - "dtbop:spruce_undergrowth" : 15, - "spruce" : 1 + "species": { + "random": { + "dtbop:spruce_undergrowth": 15, + "spruce": 1 } }, "density": 1.0, @@ -87,28 +101,34 @@ } }, { - "select": { "name": "biomesoplenty:.*woodland" }, + "select": { + "name": "biomesoplenty:.*woodland" + }, "apply": { - "species" : "oak", + "species": "oak", "density": 0.5, "chance": 0.8, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:old_growth_woodland" }, + "select": { + "name": "biomesoplenty:old_growth_woodland" + }, "apply": { "density": 1.5, "chance": 1.0 } }, { - "select": { "name": "biomesoplenty:prairie" }, + "select": { + "name": "biomesoplenty:prairie" + }, "apply": { - "species" : { - "random" : { - "dtbop:sparse_oak" : 7, - "oak" : 1 + "species": { + "random": { + "dtbop:sparse_oak": 7, + "oak": 1 } }, "density": 0.2, @@ -116,12 +136,14 @@ } }, { - "select": { "name": "biomesoplenty:lavender_field" }, + "select": { + "name": "biomesoplenty:lavender_field" + }, "apply": { - "species" : { - "random" : { - "dtbop:jacaranda" : 7, - "dtbop:flowering_oak" : 1 + "species": { + "random": { + "dtbop:jacaranda": 7, + "dtbop:flowering_oak": 1 } }, "density": 0.1, @@ -129,23 +151,27 @@ } }, { - "select": { "name": "biomesoplenty:jacaranda_glade" }, + "select": { + "name": "biomesoplenty:jacaranda_glade" + }, "apply": { - "species" : { - "random" : { - "dtbop:jacaranda" : 7, - "dtbop:flowering_oak" : 1, - "dtbop:snowblossom_twiglet" : 1, - "dtbop:cherry_twiglet" : 1 + "species": { + "random": { + "dtbop:jacaranda": 7, + "dtbop:flowering_oak": 1, + "dtbop:snowblossom_twiglet": 1, + "dtbop:cherry_twiglet": 1 } }, "density": 1.0, "chance": 0.75, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:snowblossom_grove" }, + "select": { + "name": "biomesoplenty:snowblossom_grove" + }, "apply": { "species": "dtbop:snowblossom", "density": [ @@ -155,13 +181,15 @@ } }, { - "select": { "name": "biomesoplenty:grove_clearing" }, + "select": { + "name": "biomesoplenty:grove_clearing" + }, "apply": { - "species" : { - "random" : { - "dtbop:sparse_oak" : 1, - "oak_undergrowth" : 3, - "dtbop:flowering_oak_undergrowth" : 3 + "species": { + "random": { + "dtbop:sparse_oak": 1, + "oak_undergrowth": 3, + "dtbop:flowering_oak_undergrowth": 3 } }, "density": 0.5, @@ -169,29 +197,33 @@ } }, { - "select": { "name": "biomesoplenty:mediterranean_forest" }, + "select": { + "name": "biomesoplenty:mediterranean_forest" + }, "apply": { - "species" : { - "random" : { - "dtbop:dark_poplar" : 3, - "dtbop:spruce_poplar" : 3, - "oak_undergrowth" : 1, - "dtbop:flowering_oak_undergrowth" : 1, - "dtbop:sparse_oak" : 3 + "species": { + "random": { + "dtbop:dark_poplar": 3, + "dtbop:spruce_poplar": 3, + "oak_undergrowth": 1, + "dtbop:flowering_oak_undergrowth": 1, + "dtbop:sparse_oak": 3 } }, "density": 0.4, "chance": 0.5, - "forestness" : 0.5 + "forestness": 0.5 } }, { - "select": { "name": "biomesoplenty:scrubland" }, + "select": { + "name": "biomesoplenty:scrubland" + }, "apply": { - "species" : { - "random" : { - "dtbop:oak_twiglet" : 1, - "dtbop:spruce_twiglet" : 1 + "species": { + "random": { + "dtbop:oak_twiglet": 1, + "dtbop:spruce_twiglet": 1 } }, "density": 0.2, @@ -199,21 +231,25 @@ } }, { - "select": { "name": "biomesoplenty:tundra" }, + "select": { + "name": "biomesoplenty:tundra" + }, "apply": { - "species" : "dtbop:maple_twiglet", + "species": "dtbop:maple_twiglet", "density": 0.1, "chance": 0.4 } }, { - "select": { "name": "biomesoplenty:bog" }, + "select": { + "name": "biomesoplenty:bog" + }, "apply": { - "species" : { - "random" : { - "dtbop:maple_twiglet" : 1, - "dtbop:mangrove_twiglet" : 1, - "dtbop:spruce_twiglet" : 1 + "species": { + "random": { + "dtbop:maple_twiglet": 1, + "dtbop:mangrove_twiglet": 1, + "dtbop:spruce_twiglet": 1 } }, "density": 0.9, @@ -221,12 +257,14 @@ } }, { - "select": { "name": "biomesoplenty:.*wasteland" }, + "select": { + "name": "biomesoplenty:.*wasteland" + }, "apply": { - "species" : { - "random" : { - "dtbop:dead" : 1, - "dtbop:dying" : 1 + "species": { + "random": { + "dtbop:dead": 1, + "dtbop:dying": 1 } }, "density": 0.1, @@ -234,26 +272,32 @@ } }, { - "select": { "name": "biomesoplenty:wooded_wasteland" }, + "select": { + "name": "biomesoplenty:wooded_wasteland" + }, "apply": { "chance": 0.5 } }, { - "select": { "name": "biomesoplenty:volcanic_plains" }, + "select": { + "name": "biomesoplenty:volcanic_plains" + }, "apply": { - "species" : "dtbop:dark_oak_twiglet", + "species": "dtbop:dark_oak_twiglet", "density": 0.1, "chance": 0.6 } }, { - "select": { "name": "biomesoplenty:lush_desert" }, + "select": { + "name": "biomesoplenty:lush_desert" + }, "apply": { - "species" : { - "random" : { - "dtbop:acacia_undergrowth" : 4, - "dtbop:sparse_acacia" : 1 + "species": { + "random": { + "dtbop:acacia_undergrowth": 4, + "dtbop:sparse_acacia": 1 } }, "density": 0.4, @@ -261,13 +305,15 @@ } }, { - "select": { "name": "biomesoplenty:dryland" }, + "select": { + "name": "biomesoplenty:dryland" + }, "apply": { - "species" : { - "random" : { - "dtbop:sparse_oak" : 1, - "dtbop:oak_twiglet" : 4, - "dtbop:acacia_twiglet" : 2 + "species": { + "random": { + "dtbop:sparse_oak": 1, + "dtbop:oak_twiglet": 4, + "dtbop:acacia_twiglet": 2 } }, "density": 0.8, @@ -275,28 +321,34 @@ } }, { - "select": { "name": "biomesoplenty:shrubland" }, + "select": { + "name": "biomesoplenty:shrubland" + }, "apply": { - "species" : "oak_undergrowth", + "species": "oak_undergrowth", "density": 0.01, "chance": 0.5 } }, { - "select": { "name": "biomesoplenty:rocky_shrubland" }, + "select": { + "name": "biomesoplenty:rocky_shrubland" + }, "apply": { - "species" : "oak_undergrowth", + "species": "oak_undergrowth", "density": 0.01, "chance": 0.1 } }, { - "select": { "name": "biomesoplenty:orchard" }, + "select": { + "name": "biomesoplenty:orchard" + }, "apply": { - "species" : { - "random" : { - "dtbop:flowering_oak" : 1, - "dtbop:flowering_apple_oak" : 5 + "species": { + "random": { + "dtbop:flowering_oak": 1, + "dtbop:flowering_apple_oak": 5 } }, "density": 0.2, @@ -304,96 +356,114 @@ } }, { - "select": { "name": "biomesoplenty:redwood_forest" }, + "select": { + "name": "biomesoplenty:redwood_forest" + }, "apply": { - "species" : { - "random" : { - "dtbop:redwood" : 5, - "dtbop:small_redwood" : 3, - "oak_undergrowth" : 1 + "species": { + "random": { + "dtbop:redwood": 5, + "dtbop:small_redwood": 3, + "oak_undergrowth": 1 } }, "density": 1.0, "chance": 1.0, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:.*fir_clearing" }, + "select": { + "name": "biomesoplenty:.*fir_clearing" + }, "apply": { - "species" : "dtbop:fir", + "species": "dtbop:fir", "density": 2, "chance": 0.1, - "forestness" : 0.25 + "forestness": 0.25 } }, { - "select": { "name": "biomesoplenty:coniferous_forest" }, + "select": { + "name": "biomesoplenty:coniferous_forest" + }, "apply": { - "species" : { - "random" : { - "dtbop:mega_fir" : 5, - "dtbop:fir" : 1 + "species": { + "random": { + "dtbop:mega_fir": 5, + "dtbop:fir": 1 } }, - "density": [0.8], + "density": [ + 0.8 + ], "chance": 1.0, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:snowy_coniferous_forest" }, + "select": { + "name": "biomesoplenty:snowy_coniferous_forest" + }, "apply": { - "species" : { - "random" : { - "dtbop:mega_fir" : 6, - "dtbop:fir" : 4 + "species": { + "random": { + "dtbop:mega_fir": 6, + "dtbop:fir": 4 } }, - "density": [0.6], + "density": [ + 0.6 + ], "chance": 0.9, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:.*maple_woods" }, + "select": { + "name": "biomesoplenty:.*maple_woods" + }, "apply": { - "species" : { - "random" : { - "dtbop:red_maple" : 9, - "spruce" : 1 + "species": { + "random": { + "dtbop:red_maple": 9, + "spruce": 1 } }, "density": 0.8, "chance": 0.9, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:seasonal_forest" }, + "select": { + "name": "biomesoplenty:seasonal_forest" + }, "apply": { - "species" : { - "random" : { - "dtbop:red_maple" : 32, - "dtbop:orange_maple" : 32, - "dtbop:yellow_maple" : 32, - "oak" : 15, - "apple_oak" : 1 + "species": { + "random": { + "dtbop:red_maple": 32, + "dtbop:orange_maple": 32, + "dtbop:yellow_maple": 32, + "oak": 15, + "apple_oak": 1 } }, "density": 0.9, "chance": 0.8, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:pumpkin_patch" }, + "select": { + "name": "biomesoplenty:pumpkin_patch" + }, "apply": { - "species" : { - "random" : { - "dtbop:orange_maple" : 1, - "oak_undergrowth" : 4, - "dtbop:oak_twiglet" : 6 + "species": { + "random": { + "dtbop:orange_maple": 1, + "oak_undergrowth": 4, + "dtbop:oak_twiglet": 6 } }, "density": 0.5, @@ -401,28 +471,32 @@ } }, { - "select": { "name": "biomesoplenty:ominous_woods" }, + "select": { + "name": "biomesoplenty:ominous_woods" + }, "apply": { - "species" : { - "random" : { - "dtbop:mega_umbran" : 3, - "dtbop:umbran" : 2, - "dtbop:dead" : 1, - "dtbop:dying" : 2 + "species": { + "random": { + "dtbop:mega_umbran": 3, + "dtbop:umbran": 2, + "dtbop:dead": 1, + "dtbop:dying": 2 } }, "density": 1.0, "chance": 1.0, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:field" }, + "select": { + "name": "biomesoplenty:field" + }, "apply": { - "species" : { - "random" : { - "oak_undergrowth" : 25, - "spruce" : 1 + "species": { + "random": { + "oak_undergrowth": 25, + "spruce": 1 } }, "density": 0.8, @@ -430,190 +504,163 @@ } }, { - "select": { "name": "biomesoplenty:forested_field" }, + "select": { + "name": "biomesoplenty:forested_field" + }, "apply": { - "species" : { - "random" : { - "oak_undergrowth" : 1, - "spruce" : 3 + "species": { + "random": { + "oak_undergrowth": 1, + "spruce": 3 } }, "density": 1.0, "chance": 1.0, - "forestness" : 1.0 + "forestness": 1.0 } }, { - "select": { "name": "biomesoplenty:bayou" }, + "select": { + "name": "biomesoplenty:bayou" + }, "apply": { - "species" : "dtbop:cypress_willow", + "species": "dtbop:cypress_willow", "density": 0.6, "chance": 0.4 } }, { - "select": { "name": "biomesoplenty:dead_forest" }, + "select": { + "name": "biomesoplenty:dead_forest" + }, "apply": { - "species" : { - "random" : { - "dtbop:dead" : 1, - "dtbop:dying" : 2, - "oak" : 2, - "spruce" : 2 + "species": { + "random": { + "dtbop:dead": 1, + "dtbop:dying": 2, + "oak": 2, + "spruce": 2 } }, "density": 0.7, "chance": 0.3, - "forestness" : 0.25 + "forestness": 0.25 } }, { - "select": { "name": "biomesoplenty:old_growth_dead_forest" }, + "select": { + "name": "biomesoplenty:old_growth_dead_forest" + }, "apply": { - "species" : { - "random" : { - "dtbop:tall_dead" : 2, - "dtbop:tall_dying" : 4, - "dtbop:dying" : 1 + "species": { + "random": { + "dtbop:tall_dead": 2, + "dtbop:tall_dying": 4, + "dtbop:dying": 1 } }, "density": 1.0, "chance": 0.3, - "forestness" : 0.25 + "forestness": 0.25 } }, { - "select": { "name": "biomesoplenty:wetland" }, + "select": { + "name": "biomesoplenty:wetland" + }, "apply": { - "species" : "dtbop:willow", + "species": "dtbop:willow", "density": 0.5, "chance": 0.75, - "forestness" : 0.75 + "forestness": 0.75 } }, { - "select": { "name": "biomesoplenty:mystic_grove" }, + "select": { + "name": "biomesoplenty:mystic_grove" + }, "apply": { - "species" : { - "random" : { - "dtbop:large_magic_poplar" : 3, - "dtbop:magic_poplar" : 5, - "dtbop:flowering_oak" : 4, - "dtbop:mega_dark_oak" : 2 + "species": { + "random": { + "dtbop:large_magic_poplar": 3, + "dtbop:magic_poplar": 5, + "dtbop:flowering_oak": 4, + "dtbop:mega_dark_oak": 2 } }, "density": 1.0, "chance": 1.0 } }, - - { - "select": { "name": "biomesoplenty:muskeg" }, + "select": { + "name": "biomesoplenty:muskeg" + }, "apply": { - "species" : "dtbop:dead", + "species": "dtbop:dead", "density": 0.1, "chance": 0.6 } }, { - "only_if_loaded": "dynamictreesplus", - "select": { "name": "biomesoplenty:muskeg" }, - "apply": { - "species": { - "method": "splice_before", - "random": { - "...": 7, - "dtbop:mini_brown_mushroom": 1 - } - } - } - }, - { - "only_if_loaded": "dynamictreesplus", - "select": { "name": "biomesoplenty:mystic_grove" }, + "select": { + "name": "biomesoplenty:fungal_jungle" + }, "apply": { "species": { - "method": "splice_before", "random": { - "...": 6, - "dynamictreesplus:red_mushroom": 1 - } - } - } - }, - { - "select": { "name": "biomesoplenty:fungal_jungle" }, - "apply": { - "species" : { - "random" : { - "oak_undergrowth" : 9, - "oak" : 1 + "oak_undergrowth": 9, + "oak": 1 } }, - "density":[1.5], + "density": [ + 1.5 + ], "chance": 0.5 } }, { - "select": { "name": "biomesoplenty:aspen_glade" }, + "select": { + "name": "biomesoplenty:aspen_glade" + }, "apply": { - "species" : { - "random" : { - "dtbop:aspen" : 3 + "species": { + "random": { + "dtbop:aspen": 3 } }, "density": 0.5, "chance": 0.75, - "forestness" : 0.75 + "forestness": 0.75 } }, { - "select": { "name": "biomesoplenty:hot_springs" }, + "select": { + "name": "biomesoplenty:hot_springs" + }, "apply": { - "species" : { - "random" : { - "dtbop:pine" : 3 + "species": { + "random": { + "dtbop:pine": 3 } }, "density": 0.4, "chance": 0.5, - "forestness" : 0.5 + "forestness": 0.5 } }, { - "select": { "name": "biomesoplenty:undergrowth" }, - "apply": { - "species" : { - "random" : { - "dtbop:hellbark" : 1, - "dtbop:hellbark_bush" : 7 - } - }, - "density": 0.6, - "chance": 0.8 - } - }, - { - "only_if_loaded": "dynamictreesplus", - "select": { "name": "biomesoplenty:fungal_jungle" }, + "select": { + "name": "biomesoplenty:undergrowth" + }, "apply": { "species": { - "method": "splice_before", "random": { - "...": 2, - "dtbop:toadstool": 1 + "dtbop:hellbark": 1, + "dtbop:hellbark_bush": 7 } }, - "chance": 0.75 - } - }, - { - "only_if_loaded": "dynamictreesplus", - "select": { "name": "biomesoplenty:glowing_grotto" }, - "apply": { - "species" : "dtbop:glowshroom", - "density": [ 2 ], + "density": 0.6, "chance": 0.8 } } diff --git a/src/main/resources/trees/dtbop/world_gen/feature_cancellers.json b/src/main/resources/trees/dtbop/world_gen/feature_cancellers.json index f830fa20..413e8f36 100644 --- a/src/main/resources/trees/dtbop/world_gen/feature_cancellers.json +++ b/src/main/resources/trees/dtbop/world_gen/feature_cancellers.json @@ -2,33 +2,36 @@ { "__comment": "Cancel standard tree features from the BoP overworld.", "__comment2": "For now, the Empyreal tree is too complex to be dynamic.", - "select": { "names": [ "biomesoplenty:.*", "!biomesoplenty:origin_valley", "!biomesoplenty:end_wilds" ], "category": [ "!nether" ] }, + "select": { + "names": [ + "biomesoplenty:.*", + "!biomesoplenty:origin_valley", + "!biomesoplenty:end_wilds" + ], + "category": [ + "!nether" + ] + }, "cancellers": { "type": "tree", - "namespaces": ["biomesoplenty", "minecraft"] + "namespaces": [ + "biomesoplenty", + "minecraft" + ] } }, { "__comment": "Cancel standard tree features from the BoP nether.", - "select": { "name": "biomesoplenty:undergrowth" }, + "select": { + "name": "biomesoplenty:undergrowth" + }, "cancellers": { "type": "tree", - "namespaces": ["biomesoplenty", "minecraft"], + "namespaces": [ + "biomesoplenty", + "minecraft" + ], "stage": "underground_decoration" } - }, - { - "_comment": "Cancel mushrooms if DT+ is installed", - "only_if_loaded": "dynamictreesplus", - "select": {"OR": [ - { "name": "biomesoplenty:mystic_grove" }, - { "name": "biomesoplenty:fungal_jungle" }, - { "name": "biomesoplenty:glowing_grotto" }, - { "name": "biomesoplenty:muskeg" } - ]}, - "cancellers": { - "types": ["tree", "mushroom", "dtbop:mushroom"], - "namespaces": ["biomesoplenty", "minecraft"] - } } -] \ No newline at end of file +] diff --git a/src/main/resources/trees/dynamictrees/species/dark_oak.json b/src/main/resources/trees/dynamictrees/species/dark_oak.json index 30576380..19f05744 100644 --- a/src/main/resources/trees/dynamictrees/species/dark_oak.json +++ b/src/main/resources/trees/dynamictrees/species/dark_oak.json @@ -9,12 +9,7 @@ "max_branch_radius": 24, "growth_logic_kit": "dark_oak", "leaves_properties": "dark_oak", - "environment_factors" : { - "#forge:is_cold": 0.75, - "#forge:is_hot": 0.5, - "#forge:is_dry": 0.25, - "mushroom": 1.25 - }, + "preferred_climate": "temperate", "perfect_biomes": { "tag": "#forge:is_spooky", "name": "minecraft:.*" }, "primitive_sapling": "dark_oak_sapling", "features" : [