diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index dfe0770..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/.gitignore b/.gitignore index 45b9159..359bb71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,26 @@ -# eclipse -bin -*.launch -.settings -.metadata -.classpath -.project +# Gradle files +.gradle/ +build/ +out/ +bin/ -# idea -out -*.ipr -*.iws +# IDE files +.idea/ *.iml -.idea +.vscode/ +.settings/ +.classpath +.project +*.launch -# gradle -build -.gradle +# Mod Dev files +run/ +logs/ +crash-reports/ +debug.log +debug.log.gz +latest.log -# other -eclipse -run -libs +# OS files +.DS_Store +Thumbs.db diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7c9c1b3..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022 supermassimo - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..01b4ffd --- /dev/null +++ b/build.gradle @@ -0,0 +1,84 @@ +plugins { + id 'java-library' + id 'net.neoforged.moddev' version '2.0.120' +} + +version = project.mod_version +group = project.mod_group_id + +repositories { + mavenLocal() + maven { + url = "https://maven.neoforged.net/releases/" + } + maven { + url = "https://www.cursemaven.com" + } + // Local libs + flatDir { + dirs 'libs' + } +} + +base { + archivesName = project.mod_id +} + + + +java.toolchain.languageVersion = JavaLanguageVersion.of(21) + +sourceSets { + main { + resources { + srcDir 'src/generated/resources' + } + } +} + + + + + +neoForge { + version = project.neoforge_version + + mods { + "${mod_id}" { + sourceSet(sourceSets.main) + } + } + + runs { + configureEach { + systemProperty 'forge.logging.markers', 'REGISTRIES' + systemProperty 'forge.logging.console.level', 'debug' + } + + client { + client() + } + + server { + server() + } + } +} + +dependencies { + // NeoForge provided by plugin + + // Quark (Local) + implementation files("../Quark-master/build/libs/Quark-4.1-472-SNAPSHOT.jar") + implementation files("../Quark-master/localjars/Zeta-1.1-36L.jar") + + // Dynamic Trees (CurseMaven) + implementation "curse.maven:dynamictrees-252818:7259604" + + // Dynamic Trees Plus (CurseMaven) + implementation "curse.maven:dynamictreesplus-478155:7513822" +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 6cd6079..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,186 +0,0 @@ -import com.matthewprenger.cursegradle.CurseArtifact -import com.matthewprenger.cursegradle.CurseExtension -import com.matthewprenger.cursegradle.CurseProject -import com.matthewprenger.cursegradle.CurseRelation -import net.minecraftforge.gradle.common.util.RunConfig -import java.time.Instant -import java.time.format.DateTimeFormatter - -fun property(key: String) = project.findProperty(key).toString() - -plugins { - id("java") - id("net.minecraftforge.gradle") - id("org.parchmentmc.librarian.forgegradle") - id("idea") - id("maven-publish") - id("com.matthewprenger.cursegradle") version "1.4.0" -} - -repositories { - maven("https://ldtteam.jfrog.io/ldtteam/modding/") - maven("https://www.cursemaven.com") { - content { - includeGroup("curse.maven") - } - } - maven("https://harleyoconnor.com/maven") - maven("https://squiddev.cc/maven/") -} - -val modName = property("modName") -val modId = property("modId") -val modVersion = property("modVersion") -val mcVersion = property("mcVersion") - -version = "$mcVersion-$modVersion" -group = property("group") - -minecraft { - mappings("official", mcVersion) - - runs { - create("client") { - applyDefaultConfiguration() - - if (project.hasProperty("mcUuid")) { - args("--uuid", property("mcUuid")) - } - if (project.hasProperty("mcUsername")) { - args("--username", property("mcUsername")) - } - if (project.hasProperty("mcAccessToken")) { - args("--accessToken", property("mcAccessToken")) - } - } - - create("server") { - applyDefaultConfiguration("run-server") - } - - create("data") { - applyDefaultConfiguration() - - args( - "--mod", modId, - "--all", - "--output", file("src/generated/resources/"), - "--existing", file("src/main/resources"), - "--existing-mod", "dynamictrees" - ) - } - } -} - -sourceSets.main.get().resources { - srcDir("src/generated/resources") -} - -dependencies { - minecraft("net.minecraftforge:forge:$mcVersion-${property("forgeVersion")}") - - implementation(fg.deobf("vazkii.autoreglib:AutoRegLib:${property("arlVersion")}")) - implementation(fg.deobf("vazkii.quark:Quark:${property("quarkVersion")}")) - implementation(fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-$mcVersion:${property("dynamicTreesVersion")}")) - - runtimeOnly(fg.deobf("curse.maven:hwyla-253449:3033593")) - runtimeOnly(fg.deobf("vazkii.patchouli:Patchouli:${property("patchouliVersion")}")) - runtimeOnly(fg.deobf("mezz.jei:jei-$mcVersion:${property("jeiVersion")}")) - runtimeOnly(fg.deobf("org.squiddev:cc-tweaked-$mcVersion:${property("ccVersion")}")) - runtimeOnly(fg.deobf("curse.maven:ShutUpExperimentalSettings-407174:3188120")) - runtimeOnly(fg.deobf("com.harleyoconnor.suggestionproviderfix:SuggestionProviderFix:$mcVersion-${property("suggestionProviderFixVersion")}")) -} - -tasks.jar { - manifest.attributes( - "Specification-Title" to project.name, - "Specification-Vendor" to "Max Hyper", - "Specification-Version" to "1", - "Implementation-Title" to project.name, - "Implementation-Version" to project.version, - "Implementation-Vendor" to "Max Hyper", - "Implementation-Timestamp" to DateTimeFormatter.ISO_INSTANT.format(Instant.now()) - ) - - archiveBaseName.set(modName) - finalizedBy("reobfJar") -} - -java { - withSourcesJar() - - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - } -} - -curseforge { - if (project.hasProperty("curseApiKey") && project.hasProperty("curseFileType")) { - apiKey = property("curseApiKey") - - project { - id = "386753" - - addGameVersion(mcVersion) - - changelog = "Changelog will be added shortly..." - changelogType = "markdown" - releaseType = property("curseFileType") - - addArtifact(tasks.findByName("sourcesJar")) - - mainArtifact(tasks.findByName("jar")) { - relations { - requiredDependency("dynamictrees") - requiredDependency("quark") - optionalDependency("chunk-saving-fix") - } - } - } - } else { - project.logger.log(LogLevel.WARN, "API Key and file type for CurseForge not detected; uploading will be disabled.") - } -} - -tasks.withType { - enabled = false -} - -publishing { - publications { - create("mavenJava") { - from(components["java"]) - } - } - repositories { - maven("file:///${project.projectDir}/mcmodsrepo") - } -} - -fun RunConfig.applyDefaultConfiguration(runDirectory: String = "run") { - workingDirectory = file(runDirectory).absolutePath - - property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP") - property("forge.logging.console.level", "debug") - - property("mixin.env.remapRefMap", "true") - property("mixin.env.refMapRemappingFile", "${buildDir}/createSrgToMcp/output.srg") - - mods { - create(modId) { - source(sourceSets.main.get()) - } - } -} - -fun CurseExtension.project(action: CurseProject.() -> Unit) { - this.project(closureOf(action)) -} - -fun CurseProject.mainArtifact(artifact: Task?, action: CurseArtifact.() -> Unit) { - this.mainArtifact(artifact, closureOf(action)) -} - -fun CurseArtifact.relations(action: CurseRelation.() -> Unit) { - this.relations(closureOf(action)) -} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index e92ccf5..0000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - `kotlin-dsl` - `java-library` -} - -repositories { - mavenCentral() - maven("https://files.minecraftforge.net/maven") - maven("https://maven.parchmentmc.org") -} - -dependencies { - implementation("com.google.code.gson:gson:2.8.7") - implementation("net.minecraftforge.gradle:ForgeGradle:5.1.+") - implementation("org.parchmentmc:librarian:1.+") -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 52766ee..8625f9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,15 @@ -modName=DynamicTreesQuark -modVersion=2.1.3 -group=com.maxhyper.dtquark - -mcVersion=1.16.5 -forgeVersion=36.2.34 - -dynamicTreesVersion=0.10.0-Beta34 -arlVersion=1.6-49.90 -quarkVersion=r2.4-322.1 -hwylaVersion=1.10.11-B78_1.16.2 -jeiVersion=7.7.1.139 -patchouliVersion=1.16.4-53.2 -ccVersion=1.100.9 -suggestionProviderFixVersion=1.0.0 - -curseFileType=release - -org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false \ No newline at end of file +mod_id=dtquark +mod_name=Dynamic Trees for Quark +mod_license=MIT +mod_version=2.5.4 +mod_group_id=org.violetmoon.dtquark +mod_authors=Vazkii, ThePixelCoder +mod_description=Dynamic Trees compatibility for Quark + +minecraft_version=1.21.1 +neoforge_version=21.1.195 +neoforge_loader_version_range=[4,) +minecraft_version_range=[1.21.1] + +quark_version=4.1-472-SNAPSHOT +dynamictrees_version=1.6.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37bd63a..e1adfb4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue May 04 17:24:17 UYT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip diff --git a/gradlew b/gradlew index cccdd3d..1b6c787 100644 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 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. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# 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" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :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 %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..53df4ac --- /dev/null +++ b/settings.gradle @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + maven { url = 'https://maven.neoforged.net/releases' } + } +} +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} +rootProject.name = 'DynamicTrees-Quark' diff --git a/src/generated/resources/.cache/0e1c6e2993f5d031b19c4124fb324d60b80705ea b/src/generated/resources/.cache/0e1c6e2993f5d031b19c4124fb324d60b80705ea new file mode 100644 index 0000000..6cd1d88 --- /dev/null +++ b/src/generated/resources/.cache/0e1c6e2993f5d031b19c4124fb324d60b80705ea @@ -0,0 +1,12 @@ +// 1.20.1 2024-07-03T23:52:31.6577223 Item Models: dtquark +7681cb90f0af4f2cd0fc6d0bd05d711b6c2b687c assets/dtquark/models/item/ancient_branch.json +aee7ec2ac4f015e4762630686623eee4f5d4a6d1 assets/dtquark/models/item/ancient_seed.json +0fc1e649fab3232526e68969269470d90ec38040 assets/dtquark/models/item/azalea_branch.json +765011753c26ddce05c2030471a492c92cb8a7da assets/dtquark/models/item/blossom_branch.json +ba8a5e43545441397b4d41f0c10f0d0ab1808a06 assets/dtquark/models/item/fiery_blossom_seed.json +cb7aa8061feaabf0184fbc8d6209d36d67025ffb assets/dtquark/models/item/frosty_blossom_seed.json +8e9eadd330d2de15c21ad56b7d96c7c478a179c0 assets/dtquark/models/item/glow_shroom_branch.json +491377172fe2ae9cddcc1f15fee179d0c5fc53dd assets/dtquark/models/item/glow_shroom_seed.json +f9b8a2e734eef2e63b8123add284cda92926eb86 assets/dtquark/models/item/serene_blossom_seed.json +d3b7877f09a18571a6c52232b17a90fd161db6f0 assets/dtquark/models/item/sunny_blossom_seed.json +36e7f5ae666ff55e8d2f8767fe3e6ae11fa483bb assets/dtquark/models/item/warm_blossom_seed.json diff --git a/src/generated/resources/.cache/23823ddc2382fa6882f3540e9ccede1e362f28c5 b/src/generated/resources/.cache/23823ddc2382fa6882f3540e9ccede1e362f28c5 new file mode 100644 index 0000000..47b32f1 --- /dev/null +++ b/src/generated/resources/.cache/23823ddc2382fa6882f3540e9ccede1e362f28c5 @@ -0,0 +1,38 @@ +// 1.20.1 2024-07-06T15:33:30.24455 Block States: dtquark +0f926cd59a8636cf012c456baefb7475813c867e assets/dtquark/blockstates/ancient_branch.json +5909b67c7c522934f53b571c47e7831ae6ae029b assets/dtquark/blockstates/ancient_leaves.json +6a1434881c6aabee16ba8c87ff94063e092ef94b assets/dtquark/blockstates/ancient_sapling.json +5b779ffbf3cbee8c0c1d46a431f7b2563a40f63e assets/dtquark/blockstates/azalea_branch.json +a8dd386807ed552ed30294cd6fafae1ca13cb716 assets/dtquark/blockstates/blossom_branch.json +83b426bc17ece3cf9afaab0a6b732d9d8bd9a014 assets/dtquark/blockstates/fiery_blossom_leaves.json +de6201539c735c5564b9bc0a865964df52195650 assets/dtquark/blockstates/fiery_blossom_sapling.json +72109e5eef387a67eabc8ec8c22fdfbb25a4bfc4 assets/dtquark/blockstates/frosty_blossom_leaves.json +57721f97463259bd2f02a33544de35d72b5c445d assets/dtquark/blockstates/frosty_blossom_sapling.json +086952e407e9a9c371031aa5a1123cea5ea0721b assets/dtquark/blockstates/glow_shroom_branch.json +303f78ab1b06822d73b211d7cadd3246e078a47b assets/dtquark/blockstates/glow_shroom_cap.json +7e498921a1d7ad997e6f244548e8d93aafafd438 assets/dtquark/blockstates/glow_shroom_cap_center.json +f5c3fd2cfacc8b9a380799e7a84bf3e17fcad1b0 assets/dtquark/blockstates/glow_shroom_sapling.json +3d4aef1132819a9c2094339e038a564b2fdb8875 assets/dtquark/blockstates/serene_blossom_leaves.json +3144e2ef59989ebd0846a3ff6ed957d0599f0436 assets/dtquark/blockstates/serene_blossom_sapling.json +c949ef14add0af4cd582259d7e5adbc047c22040 assets/dtquark/blockstates/stripped_ancient_branch.json +a2607d0c19500c6e5a913c624b44f8f76285e168 assets/dtquark/blockstates/stripped_azalea_branch.json +9805de8d33523ada626c07a21cc99364de33889e assets/dtquark/blockstates/stripped_blossom_branch.json +7fa54c332133307364769df1918d781d58c1e72b assets/dtquark/blockstates/sunny_blossom_leaves.json +96d5362e8397b90d40e4c9a4a92119d698df4e85 assets/dtquark/blockstates/sunny_blossom_sapling.json +1d4baa98258d8ae0061df3ffb71dd2abb081f0ea assets/dtquark/blockstates/warm_blossom_leaves.json +741541c4be21010b52b3d61a91c8b00117adc230 assets/dtquark/blockstates/warm_blossom_sapling.json +da60a1bb176d748515c37e02f735792e504a169d assets/dtquark/models/block/ancient_branch.json +1796659ee436190821230a70995c367531c316a3 assets/dtquark/models/block/azalea_branch.json +edf6f4582b53e6a2e3e53b815ba5cbd33b22409e assets/dtquark/models/block/blossom_branch.json +db1f55492f167548b52b9d9aca4185c179420c2e assets/dtquark/models/block/glow_shroom_branch.json +2e176189daaa64ff6d32f061eace9b610220252e assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json +a7ece6731f5c303a39fb0d01cd3e4fb9c8d62047 assets/dtquark/models/block/saplings/ancient.json +065b197b5a5e2e6a14d5a53b37742f09f796e557 assets/dtquark/models/block/saplings/fiery_blossom.json +ab94b9cf6d1b9371ae651e3c221db905deb7f9c3 assets/dtquark/models/block/saplings/frosty_blossom.json +60b2d8a2b48f447b35ddf071c35a1a4b9236c76d assets/dtquark/models/block/saplings/glow_shroom.json +bde1e12ecf2d90d806d8677c07d1bbd4abcc0779 assets/dtquark/models/block/saplings/serene_blossom.json +7e615397242459bf80648688dab053c3255b2bdb assets/dtquark/models/block/saplings/sunny_blossom.json +2d91338696d1b70b683d071441d7eaf44ac7fb24 assets/dtquark/models/block/saplings/warm_blossom.json +921e91e789b60bf9c209514b73185162905748b9 assets/dtquark/models/block/stripped_ancient_branch.json +48d45a91d630c44e358181681374af8503808905 assets/dtquark/models/block/stripped_azalea_branch.json +154e363486dbdda22b00f9064ad76395ef2aeb72 assets/dtquark/models/block/stripped_blossom_branch.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d new file mode 100644 index 0000000..41e6f8e --- /dev/null +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -0,0 +1,30 @@ +// 1.20.1 2024-07-06T15:25:17.6887985 Loot Tables +a96bd6273175931e5710f05d174469dc35613972 data/dtquark/loot_tables/blocks/ancient_fruit.json +883eb30bce4823fc641c705be2f06ba51e74b03a data/dtquark/loot_tables/blocks/ancient_leaves.json +10f697412a3cfe4178ee0c9252d68cba9c4f31dc data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json +411e6d2890e2f602a97674b223f5896565b268ec data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json +357d8bcb33997d079672ee27a5182a161e0d396f data/dtquark/loot_tables/blocks/glow_shroom_cap.json +d91fa139fe78615bb9b031443d4767e03049d50e data/dtquark/loot_tables/blocks/serene_blossom_leaves.json +167d81d7633ac0eb796c82ffb84858cfa9281b3a data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json +5a1c0361478ad774ac5e95c8b6cf76e8eae5c8a0 data/dtquark/loot_tables/blocks/warm_blossom_leaves.json +2fd2e75d0c59819b66666a3040367f5de8158654 data/dtquark/loot_tables/trees/branches/ancient.json +7d72895d67b073dcdfa8e416406a059a40218e0c data/dtquark/loot_tables/trees/branches/azalea.json +0df3af8906c020cdd40af730a0af7c85758559b3 data/dtquark/loot_tables/trees/branches/blossom.json +f02c6ccb19cea35a51aec5ac8eabbcacb834ea00 data/dtquark/loot_tables/trees/branches/glow_shroom.json +02c8a7f1ac19a06c8e2b9f8e53777c80f4a8cd44 data/dtquark/loot_tables/trees/branches/stripped_ancient.json +dbe6fb011ad12c5a1e6ddffa7cb263147924143e data/dtquark/loot_tables/trees/branches/stripped_azalea.json +656c480a11115192ad5fe2c3b59024247b7b9142 data/dtquark/loot_tables/trees/branches/stripped_blossom.json +06828d4bc86d35c60c5a3caaccf984c1574196e6 data/dtquark/loot_tables/trees/leaves/ancient.json +b2649b63ec27ca567e090f6f4fa5439371cbb21a data/dtquark/loot_tables/trees/leaves/fiery_blossom.json +8e8516b9a498f67fe6e0c4043816c011db341c61 data/dtquark/loot_tables/trees/leaves/frosty_blossom.json +9897998360a5dcc3dca59a5ab9481bb2ec6a3d1d data/dtquark/loot_tables/trees/leaves/serene_blossom.json +1b50a3d5b169b7eaf577babead4794bff85de453 data/dtquark/loot_tables/trees/leaves/sunny_blossom.json +2a370d0bd002cf4d191ca2414fdedd43642b2302 data/dtquark/loot_tables/trees/leaves/warm_blossom.json +1376a6b0e019f3065f793821c40c234a075e82bc data/dtquark/loot_tables/trees/mushroom_caps/glow_shroom.json +77bfda9abd9df9bcb4da9a971f7da8a1fa893635 data/dtquark/loot_tables/trees/voluntary/ancient.json +5792f794da2717a1b55666db4cdfcf1a22bcaaa9 data/dtquark/loot_tables/trees/voluntary/fiery_blossom.json +21c98acf06d0b660e93fcc093711e2cbce3dd17b data/dtquark/loot_tables/trees/voluntary/frosty_blossom.json +7b306390b27f7ca9ca87a74c6db9e91666dbc5b2 data/dtquark/loot_tables/trees/voluntary/glow_shroom.json +e98901343fe9cc05d65fffdf6b061818a89610a0 data/dtquark/loot_tables/trees/voluntary/serene_blossom.json +1493bcddea45d19eb9a00a4ae04a2cbc25d2cb2a data/dtquark/loot_tables/trees/voluntary/sunny_blossom.json +b8e889b972b04c9b133db138f0d727d4d10f6b6f data/dtquark/loot_tables/trees/voluntary/warm_blossom.json diff --git a/src/generated/resources/.cache/dcc54e5cfe81a1f6a56ae9d2aa2232d08868920a b/src/generated/resources/.cache/dcc54e5cfe81a1f6a56ae9d2aa2232d08868920a new file mode 100644 index 0000000..5b03cfe --- /dev/null +++ b/src/generated/resources/.cache/dcc54e5cfe81a1f6a56ae9d2aa2232d08868920a @@ -0,0 +1,7 @@ +// 1.20.1 2024-07-03T23:52:31.6557256 dtquark DT Block Tags +1ae719368e82a033b150af0219706387e6a8c857 data/dynamictrees/tags/blocks/branches_that_burn.json +8dfde6cf722ff2ad42f55974691fbcfbd1b99e33 data/dynamictrees/tags/blocks/fungus_branches.json +b8cb057124579f9faa0685e29eb7411414b425ef data/dynamictrees/tags/blocks/fungus_caps.json +47f71657de201907cde63591fb86daebd378f07d data/dynamictrees/tags/blocks/leaves.json +816ff20001b518f929c0b281f11593f3a849ea91 data/dynamictrees/tags/blocks/saplings.json +9ba14a376795df66c049874d9af5e7e6169f5113 data/dynamictrees/tags/blocks/stripped_branches_that_burn.json diff --git a/src/generated/resources/.cache/df78a35a8ce97e9c08619e9ed581d3037a4665e2 b/src/generated/resources/.cache/df78a35a8ce97e9c08619e9ed581d3037a4665e2 new file mode 100644 index 0000000..3d2335c --- /dev/null +++ b/src/generated/resources/.cache/df78a35a8ce97e9c08619e9ed581d3037a4665e2 @@ -0,0 +1,5 @@ +// 1.20.1 2024-07-03T23:52:31.6447274 dtquark DT Item Tags +1ae719368e82a033b150af0219706387e6a8c857 data/dynamictrees/tags/items/branches_that_burn.json +8dfde6cf722ff2ad42f55974691fbcfbd1b99e33 data/dynamictrees/tags/items/fungus_branches.json +80cb723fa59c21e10184978b8c8b15fc371f1478 data/dynamictrees/tags/items/fungus_caps.json +fdf24a42552d79d59a714b945c9e3f995667cee1 data/dynamictrees/tags/items/seeds.json diff --git a/src/generated/resources/assets/dtquark/blockstates/ancient_branch.json b/src/generated/resources/assets/dtquark/blockstates/ancient_branch.json new file mode 100644 index 0000000..daba752 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/ancient_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/ancient_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/ancient_fruit.json b/src/generated/resources/assets/dtquark/blockstates/ancient_fruit.json new file mode 100644 index 0000000..077395f --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/ancient_fruit.json @@ -0,0 +1,16 @@ +{ + "variants":{ + "age=0":{ + "model":"dtquark:block/fruits/ancient_fruit_age0" + }, + "age=1":{ + "model":"dtquark:block/fruits/ancient_fruit_age1" + }, + "age=2":{ + "model":"dtquark:block/fruits/ancient_fruit_age2" + }, + "age=3":{ + "model":"dtquark:block/fruits/ancient_fruit_age3" + } + } +} diff --git a/src/generated/resources/assets/dtquark/blockstates/ancient_leaves.json b/src/generated/resources/assets/dtquark/blockstates/ancient_leaves.json new file mode 100644 index 0000000..9c63e47 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/ancient_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/ancient_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/ancient_sapling.json b/src/generated/resources/assets/dtquark/blockstates/ancient_sapling.json new file mode 100644 index 0000000..78f7848 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/ancient_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/ancient" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/azalea_branch.json b/src/generated/resources/assets/dtquark/blockstates/azalea_branch.json new file mode 100644 index 0000000..024a43d --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/azalea_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/azalea_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/azalea_leaves.json b/src/generated/resources/assets/dtquark/blockstates/azalea_leaves.json new file mode 100644 index 0000000..0aec9a3 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/azalea_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "minecraft:block/azalea_leaves" + } + } +} diff --git a/src/generated/resources/assets/dtquark/blockstates/blossom_branch.json b/src/generated/resources/assets/dtquark/blockstates/blossom_branch.json new file mode 100644 index 0000000..d451e05 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/blossom_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/blossom_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json new file mode 100644 index 0000000..ce8a475 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/red_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json new file mode 100644 index 0000000..4acee40 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/fiery_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json new file mode 100644 index 0000000..04d65e5 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/blue_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json new file mode 100644 index 0000000..db41e2e --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/frosty_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/glow_shroom_branch.json b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_branch.json new file mode 100644 index 0000000..2ad9056 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/glow_shroom_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap.json b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap.json new file mode 100644 index 0000000..07edebf --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap.json @@ -0,0 +1,116 @@ +{ + "multipart": [ + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside" + }, + "when": { + "north": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "y": 90 + }, + "when": { + "east": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "y": 180 + }, + "when": { + "south": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "y": 270 + }, + "when": { + "west": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "x": 270 + }, + "when": { + "up": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "x": 90 + }, + "when": { + "down": "false" + } + } + ] +} diff --git a/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap_center.json b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap_center.json new file mode 100644 index 0000000..0ff3816 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap_center.json @@ -0,0 +1,66 @@ +{ + "multipart": [ + { + "apply": { + "model": "dtquark:block/mushroom/glow_shroom_cap_center_age0" + }, + "when": { + "age": "0" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "x": 270 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side" + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "y": 90 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "y": 180 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "y": 270 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "x": 90 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/glow_shroom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_sapling.json new file mode 100644 index 0000000..0af4ed2 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/glow_shroom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/serene_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/serene_blossom_leaves.json new file mode 100644 index 0000000..38b662f --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/serene_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/lavender_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/serene_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/serene_blossom_sapling.json new file mode 100644 index 0000000..9c40128 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/serene_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/serene_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/stripped_ancient_branch.json b/src/generated/resources/assets/dtquark/blockstates/stripped_ancient_branch.json new file mode 100644 index 0000000..31574bc --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/stripped_ancient_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/stripped_ancient_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/stripped_azalea_branch.json b/src/generated/resources/assets/dtquark/blockstates/stripped_azalea_branch.json new file mode 100644 index 0000000..a1cf04e --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/stripped_azalea_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/stripped_azalea_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/stripped_blossom_branch.json b/src/generated/resources/assets/dtquark/blockstates/stripped_blossom_branch.json new file mode 100644 index 0000000..8fba637 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/stripped_blossom_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/stripped_blossom_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json new file mode 100644 index 0000000..c8c151d --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/yellow_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json new file mode 100644 index 0000000..144940f --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/sunny_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/warm_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/warm_blossom_leaves.json new file mode 100644 index 0000000..5bfd584 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/warm_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/orange_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/warm_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/warm_blossom_sapling.json new file mode 100644 index 0000000..ca08753 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/warm_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/warm_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/ancient_branch.json b/src/generated/resources/assets/dtquark/models/block/ancient_branch.json new file mode 100644 index 0000000..3d05a41 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/ancient_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/ancient_log", + "rings": "quark:block/ancient_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/azalea_branch.json b/src/generated/resources/assets/dtquark/models/block/azalea_branch.json new file mode 100644 index 0000000..b301fa1 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/azalea_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/azalea_log", + "rings": "quark:block/azalea_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/blossom_branch.json b/src/generated/resources/assets/dtquark/models/block/blossom_branch.json new file mode 100644 index 0000000..4c3f5f5 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/blossom_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/blossom_log", + "rings": "quark:block/blossom_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age0.json b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age0.json new file mode 100644 index 0000000..7dd5980 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age0.json @@ -0,0 +1,38 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "1": "dtquark:block/ancient_fruit", + "particle": "dtquark:block/ancient_fruit" + }, + "elements": [ + { + "from": [7, 15, 8], + "to": [9, 16, 8], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 15, 4, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "south": {"uv": [0, 15, 4, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} + } + }, + { + "from": [8, 15, 7], + "to": [8, 16, 9], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "east": {"uv": [0, 15, 4, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [0, 15, 4, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age1.json b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age1.json new file mode 100644 index 0000000..b9e017c --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age1.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "1": "dtquark:block/ancient_fruit", + "particle": "dtquark:block/ancient_fruit" + }, + "elements": [ + { + "from": [6.8, 11.8, 6.8], + "to": [9.2, 15, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 0]}, + "faces": { + "north": {"uv": [0, 3, 3, 7], "texture": "#1", "tintindex": 0}, + "east": {"uv": [0, 3, 3, 7], "texture": "#1", "tintindex": 0}, + "south": {"uv": [0, 3, 3, 7], "texture": "#1", "tintindex": 0}, + "west": {"uv": [0, 3, 3, 7], "texture": "#1", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1", "tintindex": 0}, + "down": {"uv": [0, 7, 3, 10], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 90, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#1", "tintindex": 1} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 270, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#1", "tintindex": 1} + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age2.json b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age2.json new file mode 100644 index 0000000..d329c2c --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age2.json @@ -0,0 +1,61 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "1": "dtquark:block/ancient_fruit", + "particle": "dtquark:block/ancient_fruit" + }, + "elements": [ + { + "from": [6.8, 13.4, 6.8], + "to": [9.2, 15, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.6, 11.6, 9.2]}, + "faces": { + "north": {"uv": [4, 4, 7, 6], "texture": "#1", "tintindex": 0}, + "east": {"uv": [4, 4, 7, 6], "texture": "#1", "tintindex": 0}, + "south": {"uv": [4, 4, 7, 6], "texture": "#1", "tintindex": 0}, + "west": {"uv": [4, 4, 7, 6], "texture": "#1", "tintindex": 0}, + "up": {"uv": [5, 1, 8, 4], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [6.4, 10.2, 6.4], + "to": [9.6, 13.4, 9.6], + "rotation": {"angle": 0, "axis": "y", "origin": [7.4, 5.4, 7.8]}, + "faces": { + "north": {"uv": [4, 6, 8, 10], "texture": "#1", "tintindex": 0}, + "east": {"uv": [4, 6, 8, 10], "texture": "#1", "tintindex": 0}, + "south": {"uv": [4, 6, 8, 10], "texture": "#1", "tintindex": 0}, + "west": {"uv": [4, 6, 8, 10], "texture": "#1", "tintindex": 0}, + "up": {"uv": [4, 0, 8, 4], "texture": "#1", "tintindex": 0}, + "down": {"uv": [4, 10, 8, 14], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 270, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#1", "tintindex": 1} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 90, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#1", "tintindex": 1} + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age3.json b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age3.json new file mode 100644 index 0000000..edf4404 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age3.json @@ -0,0 +1,61 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "1": "dtquark:block/ancient_fruit", + "particle": "dtquark:block/ancient_fruit" + }, + "elements": [ + { + "from": [6.8, 11.6, 6.8], + "to": [9.2, 14, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.6, 11.6, 9.2]}, + "faces": { + "north": {"uv": [9, 4, 12, 7], "texture": "#1", "tintindex": 0}, + "east": {"uv": [9, 4, 12, 7], "texture": "#1", "tintindex": 0}, + "south": {"uv": [9, 4, 12, 7], "texture": "#1", "tintindex": 0}, + "west": {"uv": [9, 4, 12, 7], "texture": "#1", "tintindex": 0}, + "up": {"uv": [10, 1, 13, 4], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [6.4, 8.4, 6.4], + "to": [9.6, 11.6, 9.6], + "rotation": {"angle": 0, "axis": "y", "origin": [7.4, 5.4, 7.8]}, + "faces": { + "north": {"uv": [9, 7, 13, 11], "texture": "#1", "tintindex": 0}, + "east": {"uv": [9, 7, 13, 11], "texture": "#1", "tintindex": 0}, + "south": {"uv": [9, 7, 13, 11], "texture": "#1", "tintindex": 0}, + "west": {"uv": [9, 7, 13, 11], "texture": "#1", "tintindex": 0}, + "up": {"uv": [9, 0, 13, 4], "texture": "#1", "tintindex": 0}, + "down": {"uv": [9, 11, 13, 15], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 270, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#1", "tintindex": 1} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 90, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#1", "tintindex": 1} + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/glow_shroom.json b/src/generated/resources/assets/dtquark/models/block/glow_shroom.json new file mode 100644 index 0000000..0d822bf --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/glow_shroom.json @@ -0,0 +1,35 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#cap" + }, + "elements": [ + { + "name": "Cap", + "from": [5, 3, 5], + "to": [11, 7, 11], + "faces": { + "north": {"uv": [1, 6, 7, 10], "texture": "#cap"}, + "east": {"uv": [1, 11, 7, 15], "texture": "#cap"}, + "south": {"uv": [1, 6, 7, 10], "texture": "#cap"}, + "west": {"uv": [1, 11, 7, 15], "texture": "#cap"}, + "up": {"uv": [1, 0, 7, 6], "texture": "#cap"}, + "down": {"uv": [9, 0, 15, 6], "texture": "#cap"} + } + }, + { + "name": "Stem", + "from": [7, 0, 7], + "to": [9, 5, 9], + "faces": { + "north": {"uv": [11, 11, 13, 16], "texture": "#cap"}, + "east": {"uv": [11, 11, 13, 16], "texture": "#cap"}, + "south": {"uv": [11, 11, 13, 16], "texture": "#cap"}, + "west": {"uv": [11, 11, 13, 16], "texture": "#cap"}, + "up": {"uv": [11, 11, 13, 13], "texture": "#cap"}, + "down": {"uv": [11, 14, 13, 16], "texture": "#cap", "cullface": "down"} + } + } + ] +} diff --git a/src/generated/resources/assets/dtquark/models/block/glow_shroom_branch.json b/src/generated/resources/assets/dtquark/models/block/glow_shroom_branch.json new file mode 100644 index 0000000..53b14b9 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/glow_shroom_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/glow_shroom_stem", + "rings": "quark:block/glow_shroom_stem" + } +} diff --git a/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_inside.json b/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_inside.json new file mode 100644 index 0000000..defa7e7 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_inside.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quark:block/glow_shroom_block_inside" + } +} diff --git a/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_side.json b/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_side.json new file mode 100644 index 0000000..5bdf97f --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quark:block/glow_shroom_block" + } +} diff --git a/src/generated/resources/assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json b/src/generated/resources/assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json new file mode 100644 index 0000000..185c4af --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json @@ -0,0 +1,8 @@ +{ + "parent": "dtquark:block/tall_slab", + "textures": { + "bottom": "quark:block/glow_shroom_block_inside", + "side": "quark:block/glow_shroom_block", + "top": "quark:block/glow_shroom_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/ancient.json b/src/generated/resources/assets/dtquark/models/block/saplings/ancient.json new file mode 100644 index 0000000..bfa751e --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/ancient.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/ancient_leaves", + "log": "quark:block/ancient_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/fiery_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/fiery_blossom.json new file mode 100644 index 0000000..68a99a4 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/fiery_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/red_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/frosty_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/frosty_blossom.json new file mode 100644 index 0000000..8a315d1 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/frosty_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/blue_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/glow_shroom.json b/src/generated/resources/assets/dtquark/models/block/saplings/glow_shroom.json new file mode 100644 index 0000000..36e03e4 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/glow_shroom.json @@ -0,0 +1,8 @@ +{ + "parent": "dtquark:block/glow_shroom", + "render_type": "minecraft:cutout_mipped", + "textures": { + "cap": "dtquark:block/glow_shroom_cap", + "stem": "quark:block/glow_shroom_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/serene_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/serene_blossom.json new file mode 100644 index 0000000..8059491 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/serene_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/lavender_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/sunny_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/sunny_blossom.json new file mode 100644 index 0000000..ad95d72 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/sunny_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/yellow_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/warm_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/warm_blossom.json new file mode 100644 index 0000000..87c8c45 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/warm_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/orange_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/stripped_ancient_branch.json b/src/generated/resources/assets/dtquark/models/block/stripped_ancient_branch.json new file mode 100644 index 0000000..12f9692 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/stripped_ancient_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/stripped_ancient_log", + "rings": "quark:block/stripped_ancient_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/stripped_azalea_branch.json b/src/generated/resources/assets/dtquark/models/block/stripped_azalea_branch.json new file mode 100644 index 0000000..5464697 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/stripped_azalea_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "minecraft:block/stripped_oak_log", + "rings": "minecraft:block/stripped_oak_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/stripped_blossom_branch.json b/src/generated/resources/assets/dtquark/models/block/stripped_blossom_branch.json new file mode 100644 index 0000000..f4353bb --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/stripped_blossom_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/stripped_blossom_log", + "rings": "quark:block/stripped_blossom_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/tall_slab.json b/src/generated/resources/assets/dtquark/models/block/tall_slab.json new file mode 100644 index 0000000..3c02dd3 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/tall_slab.json @@ -0,0 +1,18 @@ +{ "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 12, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/generated/resources/assets/dtquark/models/item/ancient_branch.json b/src/generated/resources/assets/dtquark/models/item/ancient_branch.json new file mode 100644 index 0000000..70443aa --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/ancient_branch.json @@ -0,0 +1,7 @@ +{ + "parent": "dynamictrees:item/branch", + "textures": { + "bark": "quark:block/ancient_log", + "rings": "quark:block/ancient_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/ancient_seed.json b/src/generated/resources/assets/dtquark/models/item/ancient_seed.json new file mode 100644 index 0000000..af214d4 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/ancient_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/ancient_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/azalea_branch.json b/src/generated/resources/assets/dtquark/models/item/azalea_branch.json new file mode 100644 index 0000000..6808ceb --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/azalea_branch.json @@ -0,0 +1,7 @@ +{ + "parent": "dynamictrees:item/branch", + "textures": { + "bark": "quark:block/azalea_log", + "rings": "quark:block/azalea_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/blossom_branch.json b/src/generated/resources/assets/dtquark/models/item/blossom_branch.json new file mode 100644 index 0000000..1ce99c3 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/blossom_branch.json @@ -0,0 +1,7 @@ +{ + "parent": "dynamictrees:item/branch", + "textures": { + "bark": "quark:block/blossom_log", + "rings": "quark:block/blossom_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/fiery_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/fiery_blossom_seed.json new file mode 100644 index 0000000..b71107d --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/fiery_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/fiery_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/frosty_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/frosty_blossom_seed.json new file mode 100644 index 0000000..84d061c --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/frosty_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/frosty_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/glow_shroom_branch.json b/src/generated/resources/assets/dtquark/models/item/glow_shroom_branch.json new file mode 100644 index 0000000..83570f7 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/glow_shroom_branch.json @@ -0,0 +1,7 @@ +{ + "parent": "dynamictrees:item/branch", + "textures": { + "bark": "quark:block/glow_shroom_stem", + "rings": "quark:block/glow_shroom_block_inside" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/glow_shroom_seed.json b/src/generated/resources/assets/dtquark/models/item/glow_shroom_seed.json new file mode 100644 index 0000000..3315cda --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/glow_shroom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/glow_shroom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/serene_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/serene_blossom_seed.json new file mode 100644 index 0000000..a2b7349 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/serene_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/serene_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/sunny_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/sunny_blossom_seed.json new file mode 100644 index 0000000..78adb95 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/sunny_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/sunny_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/warm_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/warm_blossom_seed.json new file mode 100644 index 0000000..a6da830 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/warm_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/warm_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_modifiers/replaceancientseed.json b/src/generated/resources/data/dtquark/loot_modifiers/replaceancientseed.json new file mode 100644 index 0000000..d93eba4 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_modifiers/replaceancientseed.json @@ -0,0 +1,16 @@ +{ + "type": "dtquark:replace_item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:gameplay/sniffer_digging" + } + ] + } + ], + "old_item": "quark:ancient_sapling", + "new_item": "dtquark:ancient_seed" +} diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/ancient_fruit.json b/src/generated/resources/data/dtquark/loot_table/blocks/ancient_fruit.json new file mode 100644 index 0000000..f050b52 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/ancient_fruit.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "dtquark:ancient_fruit", + "condition": "minecraft:block_state_property", + "properties": { + "age": "3" + } + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:ancient_fruit" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/ancient_fruit" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/ancient_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/ancient_leaves.json new file mode 100644 index 0000000..fd01092 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/ancient_leaves.json @@ -0,0 +1,184 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "block_pool", + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:ancient_leaves" + } + ], + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ] + }, + { + "name": "stick_pool", + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 2.0 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": ["minecraft:shears"] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { "min": 1 } + } + ] + } + } + } + ] + } + } + ] + }, + { + "name": "fruit_pool", + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:ancient_fruit", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.015, + 0.03, + 0.045, + 0.06 + ] + } + ], + "functions": [ + { "function": "minecraft:explosion_decay" } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { "condition": "minecraft:match_tool", "predicate": { "items": ["minecraft:shears"] } }, + { "condition": "minecraft:match_tool", "predicate": { "predicates": { "minecraft:enchantments": [ { "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } } ] } } } + ] + } + } + ] + }, + { + "name": "seed_pool", + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "dtquark:ancient_seed", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.10, + 0.12, + 0.15, + 0.20 + ] + } + ], + "functions": [ + { "function": "minecraft:explosion_decay" } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { "condition": "minecraft:match_tool", "predicate": { "items": ["minecraft:shears"] } }, + { "condition": "minecraft:match_tool", "predicate": { "predicates": { "minecraft:enchantments": [ { "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } } ] } } } + ] + } + } + ] + } + ], + "random_sequence": "dtquark:blocks/ancient_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/azalea_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/azalea_leaves.json new file mode 100644 index 0000000..3de911f --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/azalea_leaves.json @@ -0,0 +1,137 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "minecraft:azalea_leaves" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.05, + 0.0625, + 0.083333336, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "name": "minecraft:azalea" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/fiery_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/fiery_blossom_leaves.json new file mode 100644 index 0000000..002a7ad --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/fiery_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:red_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/fiery_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/frosty_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/frosty_blossom_leaves.json new file mode 100644 index 0000000..cfa63bb --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/frosty_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:blue_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/frosty_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap.json b/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap.json new file mode 100644 index 0000000..ddfa7f7 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "quark:glow_shroom_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "type": "minecraft:item", + "name": "dtquark:glow_shroom_seed", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 2.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap_center.json b/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap_center.json new file mode 100644 index 0000000..12420ec --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap_center.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "quark:glow_shroom_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "type": "minecraft:item", + "name": "dtquark:glow_shroom_seed", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 2.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/serene_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/serene_blossom_leaves.json new file mode 100644 index 0000000..ee9bee3 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/serene_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:lavender_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/serene_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/sunny_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/sunny_blossom_leaves.json new file mode 100644 index 0000000..6dc2e80 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/sunny_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:yellow_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/sunny_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/warm_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/warm_blossom_leaves.json new file mode 100644 index 0000000..c5af080 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/warm_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:orange_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/warm_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/ancient.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/ancient.json new file mode 100644 index 0000000..1447089 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/ancient.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:ancient_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/ancient" +} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/branches/blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/azalea.json similarity index 73% rename from src/main/resources/data/dtquark/loot_tables/trees/branches/blossom.json rename to src/generated/resources/data/dtquark/loot_table/trees/branches/azalea.json index be5ca25..741a8b8 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/branches/blossom.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/azalea.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:branches", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,12 +14,13 @@ "function": "minecraft:explosion_decay" } ], - "name": "minecraft:spruce_log" + "name": "quark:azalea_log" } - ] + ], + "rolls": 1.0 }, { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -33,7 +34,9 @@ ], "name": "minecraft:stick" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/branches/azalea" } \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/blossom.json new file mode 100644 index 0000000..4948d6c --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/blossom.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:blossom_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/glow_shroom.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/glow_shroom.json new file mode 100644 index 0000000..617706b --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/glow_shroom.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:glow_shroom_stem", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 2.0, + "max": 5.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ], + "random_sequence": "dtquark:trees/branches/glow_shroom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_ancient.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_ancient.json new file mode 100644 index 0000000..b3f12fa --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_ancient.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:stripped_ancient_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/stripped_ancient" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_azalea.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_azalea.json new file mode 100644 index 0000000..b526409 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_azalea.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:stripped_azalea_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/stripped_azalea" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_blossom.json new file mode 100644 index 0000000..212d2b6 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_blossom.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:stripped_blossom_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/stripped_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/ancient.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/ancient.json new file mode 100644 index 0000000..34f6e67 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/ancient.json @@ -0,0 +1,156 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "seed_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "dtquark:ancient_seed", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.025, + 0.05, + 0.075, + 0.10 + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": ["minecraft:shears"] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { "min": 1 } + } + ] + } + } + } + ] + } + } + ] + }, + { + "name": "fruit_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:ancient_fruit", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.025, + 0.05, + 0.075, + 0.10 + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": ["minecraft:shears"] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { "min": 1 } + } + ] + } + } + } + ] + } + } + ] + }, + { + "name": "stick_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 2.0 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.075, + 0.10, + 0.125, + 0.15, + 0.175 + ] + } + ] + } + ] + } + ], + "random_sequence": "dtquark:trees/leaves/ancient" +} diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/fiery_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/fiery_blossom.json new file mode 100644 index 0000000..ed315cb --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/fiery_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/fiery_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/frosty_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/frosty_blossom.json new file mode 100644 index 0000000..3be8e34 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/frosty_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/frosty_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/serene_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/serene_blossom.json new file mode 100644 index 0000000..eb8faeb --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/serene_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/serene_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/sunny_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/sunny_blossom.json new file mode 100644 index 0000000..2ec62a7 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/sunny_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/sunny_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/warm_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/warm_blossom.json new file mode 100644 index 0000000..24dd85b --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/warm_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/warm_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/mushroom_caps/glow_shroom.json b/src/generated/resources/data/dtquark/loot_table/trees/mushroom_caps/glow_shroom.json new file mode 100644 index 0000000..8e31e26 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/mushroom_caps/glow_shroom.json @@ -0,0 +1,59 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "chances": [ + 0.2, + 0.2333333, + 0.2666666, + 0.3 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "quark:glow_shroom_block" + }, + { + "type": "minecraft:item", + "name": "dtquark:glow_shroom_seed" + } + ] + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/mushroom_caps/glow_shroom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/voluntary/ancient.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/ancient.json new file mode 100644 index 0000000..6a15686 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/ancient.json @@ -0,0 +1,45 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "seed_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "dtquark:ancient_seed", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.40 + } + ] + } + ] + }, + { + "name": "fruit_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:ancient_fruit", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.25 + } + ] + } + ] + } + ], + "random_sequence": "dtquark:trees/voluntary/ancient" +} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/fiery.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/fiery_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/fiery.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/fiery_blossom.json index 7fbb2ba..cfb0272 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/fiery.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/fiery_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:fiery_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/fiery_blossom" } \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/frosty.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/frosty_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/frosty.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/frosty_blossom.json index ad4d034..199b505 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/frosty.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/frosty_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:frosty_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/frosty_blossom" } \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/voluntary/glow_shroom.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/glow_shroom.json new file mode 100644 index 0000000..2ca0789 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/glow_shroom.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "dynamictrees:voluntary_seed_drop_chance", + "rarity": 1.0 + } + ], + "name": "dtquark:glow_shroom_seed" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/voluntary/glow_shroom" +} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/serene.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/serene_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/serene.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/serene_blossom.json index 24aa6ef..cd14688 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/serene.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/serene_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:serene_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/serene_blossom" } \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sunny.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/sunny_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/sunny.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/sunny_blossom.json index 28a459b..167a8ba 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sunny.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/sunny_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:sunny_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/sunny_blossom" } \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/warm.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/warm_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/warm.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/warm_blossom.json index d5833c6..1f0a385 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/warm.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/warm_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:warm_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/warm_blossom" } \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/neoforge/biome_modifier/add_glimmering_weald_shrooms.json b/src/generated/resources/data/dtquark/neoforge/biome_modifier/add_glimmering_weald_shrooms.json new file mode 100644 index 0000000..6847a38 --- /dev/null +++ b/src/generated/resources/data/dtquark/neoforge/biome_modifier/add_glimmering_weald_shrooms.json @@ -0,0 +1,12 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "dynamictreesplus" + } + ], + "type": "neoforge:add_features", + "biomes": "quark:glimmering_weald", + "features": "dtquark:dynamic_glow_shrooms", + "step": "underground_decoration" +} diff --git a/src/generated/resources/data/dtquark/tags/block/stone_like.json b/src/generated/resources/data/dtquark/tags/block/stone_like.json new file mode 100644 index 0000000..6c58dbe --- /dev/null +++ b/src/generated/resources/data/dtquark/tags/block/stone_like.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:deepslate", + "minecraft:cobbled_deepslate", + "minecraft:reinforced_deepslate", + "minecraft:tuff" + ] +} diff --git a/src/generated/resources/data/dtquark/worldgen/configured_feature/patch_dynamic_glow_shroom.json b/src/generated/resources/data/dtquark/worldgen/configured_feature/patch_dynamic_glow_shroom.json new file mode 100644 index 0000000..f3bb908 --- /dev/null +++ b/src/generated/resources/data/dtquark/worldgen/configured_feature/patch_dynamic_glow_shroom.json @@ -0,0 +1,47 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "dynamictreesplus" + } + ], + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "dtquark:glow_shroom_sapling" + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:would_survive", + "state": { + "Name": "dtquark:glow_shroom_sapling" + } + } + ] + } + } + ] + }, + "tries": 60, + "xz_spread": 7, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/worldgen/placed_feature/dynamic_glow_shrooms.json b/src/generated/resources/data/dtquark/worldgen/placed_feature/dynamic_glow_shrooms.json new file mode 100644 index 0000000..1512eca --- /dev/null +++ b/src/generated/resources/data/dtquark/worldgen/placed_feature/dynamic_glow_shrooms.json @@ -0,0 +1,50 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "dynamictreesplus" + } + ], + "feature": "dtquark:patch_dynamic_glow_shroom", + "placement": [ + { + "count": 60, + "type": "minecraft:count" + }, + { + "type": "minecraft:in_square" + }, + { + "height": { + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "absolute": 256 + }, + "type": "minecraft:uniform" + }, + "type": "minecraft:height_range" + }, + { + "direction_of_search": "down", + "target_condition": { + "type": "minecraft:solid" + }, + "allowed_search_condition": { + "blocks": "minecraft:air", + "type": "minecraft:matching_blocks" + }, + "max_steps": 12, + "type": "minecraft:environment_scan" + }, + { + "xz_spread": 0, + "y_spread": 1, + "type": "minecraft:random_offset" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json new file mode 100644 index 0000000..bdc35e4 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json @@ -0,0 +1,7 @@ +{ + "values": [ + "dtquark:ancient_branch", + "dtquark:azalea_branch", + "dtquark:blossom_branch" + ] +} diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/deepslate_like.json b/src/generated/resources/data/dynamictrees/tags/blocks/deepslate_like.json new file mode 100644 index 0000000..ae575e4 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/deepslate_like.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#c:deepslate_ores", + "minecraft:deepslate" + ] +} diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/fungus_branches.json b/src/generated/resources/data/dynamictrees/tags/blocks/fungus_branches.json new file mode 100644 index 0000000..56dfe6d --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/fungus_branches.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "dtquark:glow_shroom_branch", + "required": false + } + ] +} diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/fungus_caps.json b/src/generated/resources/data/dynamictrees/tags/blocks/fungus_caps.json new file mode 100644 index 0000000..1de0943 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/fungus_caps.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "dtquark:glow_shroom_cap", + "required": false + } + ] +} diff --git a/src/main/resources/data/dynamictrees/tags/blocks/leaves.json b/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json similarity index 71% rename from src/main/resources/data/dynamictrees/tags/blocks/leaves.json rename to src/generated/resources/data/dynamictrees/tags/blocks/leaves.json index 6319157..c646f4c 100644 --- a/src/main/resources/data/dynamictrees/tags/blocks/leaves.json +++ b/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json @@ -1,10 +1,10 @@ { - "replace": false, "values": [ + "dtquark:ancient_leaves", "dtquark:fiery_blossom_leaves", "dtquark:frosty_blossom_leaves", "dtquark:serene_blossom_leaves", "dtquark:sunny_blossom_leaves", - "dtquark:sweet_blossom_leaves" + "dtquark:warm_blossom_leaves" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/dynamictrees/tags/blocks/saplings.json b/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json similarity index 71% rename from src/main/resources/data/dynamictrees/tags/blocks/saplings.json rename to src/generated/resources/data/dynamictrees/tags/blocks/saplings.json index e9e143e..e1e0e59 100644 --- a/src/main/resources/data/dynamictrees/tags/blocks/saplings.json +++ b/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json @@ -1,10 +1,10 @@ { - "replace": false, "values": [ + "dtquark:ancient_sapling", "dtquark:fiery_blossom_sapling", "dtquark:frosty_blossom_sapling", "dtquark:serene_blossom_sapling", "dtquark:sunny_blossom_sapling", - "dtquark:sweet_blossom_sapling" + "dtquark:warm_blossom_sapling" ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/stone_like.json b/src/generated/resources/data/dynamictrees/tags/blocks/stone_like.json new file mode 100644 index 0000000..ffffd33 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/stone_like.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:stone", + "minecraft:andesite", + "minecraft:granite", + "minecraft:diorite", + "minecraft:deepslate" + ] +} diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json new file mode 100644 index 0000000..b20813d --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json @@ -0,0 +1,7 @@ +{ + "values": [ + "dtquark:stripped_ancient_branch", + "dtquark:stripped_azalea_branch", + "dtquark:stripped_blossom_branch" + ] +} diff --git a/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json new file mode 100644 index 0000000..9291561 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json @@ -0,0 +1,7 @@ +{ + "values": [ + "dtquark:ancient_branch", + "dtquark:azalea_branch", + "dtquark:blossom_branch" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/items/fungus_branches.json b/src/generated/resources/data/dynamictrees/tags/items/fungus_branches.json new file mode 100644 index 0000000..c48b447 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/items/fungus_branches.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "dtquark:glow_shroom_branch", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/items/fungus_caps.json b/src/generated/resources/data/dynamictrees/tags/items/fungus_caps.json new file mode 100644 index 0000000..09c0a5a --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/items/fungus_caps.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "dtquark:glow_shroom_seed", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/tags/items/seeds.json b/src/generated/resources/data/dynamictrees/tags/items/seeds.json similarity index 72% rename from src/main/resources/data/dynamictrees/tags/items/seeds.json rename to src/generated/resources/data/dynamictrees/tags/items/seeds.json index 507798d..f23033a 100644 --- a/src/main/resources/data/dynamictrees/tags/items/seeds.json +++ b/src/generated/resources/data/dynamictrees/tags/items/seeds.json @@ -1,10 +1,10 @@ { - "replace": false, "values": [ + "dtquark:ancient_seed", "dtquark:fiery_blossom_seed", "dtquark:frosty_blossom_seed", "dtquark:serene_blossom_seed", "dtquark:sunny_blossom_seed", - "dtquark:sweet_blossom_seed" + "dtquark:warm_blossom_seed" ] } \ No newline at end of file diff --git a/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 0000000..169d4e7 --- /dev/null +++ b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "entries": [ + "dtquark:replaceancientseed" + ] +} diff --git a/src/generated/resources/data/quark/loot_table/blocks/glow_shroom_block.json b/src/generated/resources/data/quark/loot_table/blocks/glow_shroom_block.json new file mode 100644 index 0000000..12420ec --- /dev/null +++ b/src/generated/resources/data/quark/loot_table/blocks/glow_shroom_block.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "quark:glow_shroom_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "type": "minecraft:item", + "name": "dtquark:glow_shroom_seed", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 2.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/java/maxhyper/dtquark/BlossomLeavesProperties.java b/src/main/java/maxhyper/dtquark/BlossomLeavesProperties.java index 203f95f..e0baf8e 100644 --- a/src/main/java/maxhyper/dtquark/BlossomLeavesProperties.java +++ b/src/main/java/maxhyper/dtquark/BlossomLeavesProperties.java @@ -1,19 +1,22 @@ package maxhyper.dtquark; -import com.ferreusveritas.dynamictrees.api.registry.TypedRegistry; -import com.ferreusveritas.dynamictrees.blocks.leaves.DynamicLeavesBlock; -import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.BlockState; -import net.minecraft.particles.BlockParticleData; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import com.dtteam.dynamictrees.api.registry.TypedRegistry; +import com.dtteam.dynamictrees.block.leaves.DynamicLeavesBlock; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.BlockParticleOption; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; +import org.jetbrains.annotations.NotNull; +import org.violetmoon.quark.content.world.module.BlossomTreesModule; -import java.util.Random; +import javax.annotation.Nonnull; public class BlossomLeavesProperties extends LeavesProperties { @@ -24,17 +27,19 @@ public BlossomLeavesProperties(ResourceLocation registryName) { } @Override - protected DynamicLeavesBlock createDynamicLeaves(AbstractBlock.Properties properties) { - return new DynamicLeavesBlock(this, properties){ + @Nonnull + protected DynamicLeavesBlock createDynamicLeaves(@Nonnull BlockBehaviour.Properties properties) { + return new DynamicLeavesBlock(this, properties) { @Override @OnlyIn(Dist.CLIENT) - public void animateTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) { - if (worldIn.isEmptyBlock(pos.below()) && rand.nextInt(5) == 0) { - double windStrength = 5.0D + Math.cos((double)worldIn.getGameTime() / 2000.0D) * 2.0D; - double windX = Math.cos((double)worldIn.getGameTime() / 1200.0D) * windStrength; - double windZ = Math.sin((double)worldIn.getGameTime() / 1000.0D) * windStrength; - worldIn.addParticle(new BlockParticleData(ParticleTypes.BLOCK, stateIn), (double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, (double)pos.getZ() + 0.5D, windX, -1.0D, windZ); + public void animateTick(@NotNull BlockState stateIn, Level worldIn, BlockPos pos, @NotNull RandomSource rand) { + if (BlossomTreesModule.dropLeafParticles && rand.nextInt(5) == 0 && worldIn.isEmptyBlock(pos.below())) { + double windStrength = 5.0 + Math.cos((double)worldIn.getGameTime() / 2000.0) * 2.0; + double windX = Math.cos((double)worldIn.getGameTime() / 1200.0) * windStrength; + double windZ = Math.sin((double)worldIn.getGameTime() / 1000.0) * windStrength; + worldIn.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, stateIn), (double)pos.getX() + 0.5, pos.getY(), (double)pos.getZ() + 0.5, windX, -1.0, windZ); } + super.animateTick(stateIn, worldIn, pos, rand); } }; } diff --git a/src/main/java/maxhyper/dtquark/DTQuarkPlusRegistries.java b/src/main/java/maxhyper/dtquark/DTQuarkPlusRegistries.java new file mode 100644 index 0000000..b1999a5 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/DTQuarkPlusRegistries.java @@ -0,0 +1,25 @@ +package maxhyper.dtquark; + +import com.dtteam.dynamictrees.event.TypeRegistryEvent; +import net.minecraft.resources.ResourceLocation; +import net.neoforged.bus.api.SubscribeEvent; + + + +public class DTQuarkPlusRegistries { + + @SubscribeEvent + public static void registerCapPropertiesTypes(final TypeRegistryEvent event) { + if (event.isEntryOfType(com.dtteam.dynamictreesplus.block.mushroom.CapProperties.class)) { + event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "glow_shroom"), maxhyper.dtquark.mushroom.GlowShroomCapProperties.TYPE); + } + } + + @SubscribeEvent + public static void registerSpeciesTypes(final TypeRegistryEvent event) { + if (event.isEntryOfType(com.dtteam.dynamictrees.tree.species.Species.class)) { + event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "glow_shroom"), maxhyper.dtquark.mushroom.GlowShroomSpecies.TYPE); + } + } + +} diff --git a/src/main/java/maxhyper/dtquark/DTQuarkRegistries.java b/src/main/java/maxhyper/dtquark/DTQuarkRegistries.java index 55a10ac..9961fa8 100644 --- a/src/main/java/maxhyper/dtquark/DTQuarkRegistries.java +++ b/src/main/java/maxhyper/dtquark/DTQuarkRegistries.java @@ -1,26 +1,64 @@ package maxhyper.dtquark; -import com.ferreusveritas.dynamictrees.api.registry.TypeRegistryEvent; -import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import maxhyper.dtquark.blocks.SlabSoilProperties; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD) +import com.dtteam.dynamictrees.api.cell.CellKit; +import com.dtteam.dynamictrees.api.registry.Registry; +import com.dtteam.dynamictrees.event.RegistryEvent; +import com.dtteam.dynamictrees.event.TypeRegistryEvent; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; +import com.dtteam.dynamictrees.block.CommonVoxelShapes; +import maxhyper.dtquark.cell.DTQuarkCellKits; +import maxhyper.dtquark.growthlogic.DTQuarkGrowthLogicKits; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.common.Mod; + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) public class DTQuarkRegistries { + public static final VoxelShape ANCIENT_FRUIT_AGE0 = Block.box(7D, 12D, 7D, 9D, 16D, 9D); + public static final VoxelShape ANCIENT_FRUIT_AGE1 = Block.box(6D, 10D, 6D, 10D, 16D, 10D); + public static final VoxelShape ANCIENT_FRUIT_AGE2 = Block.box(5D, 8D, 5D, 11D, 16D, 11D); + public static final VoxelShape ANCIENT_FRUIT_AGE3 = Block.box(4D, 6D, 4D, 12D, 16D, 12D); + + public static final VoxelShape SHROOM_AGE0 = Shapes.create(0, 0, 0, 1, 0.75, 1); + 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 void setup() { + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "ancient_fruit_age0").toString(), ANCIENT_FRUIT_AGE0); + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "ancient_fruit_age1").toString(), ANCIENT_FRUIT_AGE1); + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "ancient_fruit_age2").toString(), ANCIENT_FRUIT_AGE2); + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "ancient_fruit_age3").toString(), ANCIENT_FRUIT_AGE3); + + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "glow_shroom_age0").toString(), SHROOM_AGE0); + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "round_short_mushroom").toString(), ROUND_SHORT_MUSHROOM); + } + + @SubscribeEvent + public static void registerLeavesPropertiesTypes(final TypeRegistryEvent event) { + if (event.isEntryOfType(LeavesProperties.class)) { + event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "blossom"), BlossomLeavesProperties.TYPE); + } + } + + @SubscribeEvent - public static void registerLeavesPropertiesTypes (final TypeRegistryEvent event) { - event.registerType(new ResourceLocation(DynamicTreesQuark.MOD_ID, "blossom"), BlossomLeavesProperties.TYPE); + public static void registerCellKits(final RegistryEvent event) { + if (event.isEntryOfType(CellKit.class)) { + DTQuarkCellKits.register(event.getRegistry()); + } } @SubscribeEvent - public static void registerSoilPropertiesTypes(final TypeRegistryEvent event) { - event.registerType(new ResourceLocation(DynamicTreesQuark.MOD_ID, "slab"), SlabSoilProperties.TYPE_HOR); - event.registerType(new ResourceLocation(DynamicTreesQuark.MOD_ID, "vertical_slab"), SlabSoilProperties.TYPE_VER); - event.registerType(new ResourceLocation(DynamicTreesQuark.MOD_ID, "stairs"), SlabSoilProperties.TYPE_STA); + public static void registerGrowthLogicKits(final RegistryEvent event) { + if (event.isEntryOfType(GrowthLogicKit.class)) { + DTQuarkGrowthLogicKits.register(event.getRegistry()); + } } } diff --git a/src/main/java/maxhyper/dtquark/DynamicTreesQuark.java b/src/main/java/maxhyper/dtquark/DynamicTreesQuark.java index b4e86a4..9b664d0 100644 --- a/src/main/java/maxhyper/dtquark/DynamicTreesQuark.java +++ b/src/main/java/maxhyper/dtquark/DynamicTreesQuark.java @@ -1,59 +1,84 @@ package maxhyper.dtquark; -import com.ferreusveritas.dynamictrees.api.GatherDataHelper; -import com.ferreusveritas.dynamictrees.api.registry.RegistryHandler; -import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import com.ferreusveritas.dynamictrees.resources.Resources; -import com.ferreusveritas.dynamictrees.trees.Family; -import com.ferreusveritas.dynamictrees.trees.Species; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import vazkii.quark.base.module.config.type.CompoundBiomeConfig; -import vazkii.quark.content.world.config.BlossomTreeConfig; -import vazkii.quark.content.world.module.BlossomTreesModule; +import com.dtteam.dynamictrees.data.GatherDataHelper; +import com.dtteam.dynamictrees.api.registry.RegistryHandler; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import com.dtteam.dynamictrees.block.soil.SoilProperties; +import com.dtteam.dynamictrees.block.fruit.Fruit; +import com.dtteam.dynamictrees.tree.family.Family; +import com.dtteam.dynamictrees.tree.species.Species; +import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; +import com.dtteam.dynamictrees.registry.NeoForgeRegistryHandler; +import maxhyper.dtquark.loot.LootModifiers; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.data.event.GatherDataEvent; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModList; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; +import org.violetmoon.zeta.config.type.CompoundBiomeConfig; +import org.violetmoon.quark.content.world.module.BlossomTreesModule; // The value here should match an entry in the META-INF/mods.toml file @Mod(DynamicTreesQuark.MOD_ID) -public class DynamicTreesQuark -{ +public class DynamicTreesQuark { public static final String MOD_ID = "dtquark"; - public DynamicTreesQuark() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + public DynamicTreesQuark(IEventBus modEventBus) { + modEventBus.addListener(this::clientSetup); modEventBus.addListener(this::commonSetup); - //modEventBus.addListener(this::clientSetup); modEventBus.addListener(this::gatherData); - MinecraftForge.EVENT_BUS.register(this); + if (ModList.get().isLoaded("dynamictreesplus")){ + modEventBus.register(DTQuarkPlusRegistries.class); + } + + + LootModifiers.register(modEventBus); + + NeoForgeRegistryHandler.setup(MOD_ID, modEventBus); + DTQuarkRegistries.setup(); + } + + private void clientSetup(final FMLClientSetupEvent event) { - RegistryHandler.setup(MOD_ID); } private void commonSetup(final FMLCommonSetupEvent event) { - for (BlossomTreeConfig config : BlossomTreesModule.trees.values()){ - config.biomeConfig = CompoundBiomeConfig.fromBiomeTypes(false); + // DTQuarkRegistries.setup(); // Removed this line as per instruction + + for (BlossomTreesModule.BlossomTree tree : BlossomTreesModule.blossomTrees) { + tree.quarkConfig.biomeConfig = CompoundBiomeConfig.fromBiomeTags(false); } } + - private void clientSetup(final FMLClientSetupEvent event) { - // do something that can only be done on the client + private void gatherData(final GatherDataEvent event) { + if (ModList.get().isLoaded("dynamictreesplus")) { + GatherDataHelper.gatherAllData(MOD_ID, event, + SoilProperties.REGISTRY, + Family.REGISTRY, + Species.REGISTRY, + Fruit.REGISTRY, + LeavesProperties.REGISTRY, + CapProperties.REGISTRY); + } else { + GatherDataHelper.gatherAllData(MOD_ID, event, + SoilProperties.REGISTRY, + Family.REGISTRY, + Species.REGISTRY, + Fruit.REGISTRY, + LeavesProperties.REGISTRY); + } } - public void gatherData(final GatherDataEvent event) { - GatherDataHelper.gatherAllData( - MOD_ID, - event, - SoilProperties.REGISTRY, - Family.REGISTRY, - Species.REGISTRY, - LeavesProperties.REGISTRY - ); + public static ResourceLocation location(final String path) { + return ResourceLocation.fromNamespaceAndPath(MOD_ID, path); } } diff --git a/src/main/java/maxhyper/dtquark/PlusRegistries.java b/src/main/java/maxhyper/dtquark/PlusRegistries.java new file mode 100644 index 0000000..e88eb5e --- /dev/null +++ b/src/main/java/maxhyper/dtquark/PlusRegistries.java @@ -0,0 +1,51 @@ +package maxhyper.dtquark; + +import com.dtteam.dynamictrees.event.RegistryEvent; +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 maxhyper.dtquark.mushroom.GlowShroomCapProperties; +import maxhyper.dtquark.mushroom.GlowShroomSpecies; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.neoforged.bus.api.SubscribeEvent; +import net.minecraft.core.registries.BuiltInRegistries; + +public class PlusRegistries { + + public static final FeatureCanceller MUSHROOM_CANCELLER = new MushroomFeatureCanceller<>(DynamicTreesQuark.location("mushroom"), null){ + @Override + public boolean shouldCancel(ConfiguredFeature configuredFeature, BiomePropertySelectors.NormalFeatureCancellation featureCancellations) { + final ResourceLocation featureName = BuiltInRegistries.FEATURE.getKey(configuredFeature.feature()); + if (featureName == null) { + return false; + } + return featureCancellations.shouldCancelNamespace(featureName.getNamespace()) && featureName.getPath().equals("glow_shrooms"); + } + }; + + @SubscribeEvent + public static void onFeatureCancellerRegistry(final 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(DynamicTreesQuark.location("glow_shroom"), GlowShroomCapProperties.TYPE); + } + } + + @SubscribeEvent + public static void registerSpeciesType(final TypeRegistryEvent event) { + if (event.isEntryOfType(Species.class)) { + event.registerType(DynamicTreesQuark.location("glow_shroom"), GlowShroomSpecies.TYPE); + } + } + +} diff --git a/src/main/java/maxhyper/dtquark/blocks/SlabRootyBlock.java b/src/main/java/maxhyper/dtquark/blocks/SlabRootyBlock.java deleted file mode 100644 index a3c9e6a..0000000 --- a/src/main/java/maxhyper/dtquark/blocks/SlabRootyBlock.java +++ /dev/null @@ -1,81 +0,0 @@ -package maxhyper.dtquark.blocks; - -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.RootyBlock; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.IWaterLoggable; -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.FluidState; -import net.minecraft.fluid.Fluids; -import net.minecraft.pathfinding.PathType; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.state.properties.SlabType; -import net.minecraft.tags.FluidTags; -import net.minecraft.util.Direction; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; - -public class SlabRootyBlock extends RootyBlock implements IWaterLoggable { - - public enum SlabTypeNoBottom implements IStringSerializable { - TOP("top"), - DOUBLE("double"); - private final String name; - SlabTypeNoBottom(String name) { - this.name = name; - } - public String toString() { - return this.name; - } - public String getSerializedName() { - return this.name; - } - } - public static final EnumProperty TYPE = EnumProperty.create("type", SlabTypeNoBottom.class); - public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; - - public SlabRootyBlock(SoilProperties properties, Properties blockProperties) { - super(properties, blockProperties); - - registerDefaultState(defaultBlockState().setValue(TYPE, SlabTypeNoBottom.TOP).setValue(WATERLOGGED, false)); - } - - @Override - protected void createBlockStateDefinition(StateContainer.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(TYPE).add(WATERLOGGED); - } - - public FluidState getFluidState(BlockState blockState) { - return blockState.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(blockState); - } - - public boolean placeLiquid(IWorld world, BlockPos pos, BlockState blockState, FluidState fluidState) { - return blockState.getValue(TYPE) != SlabTypeNoBottom.DOUBLE && IWaterLoggable.super.placeLiquid(world, pos, blockState, fluidState); - } - - public boolean canPlaceLiquid(IBlockReader world, BlockPos pos, BlockState blockState, Fluid fluid) { - return blockState.getValue(TYPE) != SlabTypeNoBottom.DOUBLE && IWaterLoggable.super.canPlaceLiquid(world, pos, blockState, fluid); - } - - public BlockState updateShape(BlockState state, Direction from, BlockState fromState, IWorld world, BlockPos pos, BlockPos fromPos) { - if (state.getValue(WATERLOGGED)) { - world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); - } - - return super.updateShape(state, from, fromState, world, pos, fromPos); - } - - public boolean isPathfindable(BlockState state, IBlockReader world, BlockPos pos, PathType pathType) { - if (pathType == PathType.WATER) - return world.getFluidState(pos).is(FluidTags.WATER); - return false; - } - -} diff --git a/src/main/java/maxhyper/dtquark/blocks/SlabSoilProperties.java b/src/main/java/maxhyper/dtquark/blocks/SlabSoilProperties.java deleted file mode 100644 index 28f332e..0000000 --- a/src/main/java/maxhyper/dtquark/blocks/SlabSoilProperties.java +++ /dev/null @@ -1,106 +0,0 @@ -package maxhyper.dtquark.blocks; - -import com.ferreusveritas.dynamictrees.api.registry.TypedRegistry; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.RootyBlock; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.BlockState; -import net.minecraft.block.SlabBlock; -import net.minecraft.block.StairsBlock; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.properties.Half; -import net.minecraft.state.properties.SlabType; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; -import vazkii.quark.content.building.block.VerticalSlabBlock; - -public class SlabSoilProperties extends SoilProperties { - - public static final TypedRegistry.EntryType TYPE_HOR = TypedRegistry.newType((r)->new SlabSoilProperties(r, BlockType.HORIZONTAL)); - public static final TypedRegistry.EntryType TYPE_VER = TypedRegistry.newType((r)->new SlabSoilProperties(r, BlockType.VERTICAL)); - public static final TypedRegistry.EntryType TYPE_STA = TypedRegistry.newType((r)->new SlabSoilProperties(r, BlockType.STAIRS)); - - private enum BlockType { - VERTICAL, - HORIZONTAL, - STAIRS - } - private final BlockType slabType; - public SlabSoilProperties(final ResourceLocation registryName, BlockType type) { - super(registryName); - this.slabType = type; - } - - protected RootyBlock createBlock(AbstractBlock.Properties blockProperties) { - switch (slabType){ - case HORIZONTAL: - return new SlabRootyBlock(this, blockProperties); - case STAIRS: - return new StairsRootyBlock(this, blockProperties); - default: - case VERTICAL: - return new RootyBlock(this, blockProperties); - } - } - - @Override - public boolean isValidState(BlockState primitiveSoilState) { - switch (slabType){ - default: - case HORIZONTAL: - if (primitiveSoilState.hasProperty(SlabBlock.TYPE)){ - return primitiveSoilState.getValue(SlabBlock.TYPE) == SlabType.TOP || - primitiveSoilState.getValue(SlabBlock.TYPE) == SlabType.DOUBLE; - } - break; - case VERTICAL: - if (primitiveSoilState.hasProperty(VerticalSlabBlock.TYPE)){ - return primitiveSoilState.getValue(VerticalSlabBlock.TYPE) == VerticalSlabBlock.VerticalSlabType.DOUBLE; - } - break; - case STAIRS: - if (primitiveSoilState.hasProperty(StairsBlock.HALF)){ - return primitiveSoilState.getValue(StairsBlock.HALF) == Half.TOP; - } - } - return super.isValidState(primitiveSoilState); - } - - @Override - public BlockState getSoilState(BlockState primitiveSoilState, int fertility, boolean requireTileEntity) { - BlockState state = super.getSoilState(primitiveSoilState, fertility, requireTileEntity); - switch (slabType){ - case HORIZONTAL: - return state.setValue(SlabRootyBlock.TYPE, SlabRootyBlock.SlabTypeNoBottom.valueOf(primitiveSoilState.getValue(SlabBlock.TYPE).toString().toUpperCase())).setValue(SlabRootyBlock.WATERLOGGED, primitiveSoilState.getValue(SlabBlock.WATERLOGGED)); - case STAIRS: - return state.setValue(StairsRootyBlock.FACING, primitiveSoilState.getValue(StairsBlock.FACING)).setValue(StairsRootyBlock.WATERLOGGED, primitiveSoilState.getValue(StairsBlock.WATERLOGGED)); - default: - case VERTICAL: - return state; - } - } - - @Override - public BlockState getPrimitiveSoilState(BlockState currentSoilState) { - BlockState primitiveSoilState = super.getPrimitiveSoilState(currentSoilState); - switch (slabType){ - default: - case HORIZONTAL: - if (primitiveSoilState.hasProperty(SlabBlock.TYPE)){ - return primitiveSoilState.setValue(SlabBlock.TYPE, SlabType.valueOf(currentSoilState.getValue(SlabRootyBlock.TYPE).toString().toUpperCase())).setValue(SlabBlock.WATERLOGGED, currentSoilState.getValue(SlabRootyBlock.WATERLOGGED)); - } - break; - case VERTICAL: - if (primitiveSoilState.hasProperty(VerticalSlabBlock.TYPE)){ - return primitiveSoilState.setValue(VerticalSlabBlock.TYPE, VerticalSlabBlock.VerticalSlabType.DOUBLE); - } - break; - case STAIRS: - if (primitiveSoilState.hasProperty(StairsBlock.HALF) && primitiveSoilState.hasProperty(StairsBlock.FACING)){ - return primitiveSoilState.setValue(StairsBlock.HALF, Half.TOP).setValue(StairsBlock.FACING, currentSoilState.getValue(StairsRootyBlock.FACING)).setValue(StairsBlock.WATERLOGGED, currentSoilState.getValue(StairsRootyBlock.WATERLOGGED)); - } - } - - return primitiveSoilState; - } -} \ No newline at end of file diff --git a/src/main/java/maxhyper/dtquark/blocks/StairsRootyBlock.java b/src/main/java/maxhyper/dtquark/blocks/StairsRootyBlock.java deleted file mode 100644 index 1966c8a..0000000 --- a/src/main/java/maxhyper/dtquark/blocks/StairsRootyBlock.java +++ /dev/null @@ -1,52 +0,0 @@ -package maxhyper.dtquark.blocks; - -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.RootyBlock; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalBlock; -import net.minecraft.block.IWaterLoggable; -import net.minecraft.fluid.FluidState; -import net.minecraft.fluid.Fluids; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Direction; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; - -public class StairsRootyBlock extends RootyBlock implements IWaterLoggable { - - public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; - public static final DirectionProperty FACING = HorizontalBlock.FACING; - - public StairsRootyBlock(SoilProperties properties, Properties blockProperties) { - super(properties, blockProperties); - - registerDefaultState(defaultBlockState().setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, false)); - } - - @Override - protected void createBlockStateDefinition(StateContainer.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(FACING).add(WATERLOGGED); - } - - @Override - public BlockState updateShape(BlockState state, Direction from, BlockState fromState, IWorld world, BlockPos pos, BlockPos fromPos) { - if (state.getValue(WATERLOGGED)) { - world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); - } - - return super.updateShape(state, from, fromState, world, pos, fromPos); - } - - @Override - public FluidState getFluidState(BlockState blockState) { - return blockState.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(blockState); - } - -} diff --git a/src/main/java/maxhyper/dtquark/cell/AncientLeafCell.java b/src/main/java/maxhyper/dtquark/cell/AncientLeafCell.java new file mode 100644 index 0000000..9d9749b --- /dev/null +++ b/src/main/java/maxhyper/dtquark/cell/AncientLeafCell.java @@ -0,0 +1,47 @@ +package maxhyper.dtquark.cell; + +import com.dtteam.dynamictrees.systems.cell.MatrixCell; +import com.dtteam.dynamictrees.api.voxmap.SimpleVoxmap; +import net.minecraft.core.BlockPos; + +public class AncientLeafCell extends MatrixCell { + + public static final SimpleVoxmap LEAF_CLUSTER = new SimpleVoxmap(5, 3, 5, new byte[]{ + + // Layer 0 (Bottom) + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 1, 1, 1, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, + + // Layer 1 (Middle) + 0, 0, 1, 0, 0, + 0, 1, 2, 1, 0, + 1, 2, 0, 2, 1, + 0, 1, 2, 1, 0, + 0, 0, 1, 0, 0, + + // Layer 2 (Top) + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 1, 1, 1, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0 + + }).setCenter(new BlockPos(2, 1, 2)); + + static final byte[] VAL_MAP = { + 0, 1, 2, 0, 2, 0, 0, 0, //D Maps * -> 0 + 0, 1, 2, 2, 4, 0, 0, 0, //U Maps 3 -> 2, 4 -> 4, * -> * + 0, 1, 2, 0, 2, 0, 0, 0, //N Maps 3 -> 0, 4 -> 2, * -> * + 0, 1, 2, 0, 2, 0, 0, 0, //S Maps 3 -> 0, 4 -> 2, * -> * + 0, 1, 2, 0, 2, 0, 0, 0, //W Maps 3 -> 0, 4 -> 2, * -> * + 0, 1, 2, 0, 2, 0, 0, 0 //E Maps 3 -> 0, 4 -> 2, * -> * + }; + + public AncientLeafCell(int value) { + super(value, VAL_MAP); + } + +} diff --git a/src/main/java/maxhyper/dtquark/cell/DTQuarkCellKits.java b/src/main/java/maxhyper/dtquark/cell/DTQuarkCellKits.java new file mode 100644 index 0000000..df06e83 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/cell/DTQuarkCellKits.java @@ -0,0 +1,72 @@ +package maxhyper.dtquark.cell; + +import com.dtteam.dynamictrees.api.cell.Cell; +import com.dtteam.dynamictrees.api.cell.CellKit; +import com.dtteam.dynamictrees.api.cell.CellNull; +import com.dtteam.dynamictrees.api.cell.CellSolver; +import com.dtteam.dynamictrees.api.registry.Registry; +import com.dtteam.dynamictrees.systems.cell.CellKits; +import com.dtteam.dynamictrees.systems.cell.ConiferBranchCell; +import com.dtteam.dynamictrees.systems.cell.ConiferTopBranchCell; +import com.dtteam.dynamictrees.systems.cell.MetadataCell; +import com.dtteam.dynamictrees.api.voxmap.SimpleVoxmap; +import maxhyper.dtquark.DynamicTreesQuark; + +public class DTQuarkCellKits { + + public static final CellKit ANCIENT = new CellKit(DynamicTreesQuark.location("ancient")) { + + private final Cell branchCell = new ConiferBranchCell(); + private final Cell topBranchCell = new ConiferTopBranchCell(); + + private final Cell[] leafCells = { + CellNull.NULL_CELL, + new AncientLeafCell(1), + new AncientLeafCell(2), + new AncientLeafCell(3), + new AncientLeafCell(4), + new AncientLeafCell(5), + new AncientLeafCell(6), + new AncientLeafCell(7) + }; + + private final CellKits.BasicSolver solver = new com.dtteam.dynamictrees.systems.cell.CellKits.BasicSolver(new short[]{0x0514, 0x0413, 0x0312, 0x0211}); + + @Override + public Cell getCellForLeaves(int hydro) { + return leafCells[hydro]; + } + + @Override + public Cell getCellForBranch(int radius, int meta) { + if (meta == MetadataCell.TOP_BRANCH) { + return topBranchCell; + } else if (radius == 1) { + return branchCell; + } else { + return CellNull.NULL_CELL; + } + } + + @Override + public SimpleVoxmap getLeafCluster() { + return AncientLeafCell.LEAF_CLUSTER; + } + + @Override + public CellSolver getCellSolver() { + return solver; + } + + @Override + public int getDefaultHydration() { + return 4; + } + + }; + + public static void register(Registry registry) { + registry.register(ANCIENT); + } + +} diff --git a/src/main/java/maxhyper/dtquark/growthlogic/AncientLogic.java b/src/main/java/maxhyper/dtquark/growthlogic/AncientLogic.java new file mode 100644 index 0000000..4fcd53e --- /dev/null +++ b/src/main/java/maxhyper/dtquark/growthlogic/AncientLogic.java @@ -0,0 +1,104 @@ +package maxhyper.dtquark.growthlogic; + +import com.dtteam.dynamictrees.api.configuration.ConfigurationProperty; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKitConfiguration; +import com.dtteam.dynamictrees.systems.growthlogic.context.DirectionManipulationContext; +import com.dtteam.dynamictrees.systems.growthlogic.context.DirectionSelectionContext; +import com.dtteam.dynamictrees.systems.growthlogic.context.PositionalSpeciesContext; +import com.dtteam.dynamictrees.systems.GrowSignal; +import com.dtteam.dynamictrees.utility.CoordUtils; +import net.minecraft.core.Direction; +import net.minecraft.resources.ResourceLocation; + +public class AncientLogic extends GrowthLogicKit { + + public static final ConfigurationProperty MIN_BRANCH_GAP = ConfigurationProperty.integer("min_branch_gap"); + public static final ConfigurationProperty MAX_BRANCH_GAP = ConfigurationProperty.integer("max_branch_gap"); + public static final ConfigurationProperty BRANCH_HEIGHT_VARIATION = + ConfigurationProperty.integer("branch_height_variation"); + public AncientLogic(ResourceLocation registryName) { + super(registryName); + } + public static final ConfigurationProperty SIDE_BRANCH_ENERGY = ConfigurationProperty.integer("side_branch_energy"); + + @Override + protected GrowthLogicKitConfiguration createDefaultConfiguration() { + return super.createDefaultConfiguration() + .with(MIN_BRANCH_GAP, 4) + .with(MAX_BRANCH_GAP, 6) + .with(BRANCH_HEIGHT_VARIATION, 3) + .with(HEIGHT_VARIATION, 10) + .with(SIDE_BRANCH_ENERGY, 4); + } + + @Override + protected void registerProperties() { + register(MIN_BRANCH_GAP, MAX_BRANCH_GAP, BRANCH_HEIGHT_VARIATION, GrowthLogicKit.HEIGHT_VARIATION, SIDE_BRANCH_ENERGY); + } + + @Override + public Direction selectNewDirection(GrowthLogicKitConfiguration configuration, DirectionSelectionContext context) { + Direction newDir = super.selectNewDirection(configuration, context); + GrowSignal signal = context.signal(); + if (signal.isInTrunk() && newDir != Direction.UP) { + signal.energy = Math.min(configuration.get(SIDE_BRANCH_ENERGY), signal.energy); + } + return newDir; + } + + @Override + public int[] populateDirectionProbabilityMap(GrowthLogicKitConfiguration configuration, DirectionManipulationContext context) { + int[] probMap = super.populateDirectionProbabilityMap(configuration, context); + GrowSignal signal = context.signal(); + Direction travelDir = signal.dir; + + if (signal.isInTrunk()) { + // Vertical gap between branches, unique for each tree in range + int minGap = configuration.get(MIN_BRANCH_GAP); + int maxGap = configuration.get(MAX_BRANCH_GAP); + int gap = minGap + (CoordUtils.coordHashCode(signal.rootPos, 0) % (maxGap - minGap + 1)); + // Disable/enable horizontal movement if we're not currently in a gap + probMap[2] = probMap[3] = probMap[4] = probMap[5] = ((int)signal.energy) % gap == 0 ? 3 : 0; + } else { + probMap[0] = probMap[1] = 0; + int deltaXAbs = Math.abs(signal.delta.getX()); + int deltaZAbs = Math.abs(signal.delta.getZ()); + //Disable going straight when we are just turning out so the other branches don't get blocked + if (deltaXAbs == 1 ^ deltaZAbs == 1){ // ^ is XOR + probMap[2] = probMap[3] = probMap[4] = probMap[5] = 0; + probMap[travelDir.ordinal()] = 2; + } + //Disable forward after a bit so the canopy isnt too pointy +// if (deltaXAbs == 2 ^ deltaZAbs == 2){ +// probMap[travelDir.ordinal()] = 0; +// } + } + + // Down always disabled for ancient trees + probMap[Direction.DOWN.get3DDataValue()] = 0; + // Direction we came from always disabled + probMap[travelDir.getOpposite().ordinal()] = 0; + + return probMap; + } + + @Override + public float getEnergy(GrowthLogicKitConfiguration configuration, PositionalSpeciesContext context) { + return super.getEnergy(configuration, context) * context.species().biomeSuitability(context.level(), context.pos()) + + getHashVariation(configuration, context); // Vary the height energy by a psuedorandom hash function + } + + @Override + public int getLowestBranchHeight(GrowthLogicKitConfiguration configuration, PositionalSpeciesContext context) { + return (int)(super.getLowestBranchHeight(configuration, context) + + getHashVariation(configuration, context) % configuration.get(BRANCH_HEIGHT_VARIATION)); + } + + protected float getHashVariation (GrowthLogicKitConfiguration configuration, PositionalSpeciesContext context){ + long day = context.level().getGameTime() / 24000L; + int month = (int) day / 30;//Change the hashs every in-game month + + return (CoordUtils.coordHashCode(context.pos().above(month), 2) % configuration.get(GrowthLogicKit.HEIGHT_VARIATION)); + } +} diff --git a/src/main/java/maxhyper/dtquark/growthlogic/DTQuarkGrowthLogicKits.java b/src/main/java/maxhyper/dtquark/growthlogic/DTQuarkGrowthLogicKits.java new file mode 100644 index 0000000..d33cd30 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/growthlogic/DTQuarkGrowthLogicKits.java @@ -0,0 +1,15 @@ +package maxhyper.dtquark.growthlogic; + +import com.dtteam.dynamictrees.api.registry.Registry; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; +import maxhyper.dtquark.DynamicTreesQuark; + +public class DTQuarkGrowthLogicKits { + + public static final GrowthLogicKit ANCIENT = new AncientLogic(DynamicTreesQuark.location("ancient")); + + public static void register(Registry registry) { + registry.register(ANCIENT); + } + +} diff --git a/src/main/java/maxhyper/dtquark/loot/LootModifiers.java b/src/main/java/maxhyper/dtquark/loot/LootModifiers.java new file mode 100644 index 0000000..48f5094 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/loot/LootModifiers.java @@ -0,0 +1,22 @@ +package maxhyper.dtquark.loot; + +import com.mojang.serialization.MapCodec; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.common.loot.IGlobalLootModifier; +import net.neoforged.neoforge.registries.NeoForgeRegistries; +import net.neoforged.neoforge.registries.DeferredHolder; + +import static maxhyper.dtquark.DynamicTreesQuark.MOD_ID; + +public class LootModifiers { + public static final DeferredRegister> LOOT_MODIFIER_SERIALIZERS = + DeferredRegister.create(NeoForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, MOD_ID); + + public static final DeferredHolder, MapCodec> REPLACE_ITEM = + LOOT_MODIFIER_SERIALIZERS.register("replace_item", ReplaceItemModifier.CODEC); + + public static void register(IEventBus bus) { + LOOT_MODIFIER_SERIALIZERS.register(bus); + } +} \ No newline at end of file diff --git a/src/main/java/maxhyper/dtquark/loot/ReplaceItemModifier.java b/src/main/java/maxhyper/dtquark/loot/ReplaceItemModifier.java new file mode 100644 index 0000000..1fb543d --- /dev/null +++ b/src/main/java/maxhyper/dtquark/loot/ReplaceItemModifier.java @@ -0,0 +1,44 @@ +package maxhyper.dtquark.loot; + +import com.google.common.base.Suppliers; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.neoforged.neoforge.common.loot.IGlobalLootModifier; +import net.neoforged.neoforge.common.loot.LootModifier; +import net.minecraft.core.registries.BuiltInRegistries; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Supplier; + +public class ReplaceItemModifier extends LootModifier { + public static final Supplier> CODEC = Suppliers.memoize(() + -> RecordCodecBuilder.mapCodec(inst -> codecStart(inst) + .and(BuiltInRegistries.ITEM.byNameCodec().fieldOf("old_item").forGetter(m -> m.old_item)) + .and(BuiltInRegistries.ITEM.byNameCodec().fieldOf("new_item").forGetter(m -> m.new_item)) + .apply(inst, ReplaceItemModifier::new))); + private final Item old_item; + private final Item new_item; + + protected ReplaceItemModifier(LootItemCondition[] conditionsIn, Item oldItem, Item newItem) { + super(conditionsIn); + this.old_item = oldItem; + this.new_item = newItem; + } + + @Override + protected @NotNull ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { + generatedLoot.replaceAll(itemStack -> itemStack.getItem().equals(old_item) ? new ItemStack(new_item) : itemStack); + return generatedLoot; + } + + @Override + public MapCodec codec() { + return CODEC.get(); + } +} diff --git a/src/main/java/maxhyper/dtquark/mushroom/GlowShroomCapProperties.java b/src/main/java/maxhyper/dtquark/mushroom/GlowShroomCapProperties.java new file mode 100644 index 0000000..7738afb --- /dev/null +++ b/src/main/java/maxhyper/dtquark/mushroom/GlowShroomCapProperties.java @@ -0,0 +1,38 @@ +package maxhyper.dtquark.mushroom; + +import com.dtteam.dynamictrees.api.registry.TypedRegistry; +import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.phys.Vec3; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; + +import java.util.Random; + +public class GlowShroomCapProperties extends CapProperties { + + public static final TypedRegistry.EntryType TYPE = TypedRegistry.newType(GlowShroomCapProperties::new); + + public GlowShroomCapProperties(ResourceLocation registryName) { + super(registryName); + } + + public ParticleOptions sporeParticleType(BlockState state, Level level, BlockPos pos, RandomSource random) { + return ParticleTypes.END_ROD; + } + + public Vec3 sporeParticleSpeed(BlockState state, Level level, BlockPos pos, RandomSource random) { + return new Vec3(0, -0.05 - random.nextDouble() * 0.05, 0); + } + + @Override + public BlockBehaviour.Properties getDefaultBlockProperties() { + return super.getDefaultBlockProperties().emissiveRendering((a,b,c)->true).hasPostProcess((a,b,c)->true); + } +} diff --git a/src/main/java/maxhyper/dtquark/mushroom/GlowShroomSpecies.java b/src/main/java/maxhyper/dtquark/mushroom/GlowShroomSpecies.java new file mode 100644 index 0000000..da1ecf5 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/mushroom/GlowShroomSpecies.java @@ -0,0 +1,50 @@ +package maxhyper.dtquark.mushroom; + +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 maxhyper.dtquark.DynamicTreesQuark; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.NotNull; + +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 10; + } + @Override + public void animateTick(@NotNull BlockState stateIn, @NotNull Level worldIn, @NotNull BlockPos pos, @NotNull RandomSource rand) { + super.animateTick(stateIn, worldIn, pos, rand); + if (rand.nextInt(12) == 0 && worldIn.getBlockState(pos.above()).isAir()) { + worldIn.addParticle(ParticleTypes.END_ROD, (double)pos.getX() + 0.4 + rand.nextDouble() * 0.2, (double)pos.getY() + 0.5 + rand.nextDouble() * 0.1, (double)pos.getZ() + 0.4 + rand.nextDouble() * 0.2, (rand.nextDouble() - 0.5) * 0.04, (1.0 + rand.nextDouble()) * 0.02, (rand.nextDouble() - 0.5) * 0.04); + } + } + })); + } + + @Override + public ResourceLocation getSaplingSmartModelLocation() { + return DynamicTreesQuark.location("block/glow_shroom"); + } + +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/neoforge.mods.toml similarity index 51% rename from src/main/resources/META-INF/mods.toml rename to src/main/resources/META-INF/neoforge.mods.toml index 49ac4ac..1aff557 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[36,37)" +loaderVersion="[4,)" license="MIT" issueTrackerURL="https://github.com/DynamicTreesTeam/DynamicTrees-Quark/issues" @@ -7,45 +7,36 @@ issueTrackerURL="https://github.com/DynamicTreesTeam/DynamicTrees-Quark/issues" modId="dtquark" version="${file.jarVersion}" displayName="Dynamic Trees for Quark" - -updateJSONURL="https://github.com/DynamicTreesTeam/DynamicTreesVersionInfo/blob/master/Add-ons/Quark.json?raw=true" -displayURL="https://www.curseforge.com/minecraft/mc-mods/dynamic-trees-quark" - -authors="Max Hyper" #optional +logoFile="dtquark_logo.png" +authors="Max Hyper, Violet Moon" description=''' -Compatibility Mod between Dynamic trees and Quark +Compatibility Mod between Dynamic Trees and Quark for NeoForge 1.21.1 ''' + [[dependencies.dtquark]] - modId="forge" + modId="neoforge" mandatory=true - versionRange="[36,37)" + versionRange="[21.1,)" ordering="NONE" side="BOTH" [[dependencies.dtquark]] modId="minecraft" mandatory=true - versionRange="[1.16.4,1.17)" + versionRange="[1.21.1]" ordering="NONE" side="BOTH" [[dependencies.dtquark]] modId="dynamictrees" mandatory=true - versionRange="[0.10.0,)" - ordering="AFTER" - side="BOTH" - -[[dependencies.dtquark]] - modId="dynamictreesplus" - mandatory=false - versionRange="[0.1.0,)" + versionRange="[1.1.0,)" ordering="AFTER" side="BOTH" [[dependencies.dtquark]] modId="quark" mandatory=true - versionRange="[r2.4-312,)" + versionRange="[4.1,)" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/assets/dtquark/blockstates/blossom_branch.json b/src/main/resources/assets/dtquark/blockstates/blossom_branch.json deleted file mode 100644 index 8a1893c..0000000 --- a/src/main/resources/assets/dtquark/blockstates/blossom_branch.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dynamictrees:block/spruce_branch" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json deleted file mode 100644 index 8a94b34..0000000 --- a/src/main/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/red_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json deleted file mode 100644 index 29b247a..0000000 --- a/src/main/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/fiery" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json deleted file mode 100644 index 2abbaf2..0000000 --- a/src/main/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/blue_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json deleted file mode 100644 index 58bcc34..0000000 --- a/src/main/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/frosty" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_glowcelium.json b/src/main/resources/assets/dtquark/blockstates/rooty_glowcelium.json deleted file mode 100644 index 7c12d5b..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_glowcelium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "quark:block/glowcelium" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_turf.json b/src/main/resources/assets/dtquark/blockstates/rooty_turf.json deleted file mode 100644 index 5597da2..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_turf.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "quark:block/turf" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_turf_slab.json b/src/main/resources/assets/dtquark/blockstates/rooty_turf_slab.json deleted file mode 100644 index 7e49334..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_turf_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "multipart": [ - { - "when": { "type": "top" }, - "apply": { "model": "quark:block/turf_slab_top" } - }, - { - "when": { "type": "top" }, - "apply": { "model": "dtquark:block/roots_slab" } - }, - { - "when": { "type": "double" }, - "apply": { "model": "quark:block/turf" } - }, - { - "when": { "type": "double" }, - "apply": { "model": "dynamictrees:block/roots" } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_turf_stairs.json b/src/main/resources/assets/dtquark/blockstates/rooty_turf_stairs.json deleted file mode 100644 index b3329c3..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_turf_stairs.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "multipart": [ - { - "when": { "facing": "east" }, - "apply": { "model": "quark:block/turf_stairs", "x": 180, "uvlock": true } - }, - { - "when": { "facing": "west" }, - "apply": { "model": "quark:block/turf_stairs", "x": 180, "y": 180, "uvlock": true } - }, - { - "when": { "facing": "south" }, - "apply": { "model": "quark:block/turf_stairs", "x": 180, "y": 90, "uvlock": true } - }, - { - "when": { "facing": "north" }, - "apply": { "model": "quark:block/turf_stairs", "x": 180, "y": 270, "uvlock": true } - }, - - { - "when": { "facing": "east" }, - "apply": { "model": "dtquark:block/roots_stairs", "uvlock": true } - }, - { - "when": { "facing": "west" }, - "apply": { "model": "dtquark:block/roots_stairs", "y": 180, "uvlock": true } - }, - { - "when": { "facing": "south" }, - "apply": { "model": "dtquark:block/roots_stairs", "y": 90, "uvlock": true } - }, - { - "when": { "facing": "north" }, - "apply": { "model": "dtquark:block/roots_stairs", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_turf_vertical_slab.json b/src/main/resources/assets/dtquark/blockstates/rooty_turf_vertical_slab.json deleted file mode 100644 index 5597da2..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_turf_vertical_slab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "quark:block/turf" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} diff --git a/src/main/resources/assets/dtquark/blockstates/serene_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/serene_blossom_leaves.json deleted file mode 100644 index ad0964c..0000000 --- a/src/main/resources/assets/dtquark/blockstates/serene_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/lavender_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/serene_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/serene_blossom_sapling.json deleted file mode 100644 index f8b0027..0000000 --- a/src/main/resources/assets/dtquark/blockstates/serene_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/serene" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/stripped_blossom_branch.json b/src/main/resources/assets/dtquark/blockstates/stripped_blossom_branch.json deleted file mode 100644 index 09d1eae..0000000 --- a/src/main/resources/assets/dtquark/blockstates/stripped_blossom_branch.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dynamictrees:block/spruce_branch_stripped" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json deleted file mode 100644 index b0bb0aa..0000000 --- a/src/main/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/yellow_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json deleted file mode 100644 index 4e03bc8..0000000 --- a/src/main/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/sunny" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/sweet_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/sweet_blossom_leaves.json deleted file mode 100644 index 4d145df..0000000 --- a/src/main/resources/assets/dtquark/blockstates/sweet_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/pink_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/sweet_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/sweet_blossom_sapling.json deleted file mode 100644 index 8c0081e..0000000 --- a/src/main/resources/assets/dtquark/blockstates/sweet_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/sweet" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/warm_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/warm_blossom_leaves.json deleted file mode 100644 index e0863f9..0000000 --- a/src/main/resources/assets/dtquark/blockstates/warm_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/orange_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/warm_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/warm_blossom_sapling.json deleted file mode 100644 index a7cce9b..0000000 --- a/src/main/resources/assets/dtquark/blockstates/warm_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/warm" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/lang/en_us.json b/src/main/resources/assets/dtquark/lang/en_us.json index cda9190..e500e6c 100644 --- a/src/main/resources/assets/dtquark/lang/en_us.json +++ b/src/main/resources/assets/dtquark/lang/en_us.json @@ -1,17 +1,23 @@ { - "block.dtquark.blossom_branch":"Blossom Tree", + "block.dtquark.blossom_branch":"Trumpet Tree", + "block.dtquark.azalea_branch":"Azalea Tree", + "block.dtquark.glow_shroom_branch":"Glow Shroom", + "block.dtquark.ancient_branch":"Ashen Tree", "species.dtquark.fiery_blossom":"Fiery", "species.dtquark.frosty_blossom":"Frosty", "species.dtquark.serene_blossom":"Serene", "species.dtquark.sunny_blossom":"Sunny", - "species.dtquark.sweet_blossom":"Sweet", "species.dtquark.warm_blossom":"Warm", + "species.dtquark.glow_shroom":"Glow Shroom", + "species.dtquark.ancient":"Ashen", - "item.dtquark.fiery_blossom_seed":"Fiery Blossom Pit", - "item.dtquark.frosty_blossom_seed":"Frosty Blossom Pit", - "item.dtquark.serene_blossom_seed":"Serene Blossom Pit", - "item.dtquark.sunny_blossom_seed":"Sunny Blossom Pit", - "item.dtquark.sweet_blossom_seed":"Sweet Blossom Pit", - "item.dtquark.warm_blossom_seed":"Warm Blossom Pit" -} \ No newline at end of file + "item.dtquark.fiery_blossom_seed":"Fiery Trumpet Pit", + "item.dtquark.frosty_blossom_seed":"Frosty Trumpet Pit", + "item.dtquark.serene_blossom_seed":"Serene Trumpet Pit", + "item.dtquark.sunny_blossom_seed":"Sunny Trumpet Pit", + "item.dtquark.warm_blossom_seed":"Warm Trumpet Pit", + "item.dtquark.glow_shroom_seed":"Glow Shroom Cap", + "item.dtquark.ancient_seed":"Ashen Seeds", + "item.dtquark.azalea_seed": "Azalea Seed" +} diff --git a/src/main/resources/assets/dtquark/models/block/roots_slab.json b/src/main/resources/assets/dtquark/models/block/roots_slab.json deleted file mode 100644 index 6089b80..0000000 --- a/src/main/resources/assets/dtquark/models/block/roots_slab.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "roots": "dynamictrees:block/roots", - "roots_bottom": "dynamictrees:block/roots_bottom", - "particle": "dtquark:block/dirt" - }, - "elements": [ - { - "from": [-0.005, 8, -0.005], - "to": [16.005, 15, 16.005], - "faces": { - "north": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "north", "tintindex": 1}, - "east": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "east", "tintindex": 1}, - "south": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "south", "tintindex": 1}, - "west": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "west", "tintindex": 1} - } - }, - { - "from": [0.8, -8, 8], - "to": [15.2, 8, 8], - "shade": false, - "rotation": {"angle": 45, "axis": "y", "origin": [8, 16, 8], "rescale": true}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1}, - "south": {"uv": [0, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1} - } - }, - { - "from": [8, -8, 0.8], - "to": [8, 8, 15.2], - "shade": false, - "rotation": {"angle": 45, "axis": "y", "origin": [8, 16, 8], "rescale": true}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1}, - "west": {"uv": [0, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/block/roots_stairs.json b/src/main/resources/assets/dtquark/models/block/roots_stairs.json deleted file mode 100644 index c86f0aa..0000000 --- a/src/main/resources/assets/dtquark/models/block/roots_stairs.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "roots": "dynamictrees:block/roots", - "roots_bottom": "dynamictrees:block/roots_bottom", - "particle": "dtquark:block/dirt" - }, - "elements": [ - { - "from": [7.995, 0, -0.005], - "to": [16.005, 15, 16.005], - "faces": { - "north": {"uv": [0, 0, 8, 16], "texture": "#roots", "cullface": "west", "tintindex": 1}, - "east": {"uv": [0, 0, 16, 16], "texture": "#roots", "cullface": "north", "tintindex": 1}, - "south": {"uv": [8, 0, 16, 16], "texture": "#roots", "cullface": "east", "tintindex": 1}, - "west": {"uv": [0, 0, 16, 16], "texture": "#roots", "cullface": "south", "tintindex": 1} - } - }, - { - "from": [-0.005, 8, -0.005], - "to": [8, 15, 16.005], - "faces": { - "north": {"uv": [8, 9, 16, 16], "texture": "#roots", "cullface": "west", "tintindex": 1}, - "south": {"uv": [0, 9, 8, 16], "texture": "#roots", "cullface": "east", "tintindex": 1}, - "west": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "south", "tintindex": 1} - } - }, - { - "from": [8, -8, 8], - "to": [8, 8, 15.2], - "shade": false, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8], "rescale": true}, - "faces": { - "east": {"uv": [0, 0, 8, 16], "texture": "#roots_bottom", "tintindex": 1}, - "west": {"uv": [8, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1} - } - }, - { - "from": [8, -16, 0.8], - "to": [8, 0, 8], - "shade": false, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1}, - "west": {"uv": [0, 0, 8, 16], "texture": "#roots_bottom", "tintindex": 1} - } - }, - { - "from": [0.8, -8, 8], - "to": [8, 8, 8], - "shade": false, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8], "rescale": true}, - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1}, - "south": {"uv": [0, 0, 8, 16], "texture": "#roots_bottom", "tintindex": 1} - } - }, - { - "from": [8, -16, 8], - "to": [15.2, 0, 8], - "shade": false, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, - "faces": { - "north": {"uv": [0, 0, 8, 16], "texture": "#roots_bottom", "tintindex": 1}, - "south": {"uv": [8, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/block/saplings/fiery.json b/src/main/resources/assets/dtquark/models/block/saplings/fiery.json deleted file mode 100644 index 5b6e4ca..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/fiery.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/red_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/red_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/frosty.json b/src/main/resources/assets/dtquark/models/block/saplings/frosty.json deleted file mode 100644 index 2cc2b68..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/frosty.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/blue_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/blue_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/serene.json b/src/main/resources/assets/dtquark/models/block/saplings/serene.json deleted file mode 100644 index a9509a9..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/serene.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/lavender_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/lavender_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/sunny.json b/src/main/resources/assets/dtquark/models/block/saplings/sunny.json deleted file mode 100644 index c2c7946..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/sunny.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/yellow_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/yellow_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/sweet.json b/src/main/resources/assets/dtquark/models/block/saplings/sweet.json deleted file mode 100644 index 8cf7328..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/sweet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/pink_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/pink_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/warm.json b/src/main/resources/assets/dtquark/models/block/saplings/warm.json deleted file mode 100644 index 095f56e..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/warm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/orange_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/orange_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/item/blossom_branch.json b/src/main/resources/assets/dtquark/models/item/blossom_branch.json deleted file mode 100644 index 4678c37..0000000 --- a/src/main/resources/assets/dtquark/models/item/blossom_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "dynamictrees:item/branch", - "textures": { - "bark": "block/spruce_log", - "rings": "block/spruce_log_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/fiery_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/fiery_blossom_seed.json deleted file mode 100644 index 613300a..0000000 --- a/src/main/resources/assets/dtquark/models/item/fiery_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/fiery_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/frosty_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/frosty_blossom_seed.json deleted file mode 100644 index e0fe063..0000000 --- a/src/main/resources/assets/dtquark/models/item/frosty_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/frosty_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/serene_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/serene_blossom_seed.json deleted file mode 100644 index b9cc1a2..0000000 --- a/src/main/resources/assets/dtquark/models/item/serene_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/serene_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/sunny_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/sunny_blossom_seed.json deleted file mode 100644 index ad392a6..0000000 --- a/src/main/resources/assets/dtquark/models/item/sunny_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/sunny_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/sweet_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/sweet_blossom_seed.json deleted file mode 100644 index 0d90131..0000000 --- a/src/main/resources/assets/dtquark/models/item/sweet_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/sweet_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/warm_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/warm_blossom_seed.json deleted file mode 100644 index 9ee9a9d..0000000 --- a/src/main/resources/assets/dtquark/models/item/warm_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/warm_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/textures/block/ancient_fruit.png b/src/main/resources/assets/dtquark/textures/block/ancient_fruit.png new file mode 100644 index 0000000..50adaed Binary files /dev/null and b/src/main/resources/assets/dtquark/textures/block/ancient_fruit.png differ diff --git a/src/main/resources/assets/dtquark/textures/block/ancient_fruit_stem.png b/src/main/resources/assets/dtquark/textures/block/ancient_fruit_stem.png new file mode 100644 index 0000000..e36711b Binary files /dev/null and b/src/main/resources/assets/dtquark/textures/block/ancient_fruit_stem.png differ diff --git a/src/main/resources/assets/dtquark/textures/block/glow_shroom_cap.png b/src/main/resources/assets/dtquark/textures/block/glow_shroom_cap.png new file mode 100644 index 0000000..983f0fa Binary files /dev/null and b/src/main/resources/assets/dtquark/textures/block/glow_shroom_cap.png differ diff --git a/src/main/resources/assets/dtquark/textures/block/glowshroom.png b/src/main/resources/assets/dtquark/textures/block/glowshroom.png deleted file mode 100644 index ddebe54..0000000 Binary files a/src/main/resources/assets/dtquark/textures/block/glowshroom.png and /dev/null differ diff --git a/src/main/resources/assets/dtquark/textures/item/ancient_seed.png b/src/main/resources/assets/dtquark/textures/item/ancient_seed.png new file mode 100644 index 0000000..496da6c Binary files /dev/null and b/src/main/resources/assets/dtquark/textures/item/ancient_seed.png differ diff --git a/src/main/resources/assets/dtquark/textures/item/fiery_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/fiery_blossom_seed.png index 1fc9ab3..3a68906 100644 Binary files a/src/main/resources/assets/dtquark/textures/item/fiery_blossom_seed.png and b/src/main/resources/assets/dtquark/textures/item/fiery_blossom_seed.png differ diff --git a/src/main/resources/assets/dtquark/textures/item/frosty_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/frosty_blossom_seed.png index 87e678b..0230237 100644 Binary files a/src/main/resources/assets/dtquark/textures/item/frosty_blossom_seed.png and b/src/main/resources/assets/dtquark/textures/item/frosty_blossom_seed.png differ diff --git a/src/main/resources/assets/dtquark/textures/item/glow_shroom_seed.png b/src/main/resources/assets/dtquark/textures/item/glow_shroom_seed.png new file mode 100644 index 0000000..caeb8cf Binary files /dev/null and b/src/main/resources/assets/dtquark/textures/item/glow_shroom_seed.png differ diff --git a/src/main/resources/assets/dtquark/textures/item/glowshroom_seed.png b/src/main/resources/assets/dtquark/textures/item/glowshroom_seed.png deleted file mode 100644 index bfaba07..0000000 Binary files a/src/main/resources/assets/dtquark/textures/item/glowshroom_seed.png and /dev/null differ diff --git a/src/main/resources/assets/dtquark/textures/item/serene_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/serene_blossom_seed.png index b2f4607..8881aa6 100644 Binary files a/src/main/resources/assets/dtquark/textures/item/serene_blossom_seed.png and b/src/main/resources/assets/dtquark/textures/item/serene_blossom_seed.png differ diff --git a/src/main/resources/assets/dtquark/textures/item/sunny_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/sunny_blossom_seed.png index 60b7984..46d5367 100644 Binary files a/src/main/resources/assets/dtquark/textures/item/sunny_blossom_seed.png and b/src/main/resources/assets/dtquark/textures/item/sunny_blossom_seed.png differ diff --git a/src/main/resources/assets/dtquark/textures/item/sweet_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/sweet_blossom_seed.png deleted file mode 100644 index 90f0b64..0000000 Binary files a/src/main/resources/assets/dtquark/textures/item/sweet_blossom_seed.png and /dev/null differ diff --git a/src/main/resources/assets/dtquark/textures/item/warm_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/warm_blossom_seed.png index bbbc6d9..b81dd00 100644 Binary files a/src/main/resources/assets/dtquark/textures/item/warm_blossom_seed.png and b/src/main/resources/assets/dtquark/textures/item/warm_blossom_seed.png differ diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json deleted file mode 100644 index a200106..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "minecraft:shears" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "quark:red_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json deleted file mode 100644 index ae0587b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "minecraft:shears" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "quark:blue_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/serene_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/serene_blossom_leaves.json deleted file mode 100644 index e9dd6d4..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/serene_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "minecraft:shears" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "quark:lavender_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json deleted file mode 100644 index ecd222e..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "minecraft:shears" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "quark:yellow_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/sweet_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/sweet_blossom_leaves.json deleted file mode 100644 index 83062b5..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/sweet_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "minecraft:shears" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "quark:pink_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/warm_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/warm_blossom_leaves.json deleted file mode 100644 index 150574c..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/warm_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "minecraft:shears" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "quark:orange_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/fiery_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/fiery_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/fiery_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/frosty_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/frosty_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/frosty_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/serene_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/serene_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/serene_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/sunny_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/sunny_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/sunny_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/sweet_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/sweet_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/sweet_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/warm_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/warm_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/warm_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sweet.json b/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sweet.json deleted file mode 100644 index a232c50..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sweet.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "dynamictrees:voluntary", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "dynamictrees:voluntary_seed_drop_chance", - "rarity": 1.0 - } - ], - "name": "dtquark:sweet_blossom_seed" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/patchouli_books/guide/book.json b/src/main/resources/data/dtquark/patchouli_books/guide/book.json deleted file mode 100644 index a62d8e8..0000000 --- a/src/main/resources/data/dtquark/patchouli_books/guide/book.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extend": "dynamictrees:guide" -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/patchouli_books/guide/en_us/entries/trees/blossom_trees.json b/src/main/resources/data/dtquark/patchouli_books/guide/en_us/entries/trees/blossom_trees.json deleted file mode 100644 index 952918f..0000000 --- a/src/main/resources/data/dtquark/patchouli_books/guide/en_us/entries/trees/blossom_trees.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "Blossom Trees", - "icon": "dtquark:sweet_blossom_seed", - "category": "trees", - "sortnum": "6", - "pages": [ - { - "type": "text", - "title": "Blossom Trees", - "text": "Blossom trees are an elusive tree species that can be found in many variants across the world. By default, you will find blossom trees in the following locations:$(br)- Frosty in cold biomes$(br)- Serene in swamp biomes$(br)- Warm in savanna biomes$(br)- Sweet in mountain biomes$(br)- Sunny in plains biomes$(br)- Fiery in mesa biomes" - }, - { - "type": "image", - "images": ["dtquark:textures/patchouli/images/blossom_1.png","dtquark:textures/patchouli/images/blossom_2.png", "dtquark:textures/patchouli/images/blossom_3.png"], - "text": "Examples of blossom trees", - "border": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/tags/blocks/branches_that_burn.json b/src/main/resources/data/dynamictrees/tags/blocks/branches_that_burn.json deleted file mode 100644 index 76dcdc6..0000000 --- a/src/main/resources/data/dynamictrees/tags/blocks/branches_that_burn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "dtquark:blossom_branch" - ] -} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index c79a362..7830cd4 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,6 @@ { "pack": { - "description": "examplemod resources", - "pack_format": 6, - "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods." + "description": "Datapack of Dynamic Trees for Quark", + "pack_format": 34 } } diff --git a/src/main/resources/trees/dtquark/cap_properties/glow_shroom.json b/src/main/resources/trees/dtquark/cap_properties/glow_shroom.json new file mode 100644 index 0000000..fcb1e45 --- /dev/null +++ b/src/main/resources/trees/dtquark/cap_properties/glow_shroom.json @@ -0,0 +1,18 @@ +{ + "only_if_loaded": "dynamictreesplus", + "type": "dtquark:glow_shroom", + "primitive_cap": "quark:glow_shroom_block", + "age_zero_shape": "dtquark:glow_shroom_age0", + "material_color": "DIRT", + "light": 12, + "mushroom_item": "quark:glow_shroom", + "model_overrides": { + "outside_face": "quark:block/glow_shroom_block_side", + "inside_face": "quark:block/glow_shroom_block_inside", + "cap_center_age_0_parent": "dtquark:block/tall_slab" + }, + "texture_overrides": { + "outside_face": "quark:block/glow_shroom_block", + "inside_face": "quark:block/glow_shroom_block_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/families/ancient.json b/src/main/resources/trees/dtquark/families/ancient.json new file mode 100644 index 0000000..0f38f80 --- /dev/null +++ b/src/main/resources/trees/dtquark/families/ancient.json @@ -0,0 +1,14 @@ +{ + "common_leaves": "dtquark:ancient", + "common_species": "dtquark:ancient", + "primitive_log": "quark:ancient_log", + "primitive_stripped_log": "quark:stripped_ancient_log", + "max_branch_radius": 8, + "max_signal_depth": 40, + "texture_overrides": { + "branch": "quark:block/ancient_log", + "branch_top": "quark:block/ancient_log_top", + "stripped_branch": "quark:block/stripped_ancient_log", + "stripped_branch_top": "quark:block/stripped_ancient_log_top" + } +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/families/azalea.json b/src/main/resources/trees/dtquark/families/azalea.json new file mode 100644 index 0000000..df86b1c --- /dev/null +++ b/src/main/resources/trees/dtquark/families/azalea.json @@ -0,0 +1,13 @@ +{ + "common_leaves": "azalea", + "common_species": "dynamictrees:azalea", + "primitive_log": "quark:azalea_log", + "primitive_stripped_log": "quark:stripped_azalea_log", + "max_branch_radius": 8, + "texture_overrides": { + "branch": "quark:block/azalea_log", + "branch_top": "quark:block/azalea_log_top", + "stripped_branch": "quark:block/stripped_azalea_log", + "stripped_branch_top": "quark:block/stripped_azalea_log_top" + } +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/families/blossom.json b/src/main/resources/trees/dtquark/families/blossom.json index e2627ae..0c1939a 100644 --- a/src/main/resources/trees/dtquark/families/blossom.json +++ b/src/main/resources/trees/dtquark/families/blossom.json @@ -1,8 +1,14 @@ { - "common_leaves": "dtquark:sweet_blossom", - "common_species": "dtquark:sweet_blossom", - "primitive_log": "spruce_log", - "primitive_stripped_log": "stripped_spruce_log", + "common_species": "dtquark:frosty_blossom", + "common_leaves": "dtquark:frosty_blossom", + "primitive_log": "quark:blossom_log", + "primitive_stripped_log": "quark:stripped_blossom_log", "stick": "stick", - "max_branch_radius": 8 -} \ No newline at end of file + "max_branch_radius": 8, + "texture_overrides": { + "branch": "quark:block/blossom_log", + "branch_top": "quark:block/blossom_log_top", + "stripped_branch": "quark:block/stripped_blossom_log", + "stripped_branch_top": "quark:block/stripped_blossom_log_top" + } +} diff --git a/src/main/resources/trees/dtquark/families/glow_shroom.json b/src/main/resources/trees/dtquark/families/glow_shroom.json new file mode 100644 index 0000000..41c0ddf --- /dev/null +++ b/src/main/resources/trees/dtquark/families/glow_shroom.json @@ -0,0 +1,13 @@ +{ + "only_if_loaded": "dynamictreesplus", + "type": "dynamictreesplus:mushroom", + "common_cap": "dtquark:glow_shroom", + "common_species": "dtquark:glow_shroom", + "primitive_log": "quark:glow_shroom_stem", + "stick": "air", + "generate_stripped_branch": false, + "texture_overrides": { + "branch": "quark:block/glow_shroom_stem", + "branch_top": "quark:block/glow_shroom_block_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/fruits/ancient_fruit.json b/src/main/resources/trees/dtquark/fruits/ancient_fruit.json new file mode 100644 index 0000000..00f33cc --- /dev/null +++ b/src/main/resources/trees/dtquark/fruits/ancient_fruit.json @@ -0,0 +1,10 @@ +{ + "block_registry_name": "ancient_fruit", + "item_stack": "quark:ancient_fruit", + "block_shapes": [ + "dtquark:ancient_fruit_age0", + "dtquark:ancient_fruit_age1", + "dtquark:ancient_fruit_age2", + "dtquark:ancient_fruit_age3" + ] +} diff --git a/src/main/resources/trees/dtquark/jo_codes/ancient.txt b/src/main/resources/trees/dtquark/jo_codes/ancient.txt new file mode 100644 index 0000000..c0c9b55 --- /dev/null +++ b/src/main/resources/trees/dtquark/jo_codes/ancient.txt @@ -0,0 +1,140 @@ +8:JJOJJxJOJJxJJPz8+fyWXv1q8mfy8+bz9+Sy+vn1ufXky8+bz8+Sy+vn1r8mfn +8:JJJJxJJxJJxJJ+bnyWXv1q8i+bvyWXv1ufy98j+bz+vnyWX18+tz+Xvkz+Xn +8:JJOJJJxJJOJJPy+tz68+bz9+Sy+vntz9+bz+vnyWXn1ufy98mfy8 +8:JJOJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+XnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJJJJxJJxJJxJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz68mfy8 +8:JJJJOJJJxJJOJJJ+bz+vny+t8mXnzefvyWX18+tz98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJOJJxJOJJxJOPzfvzfyS+tz68k+bz9+Sv1ufy98mXnzef18+Sy+vn1ufvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJJOJJOJJOJJOJJPzef18+Sy+vn1ufvkz+XnyWX18+tz+Xvkz+Xnzef18+Sy9+tz+Xvkz8+bz+vnyWX18+ty98mfy8 +8:JJJJxJJxJJxJJ+bz8+Sy+vn1t8mXnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJOJJxJOJJxJPzefnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJJJxJJxJJxJJxJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mXnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJxJJxJJxJJ+bvyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJxJOJJxJOJJ+bfyWXn1ufvkz+Xnzef18+Sy+vn1ufvkz+Xnzef18+Sy9+tz+Xvkz8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJJJxJJxJJxJJxJJ+b9vzd+Sy8+t8nzef18+S18+t8mfy8+bz+vnyWX18+tz+Xvky8 +8:JJJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJOJJJxJJOJJJ+b+SXtfzefnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfn +8:JJxJOJJxJOJJ+bz8+SX1q8mfnz+tz98nzefvyWXn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJxJOJJxJOPzb+X18nzefv1vky8+bz+vnyWX18+tz98mfy8+bz+vnyWX18+tz+Xvkz+Xn +7:JJxJJxJJxJJxJJxPzfyV8+fyX1vk+bfyX1q8mXnzef18+Sy9+tz98mfnzef18+Sy+vn1ufy98mfy8 +7:JJOJJxJOJJxJOJPzfyU+tz98ny+vky8+bvyWXv1r8mXnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+vkz+Xn +7:JJJOJJxJOJJxJJ+fy+vnzef18+S+tz68j+bz8+Sn1r8mfnzef18+Sy+vn1ufy98mfy8 +7:JJJJxJOJJxJOJJyU9+fyV9vz+Sy+vn1ufy98mXnzef18+Sy+vn1ufy98mXnzef18+Sy+vn1ufy98mfy8 +7:JJxJOJJxJOJJ+bny+t8mfXzefn1q8mfy8+bz+vnyWX18+tz+Xvky8+bz+vnyWX18+tz+Xvkz+Xn +7:JJJxJJOJJJxJJPzef18+S18+tfkz8+bz+vnyWX18+ty98mfy8+bnyWXv1ufy98mfy8 +7:JJJJJxJJOJJJ+b+S+tfk+bz+vnyWX18+ty98mfy8 +7:JJJOJJxJOJJxJPzfyV8k+b+SX1ufXkz8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98k +7:JJJxJJOJJJxJJPzefvyWXv1ufvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWXn1ufy98mfy8 +7:JJJOJJOJJOJJOJJPy8j+bz+vnyWX18+ty98mfnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz8 +7:JJJOJJxJOJJxJPzef18+Sy8+tz+Xvkz6+bnyWX18+ty98mfnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +7:JJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +7:JJJJOJJOJJOJJPzef18+Sy+vn1uXvkz6+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +7:JJOJJxJOJJxP18nzb+Sy+vn1uXvk+bz9+Sy9+ty98mfnzef18+Sy8+tz98mfn +7:JJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +7:JJJJxJJxJJxJJxJJ+b+SX1vnzef18+S+tz+Xvknzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz98mfy8 +7:JJJxJJxJJxJJxJJ+bnyS+tfkz6+bntz9+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +7:JJJJOJJJxJJOJJJ+Sy8+t8nzd+S+tz68i+bz+vnyWX18+tz+Xvkz+Xn +7:JJJOJJJxJJOPz+Svnzd+Sy8+tXkz8+bz8+Sy+vn1ufy98mfy8 +7:JJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz8+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +6:JJJJxJJxJJxJJ+bz+vnyWXn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +6:JJJJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy9+tz+Xvkz+Xn +6:JJJJOJJOJJOJJPzb+Sy9+tz68mfnzefvyWXv1ufy98mfy8+b18+Sy+vn1ufy98mfy8 +6:JJJOJJOJJOJJPzevnyWXv1q8mfnzevnyX1uXvkz+Xnzef18+Sy+vn1ufy98mfy8 +6:JJJJJxJJxJJxJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +6:JJJJOJJOJJOJJPzefvyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tXkz+Xn +6:JJJJOJJOJJOJJPzfyS+tz+Xvk+bfyWX18+tz68mfnzef18+Sy+vn1ufy98mfy8 +6:JJJJJxJJOJJJxJJPzfyS+t8nzef18+S18+tz+Xvky8+bz+vnyU+tz98mfy8 +6:JJJJJxJJxJJxJJ+b18+Sy8+tz98mfnzef18+Sy8+tz98mfy8+bz8+Sy+vn1ufy98mfy8 +6:JJJJxJOJJxJOJJ+b+S+t8nzb+Sv1q8mXnzef18+Sy+vn1ufy98mfnzef18+Sy+vn1ufy98mfy8 +6:JJJJxJJxJJxJJ+bvyWXnt+bz8+Sy9+tz+Xvkz8+bz+vnyWX18+tz98mfy8 +6:JJJJJxJJxJJxJJ+fvzfyU+tz98i+bz+vnyWX18+ty98mfn +6:JJJOJJxJOJJxJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+XnzefnyWX18+ty98mfy8+bz+vnyWX18+tz+Xvkz+Xn +6:JJxJOJJxJOJJ+bz9+Sy8+tz98mfy8+Sy+vn1ufvkz8+bz+vnyWXv1ufy98mfnzef18+Sy+vn1ufy98mfn +6:JJJxJJxJJxJJxJJ+bz9+Sn1vk+bz+vnyV+tz+Xvky8+SX1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +6:JJOJJJxJJOJJJxPz9+bz8+SX1uXvkfzefvyWXv1uXvkz+Xnzef18+Sy9+tz+Xvkz+Xn +6:JJJxJJxJJxJPbfzefnyWvn1vkz8+bz+vnyWX18+tz+Xvkz+Xn +6:JJJJxJJxJJxJJ+bfyX1uXvkfzef18+Sy+vn1uXvknzef18+Sy+vn1ufy98mfy8 +6:JJJJOJJOJJOJJPz+XvzevnyWvn1r8mfy8+bz+vnyWXn1uXvkz+Xn +6:JJOJJOJJOJJPzevnyWXv1ufy98mXnzefnyWX18+tz+Xvkz+Xnzef18+Sy8+tz+Xvkz+Xn +5:JJOJJxJOJJxJOJJ+b8nz+X18+bvyWX18+ty98mXnzefnyWX189ufXzef18+Sy+vn1ufy98mfy8 +5:JJJJxJJOJJJxJJPzb+SX1ufXky8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJJJxJOJJxJOJJ+bz+vnyWX18+tz98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJOJJJxJJPzef18+Sy8+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJJJxJOJJxJOJJ+fyX18i+bnyWX18+tz+XvknzefvyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJJJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy9+tz+Xvkz+Xn +5:JJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz8+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJJxJJxJJxJ9+bz+vnyWXv1t8mfnzef18+Sy+vn1ufy98mfy8 +5:JJJJxJOJJxJOJJxJPzef18+Sy+vn1ufy98mXnzef18+Sy+vn1ufvkz+Xnzef18+Sy+vn1ufvknzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJJJxJJxJJxJJxJ8nzc+X1ufvkXzc+Sy+vn1ufvky8+bz8+Sy+vn1ufy98mfn +5:JJJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJOJJxJOJJxJOJ9+X18nzd+Svtvzef18+Sy8+tXkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJOJJOJJOJPz9+bz8+S18+tfnzef18+Sy+vn1ufy98mfy8 +5:JJxJJxJJxJJxPfzfyX1q8mfy8+bfyWX18+tz+XvkXzef18+Sy+vn1ufy98mfn +5:JJJxJJOJJJxJJPzefvyWX18+tvkz8+bz+vnyWXntz9+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJOJJxJOJJxJPyU+vk+b+SXknzef18+Sy+vn1uXvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJOJJOJJOJJPzefvyWXv1ufvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +5:JJOJJOJJOJJPzefvyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJxJOJJxJOJJ+fyX1vkfzefnyWXn1uXvkz6+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +4:JJJJxJOJJxJPz+Xvy+vnzd+Sy+vn1ufy98mfy8 +4:JJJJJJJOJJJxJJPzefvyX1uXvkXzb+Snky8 +4:JJJJOJJOJJOJJPyWXv1vnzc+S18+tz68mfnzefntf +4:JJOJJxJOJJ+fy8+bz8+Sy9+tvkz8+bz9+Sy+vn1ufy98mfy8 +4:JJJJJJJJxJPzef18+Sy9+ty98mfy8 +4:JJJJJJJJOJJJ+bz+vnyWX18+tz+Xvkz+Xn +4:JJJJJOJJOJJPzfyX1r8+bz9+Sy9+tXkz+Xn +4:JJOJJxJOJJy9+X18nzb+Sy99ufy9+bz8+Sy9+t8mfy8 +4:JJJJJJJJJOJJPzef18+Sy9+tz+Xvkz+Xn +4:JJJJJxJJxJJ+bz+vnyX1uXvkz6+bz99ufy9 +4:JJOJJxJOJJxPfzb+Sn1vnzb+Sy8+tfkz8+Sy+vntz+Xv +4:JJOJJJxJJOJJJzfyX18mfnzefvyV+tvkz8+bz+vnyWX18+tz98j+fyX1q8n +4:JJJJJJOJJxJPz+X1q8j+bz+vnyWvn1ufXk +4:JJJJJJJxJJPzef18+Sy+vn1ufy98mfy8 +4:JJJJJJJJJJxJJ+bz+vnyWX18+tz+Xvkz+Xn +4:JJJJJJJJJJxJJ+bz+vnyWX18+tz+Xvkz+Xn +4:JJJxJJxJJxJJxJ+fS+fy8+bz+vnyS+tXknzd9ufy9 +4:JJJJJJJJxJOJJ+bz9+Sn1vkz+Xnzc+Sy+vnty9 +4:JJJJJOJJJxJJPzef18+Sy9+tz+XvknyWXnkz6 +4:JJJJxJJxJJxJPzft+bz9+Sy+vn1ufXkfkn +3:JJJJOJJJxJJOJJJ+bnyV+t8mfXz+S18+tXnf +3:JJJJJJOJJJxJJPz+S+tfkXy9 +3:JJJJJJJJJOJJPzevnyWvn1ufXkz6 +3:JJJxJJOJJJxJJPzfyWvn1ufXkfyV8j8n +3:JJJJJOJJOJJPzc+Sv1ufXkz6+b189 +3:JJJJJJxJJOJJJ+b+S18+vkXz+tfn +3:JJJJJOJJJxJJOfy9vzfyV+tz68nzd+X18n +3:JJJJJJJOJJOJJ+bv1r8j+Sn18mfX +3:JJJJJJJJxJJPzd+S18+tz68mfX +3:JJJJJJJOJJJxJJPzd+Sn1r8nz+S+t8 +3:JJJJJJJJJOJJ+fyWvn18mfX +3:JJJOJJJxJJOJJ+bnyU8nz6+Xt +3:JJJJJOJJxJOJ+X1vny8i7evn +3:JJJJJJJJJJOJJPzevnyV+t8 +3:JJOJJxJOJJPzd+Snvzf18j+Sv1q8j +3:JJJJxJJOJJJxPSvzd+Sv1ufXkz66 +3:JJJJxJOJJxJPvzd+Sv18i+bnkf +3:JJJJJJxJJxJJx+f18nzfyV9vyWvnkX +3:JJJJJOJJOJJOPz8nzevn18nyU8 +3:JJJJJJJJJJJxJJPy+vn +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJxJOJJxJOJJXfz+Xnz+Xvz+X18 +2:JJJJJJJJJJJ +2:JJJJJJJJJx+X18 +2:JJJJJJJJJJJJJ +2:JJJJJJJJJOJ+fv +2:JJJJJJJJJJJP +2:JJJJJJJJJJJxJ+fv +2:JJJJJJJJJJ +2:JJJJJJJJJJP +2:JJJJJJJJJJP +2:JJJJJJJJJJJJJJP +2:JJJJJJJJJJJJ +2:JJJJJJJJJJOJPz+Xn +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJ \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/jo_codes/fiery_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/fiery_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/fiery_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/fiery_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/jo_codes/frosty_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/frosty_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/frosty_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/frosty_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/jo_codes/glow_shroom.txt b/src/main/resources/trees/dtquark/jo_codes/glow_shroom.txt new file mode 100644 index 0000000..6dc661f --- /dev/null +++ b/src/main/resources/trees/dtquark/jo_codes/glow_shroom.txt @@ -0,0 +1,56 @@ +2:JJ +2:JJJ +2:JJP +2:JP +2:JhP +2:JMJ +2:JNP +2:JJh +3:JJ +3:JJJ +3:JJP +3:JP +3:JhP +3:JMJ +3:JNP +3:JJh +4:JJ +4:JJJ +4:JJP +4:JP +4:JhP +4:JMJ +4:JNP +4:JJh +5:JJ +5:JJJ +5:JJP +5:JP +5:JhP +5:JMJ +5:JNP +5:JJh +6:JJ +6:JJJ +6:JJP +6:JP +6:JhP +6:JMJ +6:JNP +6:JJh +7:JJ +7:JJJ +7:JJP +7:JP +7:JhP +7:JMJ +7:JNP +7:JJh +8:JJ +8:JJJ +8:JJP +8:JP +8:JhP +8:JMJ +8:JNP +8:JJh \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/jo_codes/serene_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/serene_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/serene_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/serene_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/jo_codes/sunny_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/sunny_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/sunny_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/sunny_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/jo_codes/sweet_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/sweet_blossom.txt deleted file mode 100644 index f82b005..0000000 --- a/src/main/resources/trees/dtquark/jo_codes/sweet_blossom.txt +++ /dev/null @@ -1,112 +0,0 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/jo_codes/warm_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/warm_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/warm_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/warm_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/leaves_properties/ancient.json b/src/main/resources/trees/dtquark/leaves_properties/ancient.json new file mode 100644 index 0000000..caf0453 --- /dev/null +++ b/src/main/resources/trees/dtquark/leaves_properties/ancient.json @@ -0,0 +1,5 @@ +{ + "primitive_leaves": "quark:ancient_leaves", + "smother": 3, + "cell_kit": "dtquark:ancient" +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/leaves_properties/sweet_blossom.json b/src/main/resources/trees/dtquark/leaves_properties/sweet_blossom.json deleted file mode 100644 index 7cf6db6..0000000 --- a/src/main/resources/trees/dtquark/leaves_properties/sweet_blossom.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "dtquark:blossom", - "primitive_leaves": "quark:pink_blossom_leaves" -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/glowcelium.json b/src/main/resources/trees/dtquark/soil_properties/glowcelium.json deleted file mode 100644 index 2a3c7d9..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/glowcelium.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "primitive_soil": "quark:glowcelium", - "acceptable_soils": [ "dirt_like", "fungus_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/turf.json b/src/main/resources/trees/dtquark/soil_properties/turf.json deleted file mode 100644 index f114a1f..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/turf.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "primitive_soil": "quark:turf", - "acceptable_soils": [ "dirt_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/turf_slab.json b/src/main/resources/trees/dtquark/soil_properties/turf_slab.json deleted file mode 100644 index ea9282d..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/turf_slab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "dtquark:slab", - "slab_type": "horizontal", - "primitive_soil": "quark:turf_slab", - "acceptable_soils": [ "dirt_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/turf_stairs.json b/src/main/resources/trees/dtquark/soil_properties/turf_stairs.json deleted file mode 100644 index a7aa414..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/turf_stairs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "dtquark:stairs", - "primitive_soil": "quark:turf_stairs", - "acceptable_soils": [ "dirt_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/turf_vertical_slab.json b/src/main/resources/trees/dtquark/soil_properties/turf_vertical_slab.json deleted file mode 100644 index 10e52e6..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/turf_vertical_slab.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "dtquark:vertical_slab", - "primitive_soil": "quark:turf_vertical_slab", - "acceptable_soils": [ "dirt_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/ancient.json b/src/main/resources/trees/dtquark/species/ancient.json new file mode 100644 index 0000000..d10addc --- /dev/null +++ b/src/main/resources/trees/dtquark/species/ancient.json @@ -0,0 +1,36 @@ +{ + "family": "dtquark:ancient", + "tapering": 0.3, + "signal_energy": 24.0, + "up_probability": 5, + "lowest_branch_height": 4, + "growth_rate": 0.5, + "soil_longevity": 8, + "world_gen_leaf_map_height": 40, + "generate_seed": true, + "generate_sapling": true, + "growth_logic_kit": "dtquark:ancient", + "leaves_properties": "dtquark:ancient", + "perfect_biomes": { "tag": "#c:is_rare" }, + "drop_creators": [ "log", "voluntary", "harvest" ], + "primitive_saplings": [ + { "sapling_block": "quark:ancient_sapling" }, + { + "sapling_item": "quark:ancient_fruit", + "can_craft_seed_to_sapling": false + } + ], + + "inherit_fruiting_offset_to_fruits": true, + "fruits": [ + "dtquark:ancient_fruit" + ], + "features": [ + { + "name": "fruit", + "properties": { + "fruit": "dtquark:ancient_fruit" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/fiery_blossom.json b/src/main/resources/trees/dtquark/species/fiery_blossom.json index e723d91..17303ab 100644 --- a/src/main/resources/trees/dtquark/species/fiery_blossom.json +++ b/src/main/resources/trees/dtquark/species/fiery_blossom.json @@ -1,18 +1,15 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:fiery_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, - "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 - }, + "preferred_climate": "tropical", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:red_blossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtquark/species/frosty_blossom.json b/src/main/resources/trees/dtquark/species/frosty_blossom.json index 06e24e8..1261ba7 100644 --- a/src/main/resources/trees/dtquark/species/frosty_blossom.json +++ b/src/main/resources/trees/dtquark/species/frosty_blossom.json @@ -1,19 +1,17 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:frosty_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, - "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 - }, + "preferred_climate": "cold", "perfect_biomes": { "types": [ "forest", "overworld" ] }, + "world_gen_acceptable_soils": ["snow_like"], "primitive_sapling": "quark:blue_blossom_sapling", "features" : [ "bee_nest" diff --git a/src/main/resources/trees/dtquark/species/glow_shroom.json b/src/main/resources/trees/dtquark/species/glow_shroom.json new file mode 100644 index 0000000..8b99afd --- /dev/null +++ b/src/main/resources/trees/dtquark/species/glow_shroom.json @@ -0,0 +1,35 @@ +{ + "only_if_loaded": "dynamictreesplus", + "type": "dtquark:glow_shroom", + "family": "dtquark:glow_shroom", + "tapering": 0, + "signal_energy": 4, + "growth_rate": 1.2, + "soil_longevity": 1, + "generate_seed": true, + "generate_sapling": true, + "cap_properties": "dtquark:glow_shroom", + "max_light_for_planting": 16, + "growth_logic_kit": { + "name": "dynamictreesplus:straight", + "properties": { + "height_variation": 4 + } + }, + "mushroom_shape_kit": { + "name": "dynamictreesplus:bell", + "properties": { + "max_age_curve_factor": 0.5, + "min_age_curve_factor": 0.4, + "curve_factor_variation": 0.1, + "pointed_tip_max_age": 1, + "chance_to_age": 0.1, + "max_cap_age": 2 + } + }, + "primitive_sapling": "quark:glow_shroom", + "sapling_shape": "dtquark:round_short_mushroom", + "acceptable_soils": ["fungus_like", "stone_like"], + "features" : [ + ] +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/serene_blossom.json b/src/main/resources/trees/dtquark/species/serene_blossom.json index d96211f..b72fab1 100644 --- a/src/main/resources/trees/dtquark/species/serene_blossom.json +++ b/src/main/resources/trees/dtquark/species/serene_blossom.json @@ -1,18 +1,16 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:serene_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, - "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 - }, + "world_gen_acceptable_soils": ["sand_like", "snow_like"], + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:lavender_blossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtquark/species/sunny_blossom.json b/src/main/resources/trees/dtquark/species/sunny_blossom.json index 5f1099a..4f3f535 100644 --- a/src/main/resources/trees/dtquark/species/sunny_blossom.json +++ b/src/main/resources/trees/dtquark/species/sunny_blossom.json @@ -1,18 +1,16 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:sunny_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, - "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 - }, + "world_gen_acceptable_soils": ["sand_like", "snow_like"], + "preferred_climate": "tropical", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:yellow_blossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtquark/species/sweet_blossom.json b/src/main/resources/trees/dtquark/species/sweet_blossom.json deleted file mode 100644 index 04d8d76..0000000 --- a/src/main/resources/trees/dtquark/species/sweet_blossom.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "family": "dtquark:blossom", - "tapering": 0.3, - "signal_energy": 14.0, - "growth_rate": 0.8, - "leaves_properties": "dtquark:sweet_blossom", - "always_show_on_waila": true, - "generate_seed": true, - "generate_sapling": true, - "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 - }, - "perfect_biomes": { "types": [ "forest", "overworld" ] }, - "primitive_sapling": "quark:pink_blossom_sapling", - "features" : [ - "bee_nest" - ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/warm_blossom.json b/src/main/resources/trees/dtquark/species/warm_blossom.json index d59c054..751c599 100644 --- a/src/main/resources/trees/dtquark/species/warm_blossom.json +++ b/src/main/resources/trees/dtquark/species/warm_blossom.json @@ -1,18 +1,16 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:warm_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, - "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 - }, + "world_gen_acceptable_soils": ["sand_like", "snow_like"], + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:orange_blossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtquark/world_gen/default.json b/src/main/resources/trees/dtquark/world_gen/default.json index a3a848e..338516a 100644 --- a/src/main/resources/trees/dtquark/world_gen/default.json +++ b/src/main/resources/trees/dtquark/world_gen/default.json @@ -1,30 +1,30 @@ [ { - "select": { "type" : "cold" }, + "select": { "tag" : "#c:is_snowy" }, "apply": { "species" : { "method" : "splice_before", "random" : { "dtquark:frosty_blossom" : 1, - "..." : 500 + "..." : 150 } } } }, { - "select": { "type" : "swamp" }, + "select": { "tag" : "#c:is_swamp" }, "apply": { "species" : { "method" : "splice_before", "random" : { "dtquark:serene_blossom" : 1, - "..." : 300 + "..." : 100 } } } }, { - "select": { "type" : "savanna" }, + "select": { "tag" : "#minecraft:is_savanna" }, "apply": { "species" : { "method" : "splice_before", @@ -36,39 +36,37 @@ } }, { - "select": { "type" : "mountain" }, + "select": { "tag" : "#c:is_plains" }, "apply": { "species" : { "method" : "splice_before", "random" : { - "dtquark:sweet_blossom" : 1, - "..." : 100 + "dtquark:sunny_blossom" : 1, + "..." : 25 } } } }, { - "select": { "types" : ["plains", "!savanna"] }, + "select": { "tag" : "#minecraft:is_badlands" }, "apply": { "species" : { "method" : "splice_before", "random" : { - "dtquark:sunny_blossom" : 1, - "..." : 50 + "dtquark:fiery_blossom" : 1, + "..." : 40 } } } }, + { - "select": { "types" : [ "mesa", "sparse" ] }, + "only_if_loaded": "dynamictreesplus", + "select": { "name": "quark:glimmering_weald" }, "apply": { - "species" : { - "method" : "splice_before", - "random" : { - "dtquark:fiery_blossom" : 1, - "..." : 40 - } - } + "species" : "dtquark:glow_shroom", + "density": [ 2 ], + "chance": 0.8 } } -] \ No newline at end of file +] diff --git a/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json b/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json new file mode 100644 index 0000000..bf6e1a2 --- /dev/null +++ b/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json @@ -0,0 +1,19 @@ +[ + { + "only_if_loaded": "dynamictreesplus", + "select": { "name": "quark:glimmering_weald" }, + "cancellers": { + "type": "dynamictrees:fungus", + "namespaces": ["minecraft", "quark"], + "stage": "UNDERGROUND_DECORATION" + } + }, + { + "select": { "name": "__ANY__" }, + "cancellers": { + "type": "tree", + "namespaces": ["minecraft", "quark"], + "trees": ["azalea_tree"] + } + } +] \ No newline at end of file diff --git a/src/main/resources/trees/dynamictrees/species/azalea.json b/src/main/resources/trees/dynamictrees/species/azalea.json new file mode 100644 index 0000000..a024001 --- /dev/null +++ b/src/main/resources/trees/dynamictrees/species/azalea.json @@ -0,0 +1,37 @@ +{ + "family": "dtquark:azalea", + "tapering": 0.4, + "up_probability": 2, + "lowest_branch_height": 0, + "signal_energy": 8.0, + "growth_rate": 0.7, + "soil_longevity": 2, + "generate_seed": true, + "generate_sapling": true, + "growth_logic_kit": "azalea", + "perfect_biomes": { "name": "minecraft:lush_caves" }, + "primitive_saplings": [ + {"sapling_block": "minecraft:azalea", "replace_sapling_when_placed": false}, + {"sapling_block": "minecraft:flowering_azalea", "replace_sapling_when_placed": false} + ], + "force_soil": "rooted_dirt", + "acceptable_soils": ["dirt_like"], + "world_gen_acceptable_soils": ["sand_like", "snow_like", "terracotta_like"], + "features": [ + { + "name": "rot_soil", + "properties": { + "rotten_soil": "podzol" + } + }, + { + "name": "alt_leaves", + "properties": { + "alternative_leaves": "flowering_azalea", + "place_chance": 0.35 + } + }, + "mushroom_rot", + "root_system" + ] +} \ No newline at end of file