diff --git a/.gitignore b/.gitignore index 6019df58..514dd716 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,31 @@ -# gradle - -.gradle/ -build/ -out/ -classes/ - -# eclipse - -*.launch - -# idea - -.idea/ -*.iml -*.ipr -*.iws - -# vscode - -.settings/ -.vscode/ -bin/ -.classpath -.project - -# fabric - -run/ -output/ -*.log +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ +output/ +*.log diff --git a/README.md b/README.md index a8b33f9d..50b3ec8e 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ -[![](https://jitpack.io/v/paulevsGitch/BetterEnd.svg)](https://jitpack.io/#paulevsGitch/BetterEnd) -# Better End -Better End Mod for Fabric, MC 1.16.3 - -Importing: -* Clone repo -* Edit gradle.properties if necessary -* Run command line in folder: gradlew genSources eclipse (or Another-IDE-Name) -* Import project to IDE - -Building: -* Clone repo -* Run command line in folder: gradlew build -* Mod .jar will be in ./build/libs - -Mappings: -* https://modmuss50.me/fabric.html?&version=1.16.3 +[![](https://jitpack.io/v/paulevsGitch/BetterEnd.svg)](https://jitpack.io/#paulevsGitch/BetterEnd) +# Better End +Better End Mod for Fabric, MC 1.16.3 + +Importing: +* Clone repo +* Edit gradle.properties if necessary +* Run command line in folder: gradlew genSources eclipse (or Another-IDE-Name) +* Import project to IDE + +Building: +* Clone repo +* Run command line in folder: gradlew build +* Mod .jar will be in ./build/libs + +Mappings: +* https://modmuss50.me/fabric.html?&version=1.16.3 diff --git a/build.gradle b/build.gradle index df28b960..c6649214 100644 --- a/build.gradle +++ b/build.gradle @@ -1,93 +1,93 @@ -plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' - id 'maven-publish' -} - -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 - -archivesBaseName = project.archives_base_name -version = project.mod_version -group = project.maven_group - -repositories { - maven { url "https://maven.dblsaiko.net/" } - maven { url "http://server.bbkr.space:8081/artifactory/libs-release/" } - maven { url "https://maven.fabricmc.net/" } - maven { url 'https://jitpack.io' } - jcenter() -} - -dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - optional "me.shedaniel:RoughlyEnoughItems:${project.rei_version}" - optional "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}" - optional "grondag:canvas-mc116:${project.canvas_version}" -} - -def optional(String dep) { - dependencies.modRuntime (dep) { - exclude group: "net.fabricmc.fabric-api" - exclude module: "fabric-loader" - } - dependencies.modCompileOnly (dep) { - exclude group: "net.fabricmc.fabric-api" - exclude module: "fabric-loader" - } -} - -processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" - expand "version": project.version - } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } -} - -// ensure that the encoding is set to UTF-8, no matter what the system default is -// this fixes some edge cases with special characters not displaying correctly -// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} - -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource -} - -jar { - from "LICENSE" -} - -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } - } - } - - // select the repositories you want to publish to - repositories { - // uncomment to publish to the local maven - // mavenLocal() - } -} +plugins { + id 'fabric-loom' version '0.5-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +repositories { + maven { url "https://maven.dblsaiko.net/" } + maven { url "http://server.bbkr.space:8081/artifactory/libs-release/" } + maven { url "https://maven.fabricmc.net/" } + maven { url 'https://jitpack.io' } + jcenter() +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + optional "me.shedaniel:RoughlyEnoughItems:${project.rei_version}" + optional "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}" + optional "grondag:canvas-mc116:${project.canvas_version}" +} + +def optional(String dep) { + dependencies.modRuntime (dep) { + exclude group: "net.fabricmc.fabric-api" + exclude module: "fabric-loader" + } + dependencies.modCompileOnly (dep) { + exclude group: "net.fabricmc.fabric-api" + exclude module: "fabric-loader" + } +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties index d72bf12a..05790c36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,21 @@ -# Done to increase the memory available to gradle. - org.gradle.jvmargs=-Xmx2G - -# Fabric Properties - # check these on https://fabricmc.net/use - minecraft_version = 1.16.4 - yarn_mappings = 1 - loader_version = 0.10.6+build.214 - -# Mod Properties - mod_version = 0.6.0-beta - maven_group = ru.betterend - archives_base_name = better-end - -# Dependencies - # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version = 0.25.1+build.416-1.16 - cloth_config_version = 4.8.2 - cloth_events_version = 1.4.8 - canvas_version = 1.0.+ +# Done to increase the memory available to gradle. + org.gradle.jvmargs=-Xmx2G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version = 1.16.4 + yarn_mappings = 1 + loader_version = 0.10.6+build.214 + +# Mod Properties + mod_version = 0.6.0-beta + maven_group = ru.betterend + archives_base_name = better-end + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api + fabric_version = 0.25.1+build.416-1.16 + cloth_config_version = 4.8.2 + cloth_events_version = 1.4.8 + canvas_version = 1.0.+ rei_version = 5.6.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 622ab64a..99c200fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d..accc54f8 100644 --- a/gradlew +++ b/gradlew @@ -1,183 +1,183 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or 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 -## -############################################################################## - -# 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 -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$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='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# 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 - ;; -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" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - 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 -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 -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 - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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\"" - fi - i=`expr $i + 1` - 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" - -exec "$JAVACMD" "$@" +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 +## +############################################################################## + +# 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 +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; +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" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + 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 +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 +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 + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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\"" + fi + i=`expr $i + 1` + 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" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 62bd9b9c..9109989e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,103 +1,103 @@ -@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 -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -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="-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 - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -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% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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 +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +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="-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 + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +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% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/json/block/%name%.json b/json/block/%name%.json index 15906496..10f7880a 100644 --- a/json/block/%name%.json +++ b/json/block/%name%.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_brick_half_slab.json b/json/block/%name%_brick_half_slab.json index 7a4235f3..4a5be990 100644 --- a/json/block/%name%_brick_half_slab.json +++ b/json/block/%name%_brick_half_slab.json @@ -1,8 +1,8 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "betterend:block/%name%_bricks", - "side": "betterend:block/%name%_bricks", - "top": "betterend:block/%name%_bricks" - } +{ + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/%name%_bricks", + "side": "betterend:block/%name%_bricks", + "top": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_brick_inner_stairs.json b/json/block/%name%_brick_inner_stairs.json index cb848187..98c27d1f 100644 --- a/json/block/%name%_brick_inner_stairs.json +++ b/json/block/%name%_brick_inner_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/%name%_bricks", - "side": "betterend:block/%name%_bricks", - "top": "betterend:block/%name%_bricks" - } +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/%name%_bricks", + "side": "betterend:block/%name%_bricks", + "top": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_brick_outer_stairs.json b/json/block/%name%_brick_outer_stairs.json index f24d5f40..5fe881ad 100644 --- a/json/block/%name%_brick_outer_stairs.json +++ b/json/block/%name%_brick_outer_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/%name%_bricks", - "side": "betterend:block/%name%_bricks", - "top": "betterend:block/%name%_bricks" - } +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/%name%_bricks", + "side": "betterend:block/%name%_bricks", + "top": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_brick_stairs.json b/json/block/%name%_brick_stairs.json index 938c1cb5..ee695265 100644 --- a/json/block/%name%_brick_stairs.json +++ b/json/block/%name%_brick_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "betterend:block/%name%_bricks", - "side": "betterend:block/%name%_bricks", - "top": "betterend:block/%name%_bricks" - } +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/%name%_bricks", + "side": "betterend:block/%name%_bricks", + "top": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_brick_wall_inventory.json b/json/block/%name%_brick_wall_inventory.json index 2bd3956f..f5616dc9 100644 --- a/json/block/%name%_brick_wall_inventory.json +++ b/json/block/%name%_brick_wall_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "betterend:block/%name%_bricks" - } +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_brick_wall_post.json b/json/block/%name%_brick_wall_post.json index 5816f7ae..3e23f8a3 100644 --- a/json/block/%name%_brick_wall_post.json +++ b/json/block/%name%_brick_wall_post.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "betterend:block/%name%_bricks" - } +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_brick_wall_side.json b/json/block/%name%_brick_wall_side.json index f9da149c..e95d0502 100644 --- a/json/block/%name%_brick_wall_side.json +++ b/json/block/%name%_brick_wall_side.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "betterend:block/%name%_bricks" - } +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_brick_wall_side_tall.json b/json/block/%name%_brick_wall_side_tall.json index dc1b0743..7323cbfb 100644 --- a/json/block/%name%_brick_wall_side_tall.json +++ b/json/block/%name%_brick_wall_side_tall.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "betterend:block/%name%_bricks" - } +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_bricks.json b/json/block/%name%_bricks.json index f218c0fe..5f68cf77 100644 --- a/json/block/%name%_bricks.json +++ b/json/block/%name%_bricks.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_bricks" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/%name%_bricks" + } } \ No newline at end of file diff --git a/json/block/%name%_button.json b/json/block/%name%_button.json index a2e8c3ce..4a465cf5 100644 --- a/json/block/%name%_button.json +++ b/json/block/%name%_button.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button", - "textures": { - "texture": "betterend:block/%name%" - } +{ + "parent": "block/button", + "textures": { + "texture": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_button_inventory.json b/json/block/%name%_button_inventory.json index 42b61783..e04a286b 100644 --- a/json/block/%name%_button_inventory.json +++ b/json/block/%name%_button_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "betterend:block/%name%" - } +{ + "parent": "block/button_inventory", + "textures": { + "texture": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_button_pressed.json b/json/block/%name%_button_pressed.json index d0094062..5afc1c34 100644 --- a/json/block/%name%_button_pressed.json +++ b/json/block/%name%_button_pressed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "betterend:block/%name%" - } +{ + "parent": "block/button_pressed", + "textures": { + "texture": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_half_slab.json b/json/block/%name%_half_slab.json index 9d5489c1..afe17edd 100644 --- a/json/block/%name%_half_slab.json +++ b/json/block/%name%_half_slab.json @@ -1,8 +1,8 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "betterend:block/%name%", - "side": "betterend:block/%name%", - "top": "betterend:block/%name%" - } +{ + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/%name%", + "side": "betterend:block/%name%", + "top": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_inner_stairs.json b/json/block/%name%_inner_stairs.json index e95454c6..f7f22430 100644 --- a/json/block/%name%_inner_stairs.json +++ b/json/block/%name%_inner_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/%name%", - "side": "betterend:block/%name%", - "top": "betterend:block/%name%" - } +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/%name%", + "side": "betterend:block/%name%", + "top": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_outer_stairs.json b/json/block/%name%_outer_stairs.json index 670e267d..2c6740d1 100644 --- a/json/block/%name%_outer_stairs.json +++ b/json/block/%name%_outer_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/%name%", - "side": "betterend:block/%name%", - "top": "betterend:block/%name%" - } +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/%name%", + "side": "betterend:block/%name%", + "top": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_pillar.json b/json/block/%name%_pillar.json index 837248a3..abb46a9d 100644 --- a/json/block/%name%_pillar.json +++ b/json/block/%name%_pillar.json @@ -1,7 +1,7 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/%name%_pillar_top", - "side": "betterend:block/%name%_pillar_side" - } +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "betterend:block/%name%_pillar_top", + "side": "betterend:block/%name%_pillar_side" + } } \ No newline at end of file diff --git a/json/block/%name%_pressure_plate_down.json b/json/block/%name%_pressure_plate_down.json index ef2fec3b..0836b6f5 100644 --- a/json/block/%name%_pressure_plate_down.json +++ b/json/block/%name%_pressure_plate_down.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "betterend:block/%name%" - } +{ + "parent": "block/pressure_plate_down", + "textures": { + "texture": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_pressure_plate_up.json b/json/block/%name%_pressure_plate_up.json index 9fe8a247..655f909b 100644 --- a/json/block/%name%_pressure_plate_up.json +++ b/json/block/%name%_pressure_plate_up.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "betterend:block/%name%" - } +{ + "parent": "block/pressure_plate_up", + "textures": { + "texture": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_small_tiles.json b/json/block/%name%_small_tiles.json index a0c1a8eb..b81bf3b0 100644 --- a/json/block/%name%_small_tiles.json +++ b/json/block/%name%_small_tiles.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_small_tiles" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/%name%_small_tiles" + } } \ No newline at end of file diff --git a/json/block/%name%_stairs.json b/json/block/%name%_stairs.json index 61115016..1aee442b 100644 --- a/json/block/%name%_stairs.json +++ b/json/block/%name%_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "betterend:block/%name%", - "side": "betterend:block/%name%", - "top": "betterend:block/%name%" - } +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/%name%", + "side": "betterend:block/%name%", + "top": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_tile.json b/json/block/%name%_tile.json index 632959b1..211afd9d 100644 --- a/json/block/%name%_tile.json +++ b/json/block/%name%_tile.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%name%_tile" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/%name%_tile" + } } \ No newline at end of file diff --git a/json/block/%name%_wall_inventory.json b/json/block/%name%_wall_inventory.json index fdb5d169..35d05c72 100644 --- a/json/block/%name%_wall_inventory.json +++ b/json/block/%name%_wall_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "betterend:block/%name%" - } +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_wall_post.json b/json/block/%name%_wall_post.json index 2c3195b1..f668ca4b 100644 --- a/json/block/%name%_wall_post.json +++ b/json/block/%name%_wall_post.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "betterend:block/%name%" - } +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_wall_side.json b/json/block/%name%_wall_side.json index 2c228e96..6fc8de4b 100644 --- a/json/block/%name%_wall_side.json +++ b/json/block/%name%_wall_side.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "betterend:block/%name%" - } +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/block/%name%_wall_side_tall.json b/json/block/%name%_wall_side_tall.json index 4eeefe22..9570ac1a 100644 --- a/json/block/%name%_wall_side_tall.json +++ b/json/block/%name%_wall_side_tall.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "betterend:block/%name%" - } +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "betterend:block/%name%" + } } \ No newline at end of file diff --git a/json/blockstates/%name%.json b/json/blockstates/%name%.json index 79dd6729..ef978798 100644 --- a/json/blockstates/%name%.json +++ b/json/blockstates/%name%.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%" - } - } +{ + "variants": { + "": { + "model": "betterend:block/%name%" + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_brick_slab.json b/json/blockstates/%name%_brick_slab.json index 582099a0..d5a6bf3e 100644 --- a/json/blockstates/%name%_brick_slab.json +++ b/json/blockstates/%name%_brick_slab.json @@ -1,15 +1,15 @@ -{ - "variants": { - "type=bottom": { - "model": "betterend:block/%name%_brick_half_slab" - }, - "type=double": { - "model": "betterend:block/%name%_bricks" - }, - "type=top": { - "model": "betterend:block/%name%_brick_half_slab", - "uvlock": true, - "x": 180 - } - } +{ + "variants": { + "type=bottom": { + "model": "betterend:block/%name%_brick_half_slab" + }, + "type=double": { + "model": "betterend:block/%name%_bricks" + }, + "type=top": { + "model": "betterend:block/%name%_brick_half_slab", + "uvlock": true, + "x": 180 + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_brick_stairs.json b/json/blockstates/%name%_brick_stairs.json index 85e24d01..97fbabb4 100644 --- a/json/blockstates/%name%_brick_stairs.json +++ b/json/blockstates/%name%_brick_stairs.json @@ -1,209 +1,209 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_brick_inner_stairs" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_brick_outer_stairs" - }, - "facing=east,half=bottom,shape=straight": { - "model": "betterend:block/%name%_brick_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "betterend:block/%name%_brick_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "betterend:block/%name%_brick_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "betterend:block/%name%_brick_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_brick_inner_stairs" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_brick_outer_stairs" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "betterend:block/%name%_brick_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "betterend:block/%name%_brick_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "betterend:block/%name%_brick_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "betterend:block/%name%_brick_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "betterend:block/%name%_brick_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "betterend:block/%name%_brick_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_brick_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_brick_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:block/%name%_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:block/%name%_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:block/%name%_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:block/%name%_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_brick_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_brick_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:block/%name%_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:block/%name%_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:block/%name%_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:block/%name%_brick_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:block/%name%_brick_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:block/%name%_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_brick_wall.json b/json/blockstates/%name%_brick_wall.json index a3e02377..17f3910d 100644 --- a/json/blockstates/%name%_brick_wall.json +++ b/json/blockstates/%name%_brick_wall.json @@ -1,90 +1,90 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_post" - } - }, - { - "when": { - "north": "low" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_side", - "uvlock": true - } - }, - { - "when": { - "east": "low" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "low" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "low" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "north": "tall" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_side_tall", - "uvlock": true - } - }, - { - "when": { - "east": "tall" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_side_tall", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "tall" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_side_tall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "tall" - }, - "apply": { - "model": "betterend:block/%name%_brick_wall_side_tall", - "y": 270, - "uvlock": true - } - } - ] +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "betterend:block/%name%_brick_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] } \ No newline at end of file diff --git a/json/blockstates/%name%_bricks.json b/json/blockstates/%name%_bricks.json index 59171c16..d55de86c 100644 --- a/json/blockstates/%name%_bricks.json +++ b/json/blockstates/%name%_bricks.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_bricks" - } - } +{ + "variants": { + "": { + "model": "betterend:block/%name%_bricks" + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_button.json b/json/blockstates/%name%_button.json index a65801cf..f0a946f9 100644 --- a/json/blockstates/%name%_button.json +++ b/json/blockstates/%name%_button.json @@ -1,118 +1,118 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "betterend:block/%name%_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=north,powered=false": { - "model": "betterend:block/%name%_button", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=south,powered=false": { - "model": "betterend:block/%name%_button", - "x": 180 - }, - "face=ceiling,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "x": 180 - }, - "face=ceiling,facing=west,powered=false": { - "model": "betterend:block/%name%_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "x": 180, - "y": 90 - }, - "face=floor,facing=east,powered=false": { - "model": "betterend:block/%name%_button", - "y": 90 - }, - "face=floor,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "y": 90 - }, - "face=floor,facing=north,powered=false": { - "model": "betterend:block/%name%_button" - }, - "face=floor,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed" - }, - "face=floor,facing=south,powered=false": { - "model": "betterend:block/%name%_button", - "y": 180 - }, - "face=floor,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "y": 180 - }, - "face=floor,facing=west,powered=false": { - "model": "betterend:block/%name%_button", - "y": 270 - }, - "face=floor,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "y": 270 - }, - "face=wall,facing=east,powered=false": { - "model": "betterend:block/%name%_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=east,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=north,powered=false": { - "model": "betterend:block/%name%_button", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=north,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=south,powered=false": { - "model": "betterend:block/%name%_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=south,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=west,powered=false": { - "model": "betterend:block/%name%_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=west,powered=true": { - "model": "betterend:block/%name%_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - } - } +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "betterend:block/%name%_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "betterend:block/%name%_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "betterend:block/%name%_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "betterend:block/%name%_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "betterend:block/%name%_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "betterend:block/%name%_button" + }, + "face=floor,facing=north,powered=true": { + "model": "betterend:block/%name%_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "betterend:block/%name%_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "betterend:block/%name%_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "betterend:block/%name%_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "betterend:block/%name%_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "betterend:block/%name%_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "betterend:block/%name%_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "betterend:block/%name%_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_pillar.json b/json/blockstates/%name%_pillar.json index fddcfc6c..27ec0347 100644 --- a/json/blockstates/%name%_pillar.json +++ b/json/blockstates/%name%_pillar.json @@ -1,7 +1,7 @@ -{ - "variants": { - "axis=x": { "model": "betterend:block/%name%_pillar", "x": 90, "y": 90 }, - "axis=y": { "model": "betterend:block/%name%_pillar" }, - "axis=z": { "model": "betterend:block/%name%_pillar", "x": 90 } - } +{ + "variants": { + "axis=x": { "model": "betterend:block/%name%_pillar", "x": 90, "y": 90 }, + "axis=y": { "model": "betterend:block/%name%_pillar" }, + "axis=z": { "model": "betterend:block/%name%_pillar", "x": 90 } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_plate.json b/json/blockstates/%name%_plate.json index f8ad4900..4060f8da 100644 --- a/json/blockstates/%name%_plate.json +++ b/json/blockstates/%name%_plate.json @@ -1,10 +1,10 @@ -{ - "variants": { - "powered=false": { - "model": "betterend:block/%name%_pressure_plate_up" - }, - "powered=true": { - "model": "betterend:block/%name%_pressure_plate_down" - } - } +{ + "variants": { + "powered=false": { + "model": "betterend:block/%name%_pressure_plate_up" + }, + "powered=true": { + "model": "betterend:block/%name%_pressure_plate_down" + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_slab.json b/json/blockstates/%name%_slab.json index 5eafe1bc..17875e4c 100644 --- a/json/blockstates/%name%_slab.json +++ b/json/blockstates/%name%_slab.json @@ -1,15 +1,15 @@ -{ - "variants": { - "type=bottom": { - "model": "betterend:block/%name%_half_slab" - }, - "type=double": { - "model": "betterend:block/%name%" - }, - "type=top": { - "model": "betterend:block/%name%_half_slab", - "uvlock": true, - "x": 180 - } - } +{ + "variants": { + "type=bottom": { + "model": "betterend:block/%name%_half_slab" + }, + "type=double": { + "model": "betterend:block/%name%" + }, + "type=top": { + "model": "betterend:block/%name%_half_slab", + "uvlock": true, + "x": 180 + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_small_tiles.json b/json/blockstates/%name%_small_tiles.json index 5913e0d4..5a84411b 100644 --- a/json/blockstates/%name%_small_tiles.json +++ b/json/blockstates/%name%_small_tiles.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_small_tiles" - } - } +{ + "variants": { + "": { + "model": "betterend:block/%name%_small_tiles" + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_stairs.json b/json/blockstates/%name%_stairs.json index e0a17faf..685e1861 100644 --- a/json/blockstates/%name%_stairs.json +++ b/json/blockstates/%name%_stairs.json @@ -1,209 +1,209 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs" - }, - "facing=east,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "betterend:block/%name%_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "betterend:block/%name%_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "betterend:block/%name%_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:block/%name%_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:block/%name%_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:block/%name%_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:block/%name%_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_tile.json b/json/blockstates/%name%_tile.json index 4dc91e5e..b9f56911 100644 --- a/json/blockstates/%name%_tile.json +++ b/json/blockstates/%name%_tile.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/%name%_tile" - } - } +{ + "variants": { + "": { + "model": "betterend:block/%name%_tile" + } + } } \ No newline at end of file diff --git a/json/blockstates/%name%_wall.json b/json/blockstates/%name%_wall.json index 115da727..3d81eb45 100644 --- a/json/blockstates/%name%_wall.json +++ b/json/blockstates/%name%_wall.json @@ -1,90 +1,90 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "betterend:block/%name%_wall_post" - } - }, - { - "when": { - "north": "low" - }, - "apply": { - "model": "betterend:block/%name%_wall_side", - "uvlock": true - } - }, - { - "when": { - "east": "low" - }, - "apply": { - "model": "betterend:block/%name%_wall_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "low" - }, - "apply": { - "model": "betterend:block/%name%_wall_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "low" - }, - "apply": { - "model": "betterend:block/%name%_wall_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "north": "tall" - }, - "apply": { - "model": "betterend:block/%name%_wall_side_tall", - "uvlock": true - } - }, - { - "when": { - "east": "tall" - }, - "apply": { - "model": "betterend:block/%name%_wall_side_tall", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "tall" - }, - "apply": { - "model": "betterend:block/%name%_wall_side_tall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "tall" - }, - "apply": { - "model": "betterend:block/%name%_wall_side_tall", - "y": 270, - "uvlock": true - } - } - ] +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "betterend:block/%name%_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "betterend:block/%name%_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "betterend:block/%name%_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "betterend:block/%name%_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "betterend:block/%name%_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "betterend:block/%name%_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "betterend:block/%name%_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "betterend:block/%name%_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "betterend:block/%name%_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] } \ No newline at end of file diff --git a/json/blockstates/a.txt b/json/blockstates/a.txt index 1a56d0c8..a21008f5 100644 --- a/json/blockstates/a.txt +++ b/json/blockstates/a.txt @@ -1,23 +1,23 @@ - ’®¬ ¢ ãáâனá⢥ D ¨¬¥¥â ¬¥âªã Data - ‘¥à¨©­ë© ­®¬¥à ⮬ : C7B5-F673 - - ‘®¤¥à¦¨¬®¥ ¯ ¯ª¨ D:\BetterEnd\Utilities\src\data\stone\blockstates - -11.10.2020 15:54 . -11.10.2020 15:54 .. -11.10.2020 15:50 103 %name%.json -11.10.2020 15:51 110 %name%_bricks.json -11.10.2020 15:54 382 %name%_brick_slab.json -11.10.2020 15:53 7ÿ540 %name%_brick_stairs.json -11.10.2020 15:52 1ÿ635 %name%_brick_wall.json -26.09.2020 20:35 4ÿ006 %name%_button.json -11.10.2020 15:50 253 %name%_pillar.json -26.09.2020 20:35 241 %name%_plate.json -26.09.2020 20:35 364 %name%_slab.json -11.10.2020 15:50 115 %name%_small_tiles.json -26.09.2020 20:35 7ÿ300 %name%_stairs.json -11.10.2020 15:50 108 %name%_tile.json -11.10.2020 15:52 1ÿ581 %name%_wall.json -11.10.2020 15:58 0 a.txt - 14 ä ©«®¢ 23ÿ738 ¡ ©â - 2 ¯ ¯®ª 785ÿ301ÿ614ÿ592 ¡ ©â ᢮¡®¤­® + ’®¬ ¢ ãáâனá⢥ D ¨¬¥¥â ¬¥âªã Data + ‘¥à¨©­ë© ­®¬¥à ⮬ : C7B5-F673 + + ‘®¤¥à¦¨¬®¥ ¯ ¯ª¨ D:\BetterEnd\Utilities\src\data\stone\blockstates + +11.10.2020 15:54 . +11.10.2020 15:54 .. +11.10.2020 15:50 103 %name%.json +11.10.2020 15:51 110 %name%_bricks.json +11.10.2020 15:54 382 %name%_brick_slab.json +11.10.2020 15:53 7ÿ540 %name%_brick_stairs.json +11.10.2020 15:52 1ÿ635 %name%_brick_wall.json +26.09.2020 20:35 4ÿ006 %name%_button.json +11.10.2020 15:50 253 %name%_pillar.json +26.09.2020 20:35 241 %name%_plate.json +26.09.2020 20:35 364 %name%_slab.json +11.10.2020 15:50 115 %name%_small_tiles.json +26.09.2020 20:35 7ÿ300 %name%_stairs.json +11.10.2020 15:50 108 %name%_tile.json +11.10.2020 15:52 1ÿ581 %name%_wall.json +11.10.2020 15:58 0 a.txt + 14 ä ©«®¢ 23ÿ738 ¡ ©â + 2 ¯ ¯®ª 785ÿ301ÿ614ÿ592 ¡ ©â ᢮¡®¤­® diff --git a/json/item/%name%.json b/json/item/%name%.json index 92b1fef5..82508cd3 100644 --- a/json/item/%name%.json +++ b/json/item/%name%.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%" +{ + "parent": "betterend:block/%name%" } \ No newline at end of file diff --git a/json/item/%name%_brick_slab.json b/json/item/%name%_brick_slab.json index 32c1d293..c148cf65 100644 --- a/json/item/%name%_brick_slab.json +++ b/json/item/%name%_brick_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_brick_half_slab" +{ + "parent": "betterend:block/%name%_brick_half_slab" } \ No newline at end of file diff --git a/json/item/%name%_brick_stairs.json b/json/item/%name%_brick_stairs.json index 89ecaa54..24b61896 100644 --- a/json/item/%name%_brick_stairs.json +++ b/json/item/%name%_brick_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_brick_stairs" +{ + "parent": "betterend:block/%name%_brick_stairs" } \ No newline at end of file diff --git a/json/item/%name%_brick_wall.json b/json/item/%name%_brick_wall.json index 8719d7c1..1e902ec4 100644 --- a/json/item/%name%_brick_wall.json +++ b/json/item/%name%_brick_wall.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_brick_wall_inventory" +{ + "parent": "betterend:block/%name%_brick_wall_inventory" } \ No newline at end of file diff --git a/json/item/%name%_bricks.json b/json/item/%name%_bricks.json index 14d8a30b..56ce6003 100644 --- a/json/item/%name%_bricks.json +++ b/json/item/%name%_bricks.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_bricks" +{ + "parent": "betterend:block/%name%_bricks" } \ No newline at end of file diff --git a/json/item/%name%_button.json b/json/item/%name%_button.json index 3dc32368..240fb2d7 100644 --- a/json/item/%name%_button.json +++ b/json/item/%name%_button.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_button_inventory" +{ + "parent": "betterend:block/%name%_button_inventory" } \ No newline at end of file diff --git a/json/item/%name%_pillar.json b/json/item/%name%_pillar.json index 0f7de019..a6257b38 100644 --- a/json/item/%name%_pillar.json +++ b/json/item/%name%_pillar.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_pillar" +{ + "parent": "betterend:block/%name%_pillar" } \ No newline at end of file diff --git a/json/item/%name%_plate.json b/json/item/%name%_plate.json index 484a02f9..d774f9bc 100644 --- a/json/item/%name%_plate.json +++ b/json/item/%name%_plate.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_pressure_plate_up" +{ + "parent": "betterend:block/%name%_pressure_plate_up" } \ No newline at end of file diff --git a/json/item/%name%_slab.json b/json/item/%name%_slab.json index f6853e03..1c83dcd9 100644 --- a/json/item/%name%_slab.json +++ b/json/item/%name%_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_half_slab" +{ + "parent": "betterend:block/%name%_half_slab" } \ No newline at end of file diff --git a/json/item/%name%_small_tiles.json b/json/item/%name%_small_tiles.json index 2d8006df..46e284e5 100644 --- a/json/item/%name%_small_tiles.json +++ b/json/item/%name%_small_tiles.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_small_tiles" +{ + "parent": "betterend:block/%name%_small_tiles" } \ No newline at end of file diff --git a/json/item/%name%_stairs.json b/json/item/%name%_stairs.json index 0f51c6ec..c4871532 100644 --- a/json/item/%name%_stairs.json +++ b/json/item/%name%_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_stairs" +{ + "parent": "betterend:block/%name%_stairs" } \ No newline at end of file diff --git a/json/item/%name%_tile.json b/json/item/%name%_tile.json index 4b981468..ad863533 100644 --- a/json/item/%name%_tile.json +++ b/json/item/%name%_tile.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_tile" +{ + "parent": "betterend:block/%name%_tile" } \ No newline at end of file diff --git a/json/item/%name%_wall.json b/json/item/%name%_wall.json index eee0e6ae..59b31173 100644 --- a/json/item/%name%_wall.json +++ b/json/item/%name%_wall.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/%name%_wall_inventory" +{ + "parent": "betterend:block/%name%_wall_inventory" } \ No newline at end of file diff --git a/json/item/a.txt b/json/item/a.txt index 3a43dcf5..2cbe5c81 100644 --- a/json/item/a.txt +++ b/json/item/a.txt @@ -1,23 +1,23 @@ - ’®¬ ¢ ãáâனá⢥ D ¨¬¥¥â ¬¥âªã Data - ‘¥à¨©­ë© ­®¬¥à ⮬ : C7B5-F673 - - ‘®¤¥à¦¨¬®¥ ¯ ¯ª¨ D:\BetterEnd\Utilities\src\data\stone\item - -11.10.2020 15:55 . -11.10.2020 15:55 .. -11.10.2020 15:42 44 %name%.json -11.10.2020 15:46 51 %name%_bricks.json -11.10.2020 15:47 55 %name%_brick_slab.json -11.10.2020 15:46 57 %name%_brick_stairs.json -11.10.2020 15:47 65 %name%_brick_wall.json -11.10.2020 15:48 61 %name%_button.json -11.10.2020 15:43 51 %name%_pillar.json -26.09.2020 20:36 62 %name%_plate.json -11.10.2020 15:43 49 %name%_slab.json -11.10.2020 15:43 56 %name%_small_tiles.json -11.10.2020 15:43 51 %name%_stairs.json -11.10.2020 15:43 49 %name%_tile.json -11.10.2020 15:47 59 %name%_wall.json -11.10.2020 15:55 0 a.txt - 14 ä ©«®¢ 710 ¡ ©â - 2 ¯ ¯®ª 785ÿ301ÿ659ÿ648 ¡ ©â ᢮¡®¤­® + ’®¬ ¢ ãáâனá⢥ D ¨¬¥¥â ¬¥âªã Data + ‘¥à¨©­ë© ­®¬¥à ⮬ : C7B5-F673 + + ‘®¤¥à¦¨¬®¥ ¯ ¯ª¨ D:\BetterEnd\Utilities\src\data\stone\item + +11.10.2020 15:55 . +11.10.2020 15:55 .. +11.10.2020 15:42 44 %name%.json +11.10.2020 15:46 51 %name%_bricks.json +11.10.2020 15:47 55 %name%_brick_slab.json +11.10.2020 15:46 57 %name%_brick_stairs.json +11.10.2020 15:47 65 %name%_brick_wall.json +11.10.2020 15:48 61 %name%_button.json +11.10.2020 15:43 51 %name%_pillar.json +26.09.2020 20:36 62 %name%_plate.json +11.10.2020 15:43 49 %name%_slab.json +11.10.2020 15:43 56 %name%_small_tiles.json +11.10.2020 15:43 51 %name%_stairs.json +11.10.2020 15:43 49 %name%_tile.json +11.10.2020 15:47 59 %name%_wall.json +11.10.2020 15:55 0 a.txt + 14 ä ©«®¢ 710 ¡ ©â + 2 ¯ ¯®ª 785ÿ301ÿ659ÿ648 ¡ ©â ᢮¡®¤­® diff --git a/settings.gradle b/settings.gradle index 5b60df3d..c1d85e97 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ -pluginManagement { - repositories { - jcenter() - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } -} +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index 5cc7ef8c..bb2f54e9 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -1,64 +1,64 @@ -package ru.betterend; - -import net.fabricmc.api.ModInitializer; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.util.Identifier; -import ru.betterend.api.BetterEndPlugin; -import ru.betterend.config.MainConfig; -import ru.betterend.effects.EndEnchantments; -import ru.betterend.effects.EndPotions; -import ru.betterend.recipe.AlloyingRecipes; -import ru.betterend.recipe.CraftingRecipes; -import ru.betterend.recipe.FurnaceRecipes; -import ru.betterend.recipe.SmithingRecipes; -import ru.betterend.registry.EndBiomes; -import ru.betterend.registry.EndBlockEntities; -import ru.betterend.registry.EndBlocks; -import ru.betterend.registry.EndEntities; -import ru.betterend.registry.EndFeatures; -import ru.betterend.registry.EndItems; -import ru.betterend.registry.EndSounds; -import ru.betterend.registry.EndStructures; -import ru.betterend.registry.EndTags; -import ru.betterend.util.Logger; -import ru.betterend.world.generator.BetterEndBiomeSource; - -public class BetterEnd implements ModInitializer { - public static final String MOD_ID = "betterend"; - public static final Logger LOGGER = Logger.get(); - public static final MainConfig CONFIG = MainConfig.getInstance(); - - @Override - public void onInitialize() { - EndSounds.register(); - EndItems.register(); - EndBlocks.register(); - EndBlockEntities.register(); - EndFeatures.register(); - EndEntities.register(); - EndBiomes.register(); - BetterEndBiomeSource.register(); - EndTags.register(); - EndEnchantments.register(); - EndPotions.register(); - CraftingRecipes.register(); - FurnaceRecipes.register(); - AlloyingRecipes.register(); - SmithingRecipes.register(); - EndStructures.register(); - - FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register); - } - - public static Identifier makeID(String path) { - return new Identifier(MOD_ID, path); - } - - public static String getStringId(String id) { - return String.format("%s:%s", MOD_ID, id); - } - - public static boolean isDevEnvironment() { - return FabricLoader.getInstance().isDevelopmentEnvironment(); - } -} +package ru.betterend; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.util.Identifier; +import ru.betterend.api.BetterEndPlugin; +import ru.betterend.config.MainConfig; +import ru.betterend.effects.EndEnchantments; +import ru.betterend.effects.EndPotions; +import ru.betterend.recipe.AlloyingRecipes; +import ru.betterend.recipe.CraftingRecipes; +import ru.betterend.recipe.FurnaceRecipes; +import ru.betterend.recipe.SmithingRecipes; +import ru.betterend.registry.EndBiomes; +import ru.betterend.registry.EndBlockEntities; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndEntities; +import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndItems; +import ru.betterend.registry.EndSounds; +import ru.betterend.registry.EndStructures; +import ru.betterend.registry.EndTags; +import ru.betterend.util.Logger; +import ru.betterend.world.generator.BetterEndBiomeSource; + +public class BetterEnd implements ModInitializer { + public static final String MOD_ID = "betterend"; + public static final Logger LOGGER = Logger.get(); + public static final MainConfig CONFIG = MainConfig.getInstance(); + + @Override + public void onInitialize() { + EndSounds.register(); + EndItems.register(); + EndBlocks.register(); + EndBlockEntities.register(); + EndFeatures.register(); + EndEntities.register(); + EndBiomes.register(); + BetterEndBiomeSource.register(); + EndTags.register(); + EndEnchantments.register(); + EndPotions.register(); + CraftingRecipes.register(); + FurnaceRecipes.register(); + AlloyingRecipes.register(); + SmithingRecipes.register(); + EndStructures.register(); + + FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register); + } + + public static Identifier makeID(String path) { + return new Identifier(MOD_ID, path); + } + + public static String getStringId(String id) { + return String.format("%s:%s", MOD_ID, id); + } + + public static boolean isDevEnvironment() { + return FabricLoader.getInstance().isDevelopmentEnvironment(); + } +} diff --git a/src/main/java/ru/betterend/api/BetterEndPlugin.java b/src/main/java/ru/betterend/api/BetterEndPlugin.java index b1817141..4b278aec 100644 --- a/src/main/java/ru/betterend/api/BetterEndPlugin.java +++ b/src/main/java/ru/betterend/api/BetterEndPlugin.java @@ -1,34 +1,34 @@ -package ru.betterend.api; - -public interface BetterEndPlugin { - /** - * Alloying recipes registration. - * See AlloyingRecipe.Builder for details. - */ - default void registerAlloyingRecipes() {} - - /** - * Smithing recipes registration. - * See AnvilSmithingRecipe.Builder for details. - */ - default void registerSmithingRecipes() {} - - /** - * Additional biomes registration. - * See BiomeRegistry.registerBiome for details. - */ - default void registerEndBiomes() {} - - /** - * Register other mod stuff, for example, EndHammers. - */ - default void registerOthers() {} - - - public static void register(BetterEndPlugin plugin) { - plugin.registerAlloyingRecipes(); - plugin.registerSmithingRecipes(); - plugin.registerEndBiomes(); - plugin.registerOthers(); - } -} +package ru.betterend.api; + +public interface BetterEndPlugin { + /** + * Alloying recipes registration. + * See AlloyingRecipe.Builder for details. + */ + default void registerAlloyingRecipes() {} + + /** + * Smithing recipes registration. + * See AnvilSmithingRecipe.Builder for details. + */ + default void registerSmithingRecipes() {} + + /** + * Additional biomes registration. + * See BiomeRegistry.registerBiome for details. + */ + default void registerEndBiomes() {} + + /** + * Register other mod stuff, for example, EndHammers. + */ + default void registerOthers() {} + + + public static void register(BetterEndPlugin plugin) { + plugin.registerAlloyingRecipes(); + plugin.registerSmithingRecipes(); + plugin.registerEndBiomes(); + plugin.registerOthers(); + } +} diff --git a/src/main/java/ru/betterend/blocks/AeterniumBlock.java b/src/main/java/ru/betterend/blocks/AeterniumBlock.java index 11711a35..e5e11578 100644 --- a/src/main/java/ru/betterend/blocks/AeterniumBlock.java +++ b/src/main/java/ru/betterend/blocks/AeterniumBlock.java @@ -1,28 +1,28 @@ -package ru.betterend.blocks; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.BlockState; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; -import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -import ru.betterend.blocks.basis.BlockBase; - -public class AeterniumBlock extends BlockBase { - - public AeterniumBlock() { - super(FabricBlockSettings.of(Material.METAL, MaterialColor.GRAY) - .hardness(65F) - .resistance(1200F) - .requiresTool() - .sounds(BlockSoundGroup.NETHERITE)); - } - - @Environment(EnvType.CLIENT) - public int getColor(BlockState state, BlockView world, BlockPos pos) { - return 0xFF657A7A; - } -} +package ru.betterend.blocks; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; +import ru.betterend.blocks.basis.BlockBase; + +public class AeterniumBlock extends BlockBase { + + public AeterniumBlock() { + super(FabricBlockSettings.of(Material.METAL, MaterialColor.GRAY) + .hardness(65F) + .resistance(1200F) + .requiresTool() + .sounds(BlockSoundGroup.NETHERITE)); + } + + @Environment(EnvType.CLIENT) + public int getColor(BlockState state, BlockView world, BlockPos pos) { + return 0xFF657A7A; + } +} diff --git a/src/main/java/ru/betterend/blocks/BlockStone.java b/src/main/java/ru/betterend/blocks/BlockStone.java index 305cf219..d8b9dd53 100644 --- a/src/main/java/ru/betterend/blocks/BlockStone.java +++ b/src/main/java/ru/betterend/blocks/BlockStone.java @@ -1,14 +1,14 @@ -package ru.betterend.blocks; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Blocks; -import net.minecraft.block.MaterialColor; -import net.minecraft.sound.BlockSoundGroup; -import ru.betterend.blocks.basis.BlockBase; - -public class BlockStone extends BlockBase { - - public BlockStone(MaterialColor color) { - super(FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color).sounds(BlockSoundGroup.STONE)); - } -} +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Blocks; +import net.minecraft.block.MaterialColor; +import net.minecraft.sound.BlockSoundGroup; +import ru.betterend.blocks.basis.BlockBase; + +public class BlockStone extends BlockBase { + + public BlockStone(MaterialColor color) { + super(FabricBlockSettings.copyOf(Blocks.END_STONE).materialColor(color).sounds(BlockSoundGroup.STONE)); + } +} diff --git a/src/main/java/ru/betterend/blocks/EndPortalBlock.java b/src/main/java/ru/betterend/blocks/EndPortalBlock.java index 1e48fd9e..cd894741 100644 --- a/src/main/java/ru/betterend/blocks/EndPortalBlock.java +++ b/src/main/java/ru/betterend/blocks/EndPortalBlock.java @@ -1,119 +1,119 @@ -package ru.betterend.blocks; - -import java.util.Random; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.NetherPortalBlock; -import net.minecraft.entity.Entity; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; -import net.minecraft.world.dimension.DimensionType; -import ru.betterend.client.render.ERenderLayer; -import ru.betterend.interfaces.IRenderTypeable; -import ru.betterend.interfaces.TeleportingEntity; -import ru.betterend.registry.EndParticles; - -public class EndPortalBlock extends NetherPortalBlock implements IRenderTypeable { - public EndPortalBlock() { - super(FabricBlockSettings.copyOf(Blocks.NETHER_PORTAL).resistance(Blocks.BEDROCK.getBlastResistance()).luminance(state -> { - return 12; - })); - } - - @Override - @Environment(EnvType.CLIENT) - public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { - if (random.nextInt(100) == 0) { - world.playSound(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, SoundEvents.BLOCK_PORTAL_AMBIENT, SoundCategory.BLOCKS, 0.5F, random.nextFloat() * 0.4F + 0.8F, false); - } - - double x = pos.getX() + random.nextDouble(); - double y = pos.getY() + random.nextDouble(); - double z = pos.getZ() + random.nextDouble(); - int k = random.nextInt(2) * 2 - 1; - if (!world.getBlockState(pos.west()).isOf(this) && !world.getBlockState(pos.east()).isOf(this)) { - x = pos.getX() + 0.5D + 0.25D * k; - } else { - z = pos.getZ() + 0.5D + 0.25D * k; - } - - world.addParticle(EndParticles.PORTAL_SPHERE, x, y, z, 0, 0, 0); - } - - @Override - public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {} - - @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { - return state; - } - - @Override - public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { - if (world instanceof ServerWorld && !entity.hasVehicle() && !entity.hasPassengers() && entity.canUsePortals()) { - TeleportingEntity teleEntity = TeleportingEntity.class.cast(entity); - if (teleEntity.hasCooldown()) return; - boolean isOverworld = world.getRegistryKey().equals(World.OVERWORLD); - ServerWorld destination = ((ServerWorld) world).getServer().getWorld(isOverworld ? World.END : World.OVERWORLD); - BlockPos exitPos = this.findExitPos(destination, pos, entity); - if (exitPos == null) return; - if (entity instanceof ServerPlayerEntity) { - ServerPlayerEntity player = (ServerPlayerEntity) entity; - player.teleport(destination, exitPos.getX(), exitPos.getY(), exitPos.getZ(), entity.yaw, entity.pitch); - teleEntity.beSetCooldown(player.isCreative() ? 50 : 300); - } else { - teleEntity.beSetExitPos(exitPos); - entity.moveToWorld(destination); - teleEntity.beSetCooldown(300); - } - } - } - - @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; - } - - private BlockPos findExitPos(ServerWorld world, BlockPos pos, Entity entity) { - Registry registry = world.getRegistryManager().getDimensionTypes(); - double mult = registry.get(DimensionType.THE_END_ID).getCoordinateScale(); - BlockPos.Mutable basePos; - if (world.getRegistryKey().equals(World.OVERWORLD)) { - basePos = pos.mutableCopy().set(pos.getX() / mult, pos.getY(), pos.getZ() / mult); - } else { - basePos = pos.mutableCopy().set(pos.getX() * mult, pos.getY(), pos.getZ() * mult); - } - Direction direction = Direction.EAST; - BlockPos.Mutable checkPos = basePos.mutableCopy(); - for (int step = 1; step < 64; step++) { - for (int i = 0; i < step; i++) { - checkPos.setY(5); - while(checkPos.getY() < world.getHeight()) { - BlockState state = world.getBlockState(checkPos); - if(state.isOf(this)) { - if (state.get(AXIS).equals(Direction.Axis.X)) { - return checkPos.add(0, 0, 1); - } else { - return checkPos.add(1, 0, 0); - } - } - checkPos.move(Direction.UP); - } - checkPos.move(direction); - } - direction = direction.rotateYClockwise(); - } - return null; - } -} +package ru.betterend.blocks; + +import java.util.Random; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.NetherPortalBlock; +import net.minecraft.entity.Entity; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.dimension.DimensionType; +import ru.betterend.client.render.ERenderLayer; +import ru.betterend.interfaces.IRenderTypeable; +import ru.betterend.interfaces.TeleportingEntity; +import ru.betterend.registry.EndParticles; + +public class EndPortalBlock extends NetherPortalBlock implements IRenderTypeable { + public EndPortalBlock() { + super(FabricBlockSettings.copyOf(Blocks.NETHER_PORTAL).resistance(Blocks.BEDROCK.getBlastResistance()).luminance(state -> { + return 12; + })); + } + + @Override + @Environment(EnvType.CLIENT) + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + if (random.nextInt(100) == 0) { + world.playSound(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, SoundEvents.BLOCK_PORTAL_AMBIENT, SoundCategory.BLOCKS, 0.5F, random.nextFloat() * 0.4F + 0.8F, false); + } + + double x = pos.getX() + random.nextDouble(); + double y = pos.getY() + random.nextDouble(); + double z = pos.getZ() + random.nextDouble(); + int k = random.nextInt(2) * 2 - 1; + if (!world.getBlockState(pos.west()).isOf(this) && !world.getBlockState(pos.east()).isOf(this)) { + x = pos.getX() + 0.5D + 0.25D * k; + } else { + z = pos.getZ() + 0.5D + 0.25D * k; + } + + world.addParticle(EndParticles.PORTAL_SPHERE, x, y, z, 0, 0, 0); + } + + @Override + public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {} + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { + return state; + } + + @Override + public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { + if (world instanceof ServerWorld && !entity.hasVehicle() && !entity.hasPassengers() && entity.canUsePortals()) { + TeleportingEntity teleEntity = TeleportingEntity.class.cast(entity); + if (teleEntity.hasCooldown()) return; + boolean isOverworld = world.getRegistryKey().equals(World.OVERWORLD); + ServerWorld destination = ((ServerWorld) world).getServer().getWorld(isOverworld ? World.END : World.OVERWORLD); + BlockPos exitPos = this.findExitPos(destination, pos, entity); + if (exitPos == null) return; + if (entity instanceof ServerPlayerEntity) { + ServerPlayerEntity player = (ServerPlayerEntity) entity; + player.teleport(destination, exitPos.getX(), exitPos.getY(), exitPos.getZ(), entity.yaw, entity.pitch); + teleEntity.beSetCooldown(player.isCreative() ? 50 : 300); + } else { + teleEntity.beSetExitPos(exitPos); + entity.moveToWorld(destination); + teleEntity.beSetCooldown(300); + } + } + } + + @Override + public ERenderLayer getRenderLayer() { + return ERenderLayer.TRANSLUCENT; + } + + private BlockPos findExitPos(ServerWorld world, BlockPos pos, Entity entity) { + Registry registry = world.getRegistryManager().getDimensionTypes(); + double mult = registry.get(DimensionType.THE_END_ID).getCoordinateScale(); + BlockPos.Mutable basePos; + if (world.getRegistryKey().equals(World.OVERWORLD)) { + basePos = pos.mutableCopy().set(pos.getX() / mult, pos.getY(), pos.getZ() / mult); + } else { + basePos = pos.mutableCopy().set(pos.getX() * mult, pos.getY(), pos.getZ() * mult); + } + Direction direction = Direction.EAST; + BlockPos.Mutable checkPos = basePos.mutableCopy(); + for (int step = 1; step < 64; step++) { + for (int i = 0; i < step; i++) { + checkPos.setY(5); + while(checkPos.getY() < world.getHeight()) { + BlockState state = world.getBlockState(checkPos); + if(state.isOf(this)) { + if (state.get(AXIS).equals(Direction.Axis.X)) { + return checkPos.add(0, 0, 1); + } else { + return checkPos.add(1, 0, 0); + } + } + checkPos.move(Direction.UP); + } + checkPos.move(direction); + } + direction = direction.rotateYClockwise(); + } + return null; + } +} diff --git a/src/main/java/ru/betterend/blocks/EndStoneSmelter.java b/src/main/java/ru/betterend/blocks/EndStoneSmelter.java index 27315e60..99251885 100644 --- a/src/main/java/ru/betterend/blocks/EndStoneSmelter.java +++ b/src/main/java/ru/betterend/blocks/EndStoneSmelter.java @@ -1,140 +1,140 @@ -package ru.betterend.blocks; - -import java.util.Collections; -import java.util.List; -import java.util.Random; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemPlacementContext; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext; -import net.minecraft.particle.ParticleTypes; -import net.minecraft.screen.NamedScreenHandlerFactory; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.state.StateManager; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; -import net.minecraft.state.property.Properties; -import net.minecraft.util.ActionResult; -import net.minecraft.util.BlockMirror; -import net.minecraft.util.BlockRotation; -import net.minecraft.util.Hand; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; -import ru.betterend.blocks.basis.BaseBlockWithEntity; -import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; - -public class EndStoneSmelter extends BaseBlockWithEntity { - public static final DirectionProperty FACING = HorizontalFacingBlock.FACING; - public static final BooleanProperty LIT = Properties.LIT; - public static final String ID = "end_stone_smelter"; - - public EndStoneSmelter() { - super(FabricBlockSettings.of(Material.STONE, MaterialColor.GRAY) - .hardness(4F) - .resistance(100F) - .requiresTool() - .sounds(BlockSoundGroup.STONE)); - this.setDefaultState(this.stateManager.getDefaultState() - .with(FACING, Direction.NORTH) - .with(LIT, false)); - } - - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (world.isClient) { - return ActionResult.SUCCESS; - } else { - this.openScreen(world, pos, player); - return ActionResult.CONSUME; - } - } - - private void openScreen(World world, BlockPos pos, PlayerEntity player) { - BlockEntity blockEntity = world.getBlockEntity(pos); - if (blockEntity instanceof EndStoneSmelterBlockEntity) { - player.openHandledScreen((NamedScreenHandlerFactory) blockEntity); - } - } - - @Override - public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState().with(FACING, ctx.getPlayerFacing().getOpposite()); - } - - @Override - public BlockEntity createBlockEntity(BlockView world) { - return new EndStoneSmelterBlockEntity(); - } - - @Override - public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - return Collections.singletonList(new ItemStack(this)); - } - - @Override - public boolean hasComparatorOutput(BlockState state) { - return true; - } - - @Override - public int getComparatorOutput(BlockState state, World world, BlockPos pos) { - //TODO - return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos)); - } - - @Override - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.MODEL; - } - - @Override - public BlockState rotate(BlockState state, BlockRotation rotation) { - return (BlockState)state.with(FACING, rotation.rotate((Direction)state.get(FACING))); - } - - @Override - public BlockState mirror(BlockState state, BlockMirror mirror) { - return state.rotate(mirror.getRotation((Direction)state.get(FACING))); - } - - @Override - protected void appendProperties(StateManager.Builder builder) { - builder.add(FACING, LIT); - } - - @Environment(EnvType.CLIENT) - public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { - if (state.get(LIT)) { - double x = pos.getX() + 0.5D; - double y = pos.getY(); - double z = pos.getZ() + 0.5D; - if (random.nextDouble() < 0.1D) { - world.playSound(x, y, z, SoundEvents.BLOCK_BLASTFURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); - } - - Direction direction = (Direction)state.get(FACING); - Direction.Axis axis = direction.getAxis(); - double defOffset = random.nextDouble() * 0.6D - 0.3D; - double offX = axis == Direction.Axis.X ? direction.getOffsetX() * 0.52D : defOffset; - double offY = random.nextDouble() * 9.0D / 16.0D; - double offZ = axis == Direction.Axis.Z ? direction.getOffsetZ() * 0.52D : defOffset; - world.addParticle(ParticleTypes.SMOKE, x + offX, y + offY, z + offZ, 0.0D, 0.0D, 0.0D); - } - } -} +package ru.betterend.blocks; + +import java.util.Collections; +import java.util.List; +import java.util.Random; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.screen.NamedScreenHandlerFactory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.util.ActionResult; +import net.minecraft.util.BlockMirror; +import net.minecraft.util.BlockRotation; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import ru.betterend.blocks.basis.BaseBlockWithEntity; +import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; + +public class EndStoneSmelter extends BaseBlockWithEntity { + public static final DirectionProperty FACING = HorizontalFacingBlock.FACING; + public static final BooleanProperty LIT = Properties.LIT; + public static final String ID = "end_stone_smelter"; + + public EndStoneSmelter() { + super(FabricBlockSettings.of(Material.STONE, MaterialColor.GRAY) + .hardness(4F) + .resistance(100F) + .requiresTool() + .sounds(BlockSoundGroup.STONE)); + this.setDefaultState(this.stateManager.getDefaultState() + .with(FACING, Direction.NORTH) + .with(LIT, false)); + } + + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (world.isClient) { + return ActionResult.SUCCESS; + } else { + this.openScreen(world, pos, player); + return ActionResult.CONSUME; + } + } + + private void openScreen(World world, BlockPos pos, PlayerEntity player) { + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof EndStoneSmelterBlockEntity) { + player.openHandledScreen((NamedScreenHandlerFactory) blockEntity); + } + } + + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + return this.getDefaultState().with(FACING, ctx.getPlayerFacing().getOpposite()); + } + + @Override + public BlockEntity createBlockEntity(BlockView world) { + return new EndStoneSmelterBlockEntity(); + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Collections.singletonList(new ItemStack(this)); + } + + @Override + public boolean hasComparatorOutput(BlockState state) { + return true; + } + + @Override + public int getComparatorOutput(BlockState state, World world, BlockPos pos) { + //TODO + return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos)); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public BlockState rotate(BlockState state, BlockRotation rotation) { + return (BlockState)state.with(FACING, rotation.rotate((Direction)state.get(FACING))); + } + + @Override + public BlockState mirror(BlockState state, BlockMirror mirror) { + return state.rotate(mirror.getRotation((Direction)state.get(FACING))); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACING, LIT); + } + + @Environment(EnvType.CLIENT) + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + if (state.get(LIT)) { + double x = pos.getX() + 0.5D; + double y = pos.getY(); + double z = pos.getZ() + 0.5D; + if (random.nextDouble() < 0.1D) { + world.playSound(x, y, z, SoundEvents.BLOCK_BLASTFURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); + } + + Direction direction = (Direction)state.get(FACING); + Direction.Axis axis = direction.getAxis(); + double defOffset = random.nextDouble() * 0.6D - 0.3D; + double offX = axis == Direction.Axis.X ? direction.getOffsetX() * 0.52D : defOffset; + double offY = random.nextDouble() * 9.0D / 16.0D; + double offZ = axis == Direction.Axis.Z ? direction.getOffsetZ() * 0.52D : defOffset; + world.addParticle(ParticleTypes.SMOKE, x + offX, y + offY, z + offZ, 0.0D, 0.0D, 0.0D); + } + } +} diff --git a/src/main/java/ru/betterend/blocks/EnderBlock.java b/src/main/java/ru/betterend/blocks/EnderBlock.java index 57516d94..1b80fabd 100644 --- a/src/main/java/ru/betterend/blocks/EnderBlock.java +++ b/src/main/java/ru/betterend/blocks/EnderBlock.java @@ -1,28 +1,28 @@ -package ru.betterend.blocks; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.BlockState; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; -import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -import ru.betterend.blocks.basis.BlockBase; - -public class EnderBlock extends BlockBase { - - public EnderBlock() { - super(FabricBlockSettings.of(Material.STONE, MaterialColor.field_25708) - .hardness(5F) - .resistance(6F) - .requiresTool() - .sounds(BlockSoundGroup.STONE)); - } - - @Environment(EnvType.CLIENT) - public int getColor(BlockState state, BlockView world, BlockPos pos) { - return 0xFF005548; - } -} +package ru.betterend.blocks; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; +import ru.betterend.blocks.basis.BlockBase; + +public class EnderBlock extends BlockBase { + + public EnderBlock() { + super(FabricBlockSettings.of(Material.STONE, MaterialColor.field_25708) + .hardness(5F) + .resistance(6F) + .requiresTool() + .sounds(BlockSoundGroup.STONE)); + } + + @Environment(EnvType.CLIENT) + public int getColor(BlockState state, BlockView world, BlockPos pos) { + return 0xFF005548; + } +} diff --git a/src/main/java/ru/betterend/blocks/EternalPedestal.java b/src/main/java/ru/betterend/blocks/EternalPedestal.java index b03bdcae..72818195 100644 --- a/src/main/java/ru/betterend/blocks/EternalPedestal.java +++ b/src/main/java/ru/betterend/blocks/EternalPedestal.java @@ -1,125 +1,125 @@ -package ru.betterend.blocks; - -import java.util.List; - -import com.google.common.collect.Lists; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext; -import net.minecraft.loot.context.LootContextParameters; -import net.minecraft.state.StateManager; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; -import net.minecraft.world.explosion.Explosion; -import ru.betterend.blocks.basis.BlockPedestal; -import ru.betterend.blocks.entities.EternalPedestalEntity; -import ru.betterend.registry.EndBlocks; -import ru.betterend.registry.EndItems; -import ru.betterend.rituals.EternalRitual; - -public class EternalPedestal extends BlockPedestal { - public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVATED; - - public EternalPedestal() { - super(EndBlocks.FLAVOLITE_RUNED_ETERNAL); - this.setDefaultState(this.getDefaultState().with(ACTIVATED, false)); - } - - @Override - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - ActionResult result = super.onUse(state, world, pos, player, hand, hit); - if (result.equals(ActionResult.SUCCESS)) { - BlockEntity blockEntity = world.getBlockEntity(pos); - if (blockEntity instanceof EternalPedestalEntity) { - EternalPedestalEntity pedestal = (EternalPedestalEntity) blockEntity; - BlockState updatedState = world.getBlockState(pos); - if (pedestal.isEmpty() && updatedState.get(ACTIVATED)) { - if (pedestal.hasRitual()) { - EternalRitual ritual = pedestal.getRitual(); - ritual.removePortal(); - } - world.setBlockState(pos, updatedState.with(ACTIVATED, false)); - } else { - ItemStack itemStack = pedestal.getStack(0); - if (itemStack.getItem() == EndItems.ETERNAL_CRYSTAL) { - world.setBlockState(pos, updatedState.with(ACTIVATED, true)); - if (pedestal.hasRitual()) { - pedestal.getRitual().checkStructure(); - } else { - EternalRitual ritual = new EternalRitual(world, pos); - ritual.checkStructure(); - } - } - } - } - } - return result; - } - - @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { - BlockState updated = super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); - if (!updated.isOf(this)) return updated; - if (!this.isPlaceable(updated)) { - return updated.with(ACTIVATED, false); - } - return updated; - } - - @Override - public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) { - return 0.0F; - } - - @Override - public float getBlastResistance() { - return Blocks.BEDROCK.getBlastResistance(); - } - - @Override - public boolean shouldDropItemsOnExplosion(Explosion explosion) { - return false; - } - - @Override - public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - if (state.isOf(this)) { - BlockProperties.PedestalState currentState = state.get(BlockProperties.PEDESTAL_STATE); - if (currentState.equals(BlockProperties.PedestalState.BOTTOM) || currentState.equals(BlockProperties.PedestalState.PILLAR)) { - return Lists.newArrayList(); - } - } - List drop = Lists.newArrayList(); - BlockEntity blockEntity = builder.getNullable(LootContextParameters.BLOCK_ENTITY); - if (blockEntity != null && blockEntity instanceof EternalPedestalEntity) { - EternalPedestalEntity pedestal = (EternalPedestalEntity) blockEntity; - if (!pedestal.isEmpty()) { - drop.add(pedestal.getStack(0)); - } - } - return drop; - } - - @Override - protected void appendProperties(StateManager.Builder stateManager) { - super.appendProperties(stateManager); - stateManager.add(ACTIVATED); - } - - @Override - public BlockEntity createBlockEntity(BlockView world) { - return new EternalPedestalEntity(); - } -} +package ru.betterend.blocks; + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.loot.context.LootContextParameters; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.explosion.Explosion; +import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.entities.EternalPedestalEntity; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndItems; +import ru.betterend.rituals.EternalRitual; + +public class EternalPedestal extends BlockPedestal { + public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVATED; + + public EternalPedestal() { + super(EndBlocks.FLAVOLITE_RUNED_ETERNAL); + this.setDefaultState(this.getDefaultState().with(ACTIVATED, false)); + } + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + ActionResult result = super.onUse(state, world, pos, player, hand, hit); + if (result.equals(ActionResult.SUCCESS)) { + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof EternalPedestalEntity) { + EternalPedestalEntity pedestal = (EternalPedestalEntity) blockEntity; + BlockState updatedState = world.getBlockState(pos); + if (pedestal.isEmpty() && updatedState.get(ACTIVATED)) { + if (pedestal.hasRitual()) { + EternalRitual ritual = pedestal.getRitual(); + ritual.removePortal(); + } + world.setBlockState(pos, updatedState.with(ACTIVATED, false)); + } else { + ItemStack itemStack = pedestal.getStack(0); + if (itemStack.getItem() == EndItems.ETERNAL_CRYSTAL) { + world.setBlockState(pos, updatedState.with(ACTIVATED, true)); + if (pedestal.hasRitual()) { + pedestal.getRitual().checkStructure(); + } else { + EternalRitual ritual = new EternalRitual(world, pos); + ritual.checkStructure(); + } + } + } + } + } + return result; + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { + BlockState updated = super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); + if (!updated.isOf(this)) return updated; + if (!this.isPlaceable(updated)) { + return updated.with(ACTIVATED, false); + } + return updated; + } + + @Override + public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) { + return 0.0F; + } + + @Override + public float getBlastResistance() { + return Blocks.BEDROCK.getBlastResistance(); + } + + @Override + public boolean shouldDropItemsOnExplosion(Explosion explosion) { + return false; + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + if (state.isOf(this)) { + BlockProperties.PedestalState currentState = state.get(BlockProperties.PEDESTAL_STATE); + if (currentState.equals(BlockProperties.PedestalState.BOTTOM) || currentState.equals(BlockProperties.PedestalState.PILLAR)) { + return Lists.newArrayList(); + } + } + List drop = Lists.newArrayList(); + BlockEntity blockEntity = builder.getNullable(LootContextParameters.BLOCK_ENTITY); + if (blockEntity != null && blockEntity instanceof EternalPedestalEntity) { + EternalPedestalEntity pedestal = (EternalPedestalEntity) blockEntity; + if (!pedestal.isEmpty()) { + drop.add(pedestal.getStack(0)); + } + } + return drop; + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + super.appendProperties(stateManager); + stateManager.add(ACTIVATED); + } + + @Override + public BlockEntity createBlockEntity(BlockView world) { + return new EternalPedestalEntity(); + } +} diff --git a/src/main/java/ru/betterend/blocks/EternalRunedFlavolite.java b/src/main/java/ru/betterend/blocks/EternalRunedFlavolite.java index 69be444f..e8fd7644 100644 --- a/src/main/java/ru/betterend/blocks/EternalRunedFlavolite.java +++ b/src/main/java/ru/betterend/blocks/EternalRunedFlavolite.java @@ -1,37 +1,37 @@ -package ru.betterend.blocks; - -import java.util.List; - -import com.google.common.collect.Lists; - -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -import net.minecraft.world.explosion.Explosion; - -public class EternalRunedFlavolite extends RunedFlavolite { - - @Override - public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) { - return 0.0F; - } - - @Override - public float getBlastResistance() { - return Blocks.BEDROCK.getBlastResistance(); - } - - @Override - public boolean shouldDropItemsOnExplosion(Explosion explosion) { - return false; - } - - @Override - public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - return Lists.newArrayList(); - } -} +package ru.betterend.blocks; + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; +import net.minecraft.world.explosion.Explosion; + +public class EternalRunedFlavolite extends RunedFlavolite { + + @Override + public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) { + return 0.0F; + } + + @Override + public float getBlastResistance() { + return Blocks.BEDROCK.getBlastResistance(); + } + + @Override + public boolean shouldDropItemsOnExplosion(Explosion explosion) { + return false; + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Lists.newArrayList(); + } +} diff --git a/src/main/java/ru/betterend/blocks/InfusionPedestal.java b/src/main/java/ru/betterend/blocks/InfusionPedestal.java index fa510931..53add7e6 100644 --- a/src/main/java/ru/betterend/blocks/InfusionPedestal.java +++ b/src/main/java/ru/betterend/blocks/InfusionPedestal.java @@ -1,71 +1,71 @@ -package ru.betterend.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.ShapeContext; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.shape.VoxelShape; -import net.minecraft.util.shape.VoxelShapes; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockPedestal; -import ru.betterend.blocks.entities.InfusionPedestalEntity; - -public class InfusionPedestal extends BlockPedestal { - private static final VoxelShape SHAPE_DEFAULT; - private static final VoxelShape SHAPE_PEDESTAL_TOP; - - public InfusionPedestal() { - super(Blocks.OBSIDIAN); - this.height = 1.08F; - } - - @Override - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - ActionResult result = super.onUse(state, world, pos, player, hand, hit); - return result; - } - - @Override - public BlockEntity createBlockEntity(BlockView world) { - return new InfusionPedestalEntity(); - } - - @Override - public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - if (state.isOf(this)) { - switch(state.get(STATE)) { - case PEDESTAL_TOP: { - return SHAPE_PEDESTAL_TOP; - } - case DEFAULT: { - return SHAPE_DEFAULT; - } - default: { - return super.getOutlineShape(state, world, pos, context); - } - } - } - return super.getOutlineShape(state, world, pos, context); - } - - static { - VoxelShape basinUp = Block.createCuboidShape(2, 3, 2, 14, 4, 14); - VoxelShape basinDown = Block.createCuboidShape(0, 0, 0, 16, 3, 16); - VoxelShape pedestalTop = Block.createCuboidShape(1, 9, 1, 15, 11, 15); - VoxelShape pedestalDefault = Block.createCuboidShape(1, 13, 1, 15, 15, 15); - VoxelShape pillar = Block.createCuboidShape(3, 0, 3, 13, 9, 13); - VoxelShape pillarDefault = Block.createCuboidShape(3, 4, 3, 13, 13, 13); - VoxelShape eyeDefault = Block.createCuboidShape(4, 15, 4, 12, 16, 12); - VoxelShape eyeTop = Block.createCuboidShape(4, 11, 4, 12, 12, 12); - VoxelShape basin = VoxelShapes.union(basinDown, basinUp); - SHAPE_DEFAULT = VoxelShapes.union(basin, pillarDefault, pedestalDefault, eyeDefault); - SHAPE_PEDESTAL_TOP = VoxelShapes.union(pillar, pedestalTop, eyeTop); - } -} +package ru.betterend.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.entities.InfusionPedestalEntity; + +public class InfusionPedestal extends BlockPedestal { + private static final VoxelShape SHAPE_DEFAULT; + private static final VoxelShape SHAPE_PEDESTAL_TOP; + + public InfusionPedestal() { + super(Blocks.OBSIDIAN); + this.height = 1.08F; + } + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + ActionResult result = super.onUse(state, world, pos, player, hand, hit); + return result; + } + + @Override + public BlockEntity createBlockEntity(BlockView world) { + return new InfusionPedestalEntity(); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + if (state.isOf(this)) { + switch(state.get(STATE)) { + case PEDESTAL_TOP: { + return SHAPE_PEDESTAL_TOP; + } + case DEFAULT: { + return SHAPE_DEFAULT; + } + default: { + return super.getOutlineShape(state, world, pos, context); + } + } + } + return super.getOutlineShape(state, world, pos, context); + } + + static { + VoxelShape basinUp = Block.createCuboidShape(2, 3, 2, 14, 4, 14); + VoxelShape basinDown = Block.createCuboidShape(0, 0, 0, 16, 3, 16); + VoxelShape pedestalTop = Block.createCuboidShape(1, 9, 1, 15, 11, 15); + VoxelShape pedestalDefault = Block.createCuboidShape(1, 13, 1, 15, 15, 15); + VoxelShape pillar = Block.createCuboidShape(3, 0, 3, 13, 9, 13); + VoxelShape pillarDefault = Block.createCuboidShape(3, 4, 3, 13, 13, 13); + VoxelShape eyeDefault = Block.createCuboidShape(4, 15, 4, 12, 16, 12); + VoxelShape eyeTop = Block.createCuboidShape(4, 11, 4, 12, 12, 12); + VoxelShape basin = VoxelShapes.union(basinDown, basinUp); + SHAPE_DEFAULT = VoxelShapes.union(basin, pillarDefault, pedestalDefault, eyeDefault); + SHAPE_PEDESTAL_TOP = VoxelShapes.union(pillar, pedestalTop, eyeTop); + } +} diff --git a/src/main/java/ru/betterend/blocks/RunedFlavolite.java b/src/main/java/ru/betterend/blocks/RunedFlavolite.java index e49d9e21..47e207a8 100644 --- a/src/main/java/ru/betterend/blocks/RunedFlavolite.java +++ b/src/main/java/ru/betterend/blocks/RunedFlavolite.java @@ -1,26 +1,26 @@ -package ru.betterend.blocks; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.state.StateManager; -import net.minecraft.state.property.BooleanProperty; -import ru.betterend.blocks.basis.BlockBase; -import ru.betterend.registry.EndBlocks; - -public class RunedFlavolite extends BlockBase { - public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVATED; - - public RunedFlavolite() { - super(FabricBlockSettings.copyOf(EndBlocks.FLAVOLITE.polished).resistance(Blocks.OBSIDIAN.getBlastResistance()).luminance(state -> { - return state.get(ACTIVATED) ? 8 : 0; - })); - this.setDefaultState(stateManager.getDefaultState().with(ACTIVATED, false)); - } - - @Override - protected void appendProperties(StateManager.Builder stateManager) { - stateManager.add(ACTIVATED); - } -} +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.registry.EndBlocks; + +public class RunedFlavolite extends BlockBase { + public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVATED; + + public RunedFlavolite() { + super(FabricBlockSettings.copyOf(EndBlocks.FLAVOLITE.polished).resistance(Blocks.OBSIDIAN.getBlastResistance()).luminance(state -> { + return state.get(ACTIVATED) ? 8 : 0; + })); + this.setDefaultState(stateManager.getDefaultState().with(ACTIVATED, false)); + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(ACTIVATED); + } +} diff --git a/src/main/java/ru/betterend/blocks/TerminiteBlock.java b/src/main/java/ru/betterend/blocks/TerminiteBlock.java index 4270e3a8..204a2e55 100644 --- a/src/main/java/ru/betterend/blocks/TerminiteBlock.java +++ b/src/main/java/ru/betterend/blocks/TerminiteBlock.java @@ -1,17 +1,17 @@ -package ru.betterend.blocks; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; -import net.minecraft.sound.BlockSoundGroup; -import ru.betterend.blocks.basis.BlockBase; - -public class TerminiteBlock extends BlockBase { - public TerminiteBlock() { - super(FabricBlockSettings.of(Material.METAL, MaterialColor.field_25708) - .hardness(7F) - .resistance(9F) - .requiresTool() - .sounds(BlockSoundGroup.METAL)); - } -} +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.sound.BlockSoundGroup; +import ru.betterend.blocks.basis.BlockBase; + +public class TerminiteBlock extends BlockBase { + public TerminiteBlock() { + super(FabricBlockSettings.of(Material.METAL, MaterialColor.field_25708) + .hardness(7F) + .resistance(9F) + .requiresTool() + .sounds(BlockSoundGroup.METAL)); + } +} diff --git a/src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java b/src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java index 05bbad65..4442e05d 100644 --- a/src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java +++ b/src/main/java/ru/betterend/blocks/basis/BaseBlockWithEntity.java @@ -1,28 +1,28 @@ -package ru.betterend.blocks.basis; - -import java.util.Collections; -import java.util.List; - -import net.minecraft.block.BlockState; -import net.minecraft.block.BlockWithEntity; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContext; -import net.minecraft.world.BlockView; - -public class BaseBlockWithEntity extends BlockWithEntity { - - public BaseBlockWithEntity(Settings settings) { - super(settings); - } - - @Override - public BlockEntity createBlockEntity(BlockView world) { - return null; - } - - @Override - public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - return Collections.singletonList(new ItemStack(this)); - } -} +package ru.betterend.blocks.basis; + +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.BlockState; +import net.minecraft.block.BlockWithEntity; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.world.BlockView; + +public class BaseBlockWithEntity extends BlockWithEntity { + + public BaseBlockWithEntity(Settings settings) { + super(settings); + } + + @Override + public BlockEntity createBlockEntity(BlockView world) { + return null; + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Collections.singletonList(new ItemStack(this)); + } +} diff --git a/src/main/java/ru/betterend/blocks/basis/BlockStoneLantern.java b/src/main/java/ru/betterend/blocks/basis/BlockStoneLantern.java new file mode 100644 index 00000000..be5a6b9b --- /dev/null +++ b/src/main/java/ru/betterend/blocks/basis/BlockStoneLantern.java @@ -0,0 +1,146 @@ +package ru.betterend.blocks.basis; + +import java.io.Reader; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.Waterloggable; +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.client.color.item.ItemColorProvider; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3i; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import ru.betterend.blocks.AuroraCrystalBlock; +import ru.betterend.interfaces.IColorProvider; +import ru.betterend.interfaces.Patterned; +import ru.betterend.util.MHelper; + +public class BlockStoneLantern extends BlockBaseNotFull implements IColorProvider, Waterloggable { + public static final BooleanProperty IS_FLOOR = BooleanProperty.of("is_floor"); + public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; + + private static final VoxelShape SHAPE_CEIL = Block.createCuboidShape(3, 1, 3, 13, 16, 13); + private static final VoxelShape SHAPE_FLOOR = Block.createCuboidShape(3, 0, 3, 13, 15, 13); + private static final Vec3i[] COLORS = AuroraCrystalBlock.COLORS; + + public BlockStoneLantern(Block source) { + super(FabricBlockSettings.copyOf(source).luminance(15)); + } + + @Override + protected void appendProperties(StateManager.Builder stateManager) { + stateManager.add(IS_FLOOR, WATERLOGGED); + } + + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + WorldView worldView = ctx.getWorld(); + BlockPos blockPos = ctx.getBlockPos(); + Direction dir = ctx.getSide(); + if (dir == Direction.DOWN) { + if (sideCoversSmallSquare(worldView, blockPos.up(), Direction.DOWN)) { + boolean water = worldView.getFluidState(blockPos).getFluid() == Fluids.WATER; + return getDefaultState().with(IS_FLOOR, false).with(WATERLOGGED, water); + } + } + else { + if (sideCoversSmallSquare(worldView, blockPos.down(), Direction.UP)) { + boolean water = worldView.getFluidState(blockPos).getFluid() == Fluids.WATER; + return getDefaultState().with(IS_FLOOR, true).with(WATERLOGGED, water); + } + } + return null; + } + + @Override + public BlockColorProvider getProvider() { + return (state, world, pos, tintIndex) -> { + long i = (long) pos.getX() + (long) pos.getY() + (long) pos.getZ(); + double delta = i * 0.1; + int index = MHelper.floor(delta); + int index2 = (index + 1) & 3; + delta -= index; + index &= 3; + + Vec3i color1 = COLORS[index]; + Vec3i color2 = COLORS[index2]; + + int r = MHelper.floor(MathHelper.lerp(delta, color1.getX(), color2.getX())); + int g = MHelper.floor(MathHelper.lerp(delta, color1.getY(), color2.getY())); + int b = MHelper.floor(MathHelper.lerp(delta, color1.getZ(), color2.getZ())); + + return MHelper.color(r, g, b); + }; + } + + @Override + public ItemColorProvider getItemProvider() { + return (stack, tintIndex) -> { + return MHelper.color(COLORS[3].getX(), COLORS[3].getY(), COLORS[3].getZ()); + }; + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { + return state.get(IS_FLOOR) ? SHAPE_FLOOR : SHAPE_CEIL; + } + + @Override + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + if (state.get(IS_FLOOR)) { + return sideCoversSmallSquare(world, pos.down(), Direction.UP); + } + else { + return sideCoversSmallSquare(world, pos.up(), Direction.DOWN); + } + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction facing, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + Boolean water = state.get(WATERLOGGED); + if (water) { + world.getFluidTickScheduler().schedule(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + } + if (!canPlaceAt(state, world, pos)) { + return water ? Blocks.WATER.getDefaultState() : Blocks.AIR.getDefaultState(); + } + else { + return state; + } + } + + @Override + public Identifier statePatternId() { + return Patterned.STATE_STONE_LANTERN; + } + + @Override + public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); + if (block.contains("ceil")) { + return Patterned.createJson(Patterned.BLOCK_STONE_LANTERN_CEIL, blockId, blockId.getPath()); + } + return Patterned.createJson(Patterned.BLOCK_STONE_LANTERN_FLOOR, blockId, blockId.getPath()); + } + + @Override + public String getStatesPattern(Reader data) { + Identifier blockId = Registry.BLOCK.getId(this); + return Patterned.createJson(data, blockId, blockId.getPath()); + } +} diff --git a/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java b/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java index 0d15041f..27f1132a 100644 --- a/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java @@ -1,48 +1,48 @@ -package ru.betterend.blocks.entities; - -import net.minecraft.block.BlockState; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import ru.betterend.rituals.EternalRitual; - -public class EternalPedestalEntity extends PedestalBlockEntity { - private EternalRitual linkedRitual; - - public boolean hasRitual() { - return this.linkedRitual != null; - } - - public void linkRitual(EternalRitual ritual) { - this.linkedRitual = ritual; - } - - public EternalRitual getRitual() { - return this.linkedRitual; - } - - @Override - public void setLocation(World world, BlockPos pos) { - super.setLocation(world, pos); - if (hasRitual()) { - this.linkedRitual.setWorld(world); - } - } - - @Override - public void fromTag(BlockState state, CompoundTag tag) { - super.fromTag(state, tag); - if (tag.contains("ritual")) { - this.linkedRitual = new EternalRitual(world); - this.linkedRitual.fromTag(tag.getCompound("ritual")); - } - } - - @Override - public CompoundTag toTag(CompoundTag tag) { - if (this.hasRitual()) { - tag.put("ritual", linkedRitual.toTag(new CompoundTag())); - } - return super.toTag(tag); - } -} +package ru.betterend.blocks.entities; + +import net.minecraft.block.BlockState; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import ru.betterend.rituals.EternalRitual; + +public class EternalPedestalEntity extends PedestalBlockEntity { + private EternalRitual linkedRitual; + + public boolean hasRitual() { + return this.linkedRitual != null; + } + + public void linkRitual(EternalRitual ritual) { + this.linkedRitual = ritual; + } + + public EternalRitual getRitual() { + return this.linkedRitual; + } + + @Override + public void setLocation(World world, BlockPos pos) { + super.setLocation(world, pos); + if (hasRitual()) { + this.linkedRitual.setWorld(world); + } + } + + @Override + public void fromTag(BlockState state, CompoundTag tag) { + super.fromTag(state, tag); + if (tag.contains("ritual")) { + this.linkedRitual = new EternalRitual(world); + this.linkedRitual.fromTag(tag.getCompound("ritual")); + } + } + + @Override + public CompoundTag toTag(CompoundTag tag) { + if (this.hasRitual()) { + tag.put("ritual", linkedRitual.toTag(new CompoundTag())); + } + return super.toTag(tag); + } +} diff --git a/src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java b/src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java index a0447214..cb22b342 100644 --- a/src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java @@ -1,24 +1,24 @@ -package ru.betterend.blocks.entities; - -import net.minecraft.block.BlockState; -import net.minecraft.nbt.CompoundTag; -import ru.betterend.rituals.InfusionRitual; - -public class InfusionPedestalEntity extends PedestalBlockEntity { - - private InfusionRitual activeRitual; - - public boolean hasRitual() { - return this.activeRitual != null; - } - - @Override - public void fromTag(BlockState state, CompoundTag tag) { - super.fromTag(state, tag); - } - - @Override - public CompoundTag toTag(CompoundTag tag) { - return super.toTag(tag); - } -} +package ru.betterend.blocks.entities; + +import net.minecraft.block.BlockState; +import net.minecraft.nbt.CompoundTag; +import ru.betterend.rituals.InfusionRitual; + +public class InfusionPedestalEntity extends PedestalBlockEntity { + + private InfusionRitual activeRitual; + + public boolean hasRitual() { + return this.activeRitual != null; + } + + @Override + public void fromTag(BlockState state, CompoundTag tag) { + super.fromTag(state, tag); + } + + @Override + public CompoundTag toTag(CompoundTag tag) { + return super.toTag(tag); + } +} diff --git a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java index c21e3a42..423f29c6 100644 --- a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java @@ -1,105 +1,105 @@ -package ru.betterend.blocks.entities; - -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; -import net.minecraft.util.Tickable; -import ru.betterend.registry.EndBlockEntities; - -public class PedestalBlockEntity extends BlockEntity implements Inventory, Tickable { - private ItemStack activeItem = ItemStack.EMPTY; - - private final int maxAge = 314; - private int age; - - public PedestalBlockEntity() { - super(EndBlockEntities.PEDESTAL); - } - - public int getAge() { - return this.age; - } - - public int getMaxAge() { - return this.maxAge; - } - - @Override - public void clear() { - this.activeItem = ItemStack.EMPTY; - } - - @Override - public int size() { - return 1; - } - - @Override - public boolean isEmpty() { - return this.activeItem.isEmpty(); - } - - @Override - public ItemStack getStack(int slot) { - return this.activeItem; - } - - @Override - public ItemStack removeStack(int slot, int amount) { - return this.removeStack(slot); - } - - @Override - public ItemStack removeStack(int slot) { - return this.activeItem = ItemStack.EMPTY; - } - - @Override - public void setStack(int slot, ItemStack stack) { - this.activeItem = stack; - } - - @Override - public boolean canPlayerUse(PlayerEntity player) { - return true; - } - - @Override - public BlockEntityUpdateS2CPacket toUpdatePacket() { - return new BlockEntityUpdateS2CPacket(pos, 32, this.toInitialChunkDataTag()); - } - - @Override - public CompoundTag toInitialChunkDataTag() { - return this.toTag(new CompoundTag()); - } - - @Override - public void fromTag(BlockState state, CompoundTag tag) { - super.fromTag(state, tag); - if (tag.contains("active_item")) { - CompoundTag itemTag = tag.getCompound("active_item"); - this.activeItem = ItemStack.fromTag(itemTag); - } - } - - @Override - public CompoundTag toTag(CompoundTag tag) { - tag.put("active_item", activeItem.toTag(new CompoundTag())); - return super.toTag(tag); - } - - @Override - public void tick() { - if (!isEmpty()) { - this.age++; - if (age > maxAge) { - this.age = 0; - } - } - } -} +package ru.betterend.blocks.entities; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; +import net.minecraft.util.Tickable; +import ru.betterend.registry.EndBlockEntities; + +public class PedestalBlockEntity extends BlockEntity implements Inventory, Tickable { + private ItemStack activeItem = ItemStack.EMPTY; + + private final int maxAge = 314; + private int age; + + public PedestalBlockEntity() { + super(EndBlockEntities.PEDESTAL); + } + + public int getAge() { + return this.age; + } + + public int getMaxAge() { + return this.maxAge; + } + + @Override + public void clear() { + this.activeItem = ItemStack.EMPTY; + } + + @Override + public int size() { + return 1; + } + + @Override + public boolean isEmpty() { + return this.activeItem.isEmpty(); + } + + @Override + public ItemStack getStack(int slot) { + return this.activeItem; + } + + @Override + public ItemStack removeStack(int slot, int amount) { + return this.removeStack(slot); + } + + @Override + public ItemStack removeStack(int slot) { + return this.activeItem = ItemStack.EMPTY; + } + + @Override + public void setStack(int slot, ItemStack stack) { + this.activeItem = stack; + } + + @Override + public boolean canPlayerUse(PlayerEntity player) { + return true; + } + + @Override + public BlockEntityUpdateS2CPacket toUpdatePacket() { + return new BlockEntityUpdateS2CPacket(pos, 32, this.toInitialChunkDataTag()); + } + + @Override + public CompoundTag toInitialChunkDataTag() { + return this.toTag(new CompoundTag()); + } + + @Override + public void fromTag(BlockState state, CompoundTag tag) { + super.fromTag(state, tag); + if (tag.contains("active_item")) { + CompoundTag itemTag = tag.getCompound("active_item"); + this.activeItem = ItemStack.fromTag(itemTag); + } + } + + @Override + public CompoundTag toTag(CompoundTag tag) { + tag.put("active_item", activeItem.toTag(new CompoundTag())); + return super.toTag(tag); + } + + @Override + public void tick() { + if (!isEmpty()) { + this.age++; + if (age > maxAge) { + this.age = 0; + } + } + } +} diff --git a/src/main/java/ru/betterend/blocks/entities/render/EndCrystalRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/EndCrystalRenderer.java index 7179aa88..2ff24d70 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/EndCrystalRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/EndCrystalRenderer.java @@ -1,94 +1,94 @@ -package ru.betterend.blocks.entities.render; - -import net.minecraft.client.model.ModelPart; -import net.minecraft.client.render.OverlayTexture; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.client.render.VertexConsumer; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Matrix3f; -import net.minecraft.util.math.Matrix4f; -import net.minecraft.util.math.Quaternion; - -public class EndCrystalRenderer { - private static final Identifier CRYSTAL_TEXTURE = new Identifier("textures/entity/end_crystal/end_crystal.png"); - private static final Identifier CRYSTAL_BEAM_TEXTURE = new Identifier("textures/entity/end_crystal/end_crystal_beam.png"); - private static final RenderLayer CRYSTAL_BEAM_LAYER; - private static final RenderLayer END_CRYSTAL; - private static final ModelPart CORE; - private static final ModelPart FRAME; - private static final int AGE_CYCLE = 240; - private static final float SINE_45_DEGREES; - - public static void render(int age, int maxAge, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumerProvider, int light) { - float k = (float) AGE_CYCLE / maxAge; - float rotation = (age * k + tickDelta) * 3.0F; - VertexConsumer vertexConsumer = vertexConsumerProvider.getBuffer(END_CRYSTAL); - matrices.push(); - matrices.scale(0.8F, 0.8F, 0.8F); - matrices.translate(0.0D, -0.5D, 0.0D); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); - matrices.translate(0.0D, 0.8F, 0.0D); - matrices.multiply(new Quaternion(new Vector3f(SINE_45_DEGREES, 0.0F, SINE_45_DEGREES), 60.0F, true)); - FRAME.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV); - matrices.scale(0.875F, 0.875F, 0.875F); - matrices.multiply(new Quaternion(new Vector3f(SINE_45_DEGREES, 0.0F, SINE_45_DEGREES), 60.0F, true)); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); - FRAME.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV); - matrices.scale(0.875F, 0.875F, 0.875F); - matrices.multiply(new Quaternion(new Vector3f(SINE_45_DEGREES, 0.0F, SINE_45_DEGREES), 60.0F, true)); - matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); - CORE.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV); - matrices.pop(); - } - - public static void renderBeam(BlockPos start, BlockPos end, float tickDelta, int age, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) { - float dx = start.getX() - end.getX() + 1.0F; - float dy = start.getY() - end.getY() + 1.0F; - float dz = start.getZ() - end.getZ() + 1.0F; - float f = MathHelper.sqrt(dx * dx + dz * dz); - float g = MathHelper.sqrt(dx * dx + dy * dy + dz * dz); - matrices.push(); - matrices.translate(0.0D, 2.0D, 0.0D); - matrices.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion((float)(-Math.atan2((double)dz, (double)dx)) - 1.5707964F)); - matrices.multiply(Vector3f.POSITIVE_X.getRadialQuaternion((float)(-Math.atan2((double)f, (double)dy)) - 1.5707964F)); - VertexConsumer vertexConsumer = vertexConsumers.getBuffer(CRYSTAL_BEAM_LAYER); - float h = 0.0F - ((float)age + tickDelta) * 0.01F; - float i = MathHelper.sqrt(dx * dx + dy * dy + dz * dz) / 32.0F - ((float)age + tickDelta) * 0.01F; - float k = 0.0F; - float l = 0.75F; - float m = 0.0F; - MatrixStack.Entry entry = matrices.peek(); - Matrix4f matrix4f = entry.getModel(); - Matrix3f matrix3f = entry.getNormal(); - - for(int n = 1; n <= 8; ++n) { - float o = MathHelper.sin((float)n * 6.2831855F / 8.0F) * 0.75F; - float p = MathHelper.cos((float)n * 6.2831855F / 8.0F) * 0.75F; - float q = (float)n / 8.0F; - vertexConsumer.vertex(matrix4f, k * 0.2F, l * 0.2F, 0.0F).color(0, 0, 0, 255).texture(m, h).overlay(OverlayTexture.DEFAULT_UV).light(light).normal(matrix3f, 0.0F, -1.0F, 0.0F).next(); - vertexConsumer.vertex(matrix4f, k, l, g).color(255, 255, 255, 255).texture(m, i).overlay(OverlayTexture.DEFAULT_UV).light(light).normal(matrix3f, 0.0F, -1.0F, 0.0F).next(); - vertexConsumer.vertex(matrix4f, o, p, g).color(255, 255, 255, 255).texture(q, i).overlay(OverlayTexture.DEFAULT_UV).light(light).normal(matrix3f, 0.0F, -1.0F, 0.0F).next(); - vertexConsumer.vertex(matrix4f, o * 0.2F, p * 0.2F, 0.0F).color(0, 0, 0, 255).texture(q, h).overlay(OverlayTexture.DEFAULT_UV).light(light).normal(matrix3f, 0.0F, -1.0F, 0.0F).next(); - k = o; - l = p; - m = q; - } - - matrices.pop(); - } - - static { - END_CRYSTAL = RenderLayer.getEntityCutoutNoCull(CRYSTAL_TEXTURE); - CRYSTAL_BEAM_LAYER = RenderLayer.getEntitySmoothCutout(CRYSTAL_BEAM_TEXTURE); - SINE_45_DEGREES = (float) Math.sin(0.7853981633974483D); - FRAME = new ModelPart(64, 32, 0, 0); - FRAME.addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F); - CORE = new ModelPart(64, 32, 32, 0); - CORE.addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F); - } -} +package ru.betterend.blocks.entities.render; + +import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Matrix3f; +import net.minecraft.util.math.Matrix4f; +import net.minecraft.util.math.Quaternion; + +public class EndCrystalRenderer { + private static final Identifier CRYSTAL_TEXTURE = new Identifier("textures/entity/end_crystal/end_crystal.png"); + private static final Identifier CRYSTAL_BEAM_TEXTURE = new Identifier("textures/entity/end_crystal/end_crystal_beam.png"); + private static final RenderLayer CRYSTAL_BEAM_LAYER; + private static final RenderLayer END_CRYSTAL; + private static final ModelPart CORE; + private static final ModelPart FRAME; + private static final int AGE_CYCLE = 240; + private static final float SINE_45_DEGREES; + + public static void render(int age, int maxAge, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumerProvider, int light) { + float k = (float) AGE_CYCLE / maxAge; + float rotation = (age * k + tickDelta) * 3.0F; + VertexConsumer vertexConsumer = vertexConsumerProvider.getBuffer(END_CRYSTAL); + matrices.push(); + matrices.scale(0.8F, 0.8F, 0.8F); + matrices.translate(0.0D, -0.5D, 0.0D); + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); + matrices.translate(0.0D, 0.8F, 0.0D); + matrices.multiply(new Quaternion(new Vector3f(SINE_45_DEGREES, 0.0F, SINE_45_DEGREES), 60.0F, true)); + FRAME.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV); + matrices.scale(0.875F, 0.875F, 0.875F); + matrices.multiply(new Quaternion(new Vector3f(SINE_45_DEGREES, 0.0F, SINE_45_DEGREES), 60.0F, true)); + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); + FRAME.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV); + matrices.scale(0.875F, 0.875F, 0.875F); + matrices.multiply(new Quaternion(new Vector3f(SINE_45_DEGREES, 0.0F, SINE_45_DEGREES), 60.0F, true)); + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation)); + CORE.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV); + matrices.pop(); + } + + public static void renderBeam(BlockPos start, BlockPos end, float tickDelta, int age, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) { + float dx = start.getX() - end.getX() + 1.0F; + float dy = start.getY() - end.getY() + 1.0F; + float dz = start.getZ() - end.getZ() + 1.0F; + float f = MathHelper.sqrt(dx * dx + dz * dz); + float g = MathHelper.sqrt(dx * dx + dy * dy + dz * dz); + matrices.push(); + matrices.translate(0.0D, 2.0D, 0.0D); + matrices.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion((float)(-Math.atan2((double)dz, (double)dx)) - 1.5707964F)); + matrices.multiply(Vector3f.POSITIVE_X.getRadialQuaternion((float)(-Math.atan2((double)f, (double)dy)) - 1.5707964F)); + VertexConsumer vertexConsumer = vertexConsumers.getBuffer(CRYSTAL_BEAM_LAYER); + float h = 0.0F - ((float)age + tickDelta) * 0.01F; + float i = MathHelper.sqrt(dx * dx + dy * dy + dz * dz) / 32.0F - ((float)age + tickDelta) * 0.01F; + float k = 0.0F; + float l = 0.75F; + float m = 0.0F; + MatrixStack.Entry entry = matrices.peek(); + Matrix4f matrix4f = entry.getModel(); + Matrix3f matrix3f = entry.getNormal(); + + for(int n = 1; n <= 8; ++n) { + float o = MathHelper.sin((float)n * 6.2831855F / 8.0F) * 0.75F; + float p = MathHelper.cos((float)n * 6.2831855F / 8.0F) * 0.75F; + float q = (float)n / 8.0F; + vertexConsumer.vertex(matrix4f, k * 0.2F, l * 0.2F, 0.0F).color(0, 0, 0, 255).texture(m, h).overlay(OverlayTexture.DEFAULT_UV).light(light).normal(matrix3f, 0.0F, -1.0F, 0.0F).next(); + vertexConsumer.vertex(matrix4f, k, l, g).color(255, 255, 255, 255).texture(m, i).overlay(OverlayTexture.DEFAULT_UV).light(light).normal(matrix3f, 0.0F, -1.0F, 0.0F).next(); + vertexConsumer.vertex(matrix4f, o, p, g).color(255, 255, 255, 255).texture(q, i).overlay(OverlayTexture.DEFAULT_UV).light(light).normal(matrix3f, 0.0F, -1.0F, 0.0F).next(); + vertexConsumer.vertex(matrix4f, o * 0.2F, p * 0.2F, 0.0F).color(0, 0, 0, 255).texture(q, h).overlay(OverlayTexture.DEFAULT_UV).light(light).normal(matrix3f, 0.0F, -1.0F, 0.0F).next(); + k = o; + l = p; + m = q; + } + + matrices.pop(); + } + + static { + END_CRYSTAL = RenderLayer.getEntityCutoutNoCull(CRYSTAL_TEXTURE); + CRYSTAL_BEAM_LAYER = RenderLayer.getEntitySmoothCutout(CRYSTAL_BEAM_TEXTURE); + SINE_45_DEGREES = (float) Math.sin(0.7853981633974483D); + FRAME = new ModelPart(64, 32, 0, 0); + FRAME.addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F); + CORE = new ModelPart(64, 32, 32, 0); + CORE.addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F); + } +} diff --git a/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java index 67f78c17..e3dc9a03 100644 --- a/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java +++ b/src/main/java/ru/betterend/blocks/entities/render/PedestalItemRenderer.java @@ -1,75 +1,75 @@ -package ru.betterend.blocks.entities.render; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.block.BlockState; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.client.render.VertexConsumer; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; -import net.minecraft.client.render.block.entity.BlockEntityRenderer; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.json.ModelTransformation; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.util.DyeColor; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; -import ru.betterend.blocks.EternalPedestal; -import ru.betterend.blocks.basis.BlockPedestal; -import ru.betterend.blocks.entities.PedestalBlockEntity; -import ru.betterend.client.render.BeamRenderer; -import ru.betterend.registry.EndBlocks; - -@Environment(EnvType.CLIENT) -public class PedestalItemRenderer extends BlockEntityRenderer { - private static final Identifier BEAM_TEXTURE = new Identifier("textures/entity/end_gateway_beam.png"); - - public PedestalItemRenderer(BlockEntityRenderDispatcher dispatcher) { - super(dispatcher); - } - - @Override - public void render(PedestalBlockEntity blockEntity, float tickDelta, MatrixStack matrices, - VertexConsumerProvider vertexConsumers, int light, int overlay) { - - if (blockEntity.isEmpty()) return; - - BlockState state = blockEntity.getWorld().getBlockState(blockEntity.getPos()); - ItemStack activeItem = blockEntity.getStack(0); - matrices.push(); - MinecraftClient minecraft = MinecraftClient.getInstance(); - BakedModel model = minecraft.getItemRenderer().getHeldItemModel(activeItem, blockEntity.getWorld(), null); - Vector3f translate = model.getTransformation().ground.translation; - BlockPedestal pedestal = (BlockPedestal) state.getBlock(); - matrices.translate(translate.getX(), translate.getY(), translate.getZ()); - matrices.translate(0.5, pedestal.getHeight(state), 0.5); - if (activeItem.getItem() instanceof BlockItem) { - matrices.scale(1.5F, 1.5F, 1.5F); - } else { - matrices.scale(1.25F, 1.25F, 1.25F); - } - - float rotation = (blockEntity.getAge() + tickDelta) / 25.0F + 6.0F; - matrices.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion(rotation)); - if (state.isOf(EndBlocks.ETERNAL_PEDESTAL) && state.get(EternalPedestal.ACTIVATED)) { - float altitude = MathHelper.sin((blockEntity.getAge() + tickDelta) / 10.0F) * 0.1F + 0.1F; - matrices.translate(0.0D, altitude, 0.0D); - float[] colors = DyeColor.MAGENTA.getColorComponents(); - int y = blockEntity.getPos().getY(); - VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(BEAM_TEXTURE, true)); - BeamRenderer.renderLightBeam(matrices, vertexConsumer, tickDelta, -y, 1024 - y, colors, 0.25F, 0.15F, 0.2F); - } - - if (activeItem.getItem() == Items.END_CRYSTAL) { - EndCrystalRenderer.render(blockEntity.getAge(), blockEntity.getMaxAge(), tickDelta, matrices, vertexConsumers, light); - } else { - minecraft.getItemRenderer().renderItem(activeItem, ModelTransformation.Mode.GROUND, false, matrices, vertexConsumers, light, overlay, model); - } - matrices.pop(); - } -} +package ru.betterend.blocks.entities.render; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.DyeColor; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.MathHelper; +import ru.betterend.blocks.EternalPedestal; +import ru.betterend.blocks.basis.BlockPedestal; +import ru.betterend.blocks.entities.PedestalBlockEntity; +import ru.betterend.client.render.BeamRenderer; +import ru.betterend.registry.EndBlocks; + +@Environment(EnvType.CLIENT) +public class PedestalItemRenderer extends BlockEntityRenderer { + private static final Identifier BEAM_TEXTURE = new Identifier("textures/entity/end_gateway_beam.png"); + + public PedestalItemRenderer(BlockEntityRenderDispatcher dispatcher) { + super(dispatcher); + } + + @Override + public void render(PedestalBlockEntity blockEntity, float tickDelta, MatrixStack matrices, + VertexConsumerProvider vertexConsumers, int light, int overlay) { + + if (blockEntity.isEmpty()) return; + + BlockState state = blockEntity.getWorld().getBlockState(blockEntity.getPos()); + ItemStack activeItem = blockEntity.getStack(0); + matrices.push(); + MinecraftClient minecraft = MinecraftClient.getInstance(); + BakedModel model = minecraft.getItemRenderer().getHeldItemModel(activeItem, blockEntity.getWorld(), null); + Vector3f translate = model.getTransformation().ground.translation; + BlockPedestal pedestal = (BlockPedestal) state.getBlock(); + matrices.translate(translate.getX(), translate.getY(), translate.getZ()); + matrices.translate(0.5, pedestal.getHeight(state), 0.5); + if (activeItem.getItem() instanceof BlockItem) { + matrices.scale(1.5F, 1.5F, 1.5F); + } else { + matrices.scale(1.25F, 1.25F, 1.25F); + } + + float rotation = (blockEntity.getAge() + tickDelta) / 25.0F + 6.0F; + matrices.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion(rotation)); + if (state.isOf(EndBlocks.ETERNAL_PEDESTAL) && state.get(EternalPedestal.ACTIVATED)) { + float altitude = MathHelper.sin((blockEntity.getAge() + tickDelta) / 10.0F) * 0.1F + 0.1F; + matrices.translate(0.0D, altitude, 0.0D); + float[] colors = DyeColor.MAGENTA.getColorComponents(); + int y = blockEntity.getPos().getY(); + VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(BEAM_TEXTURE, true)); + BeamRenderer.renderLightBeam(matrices, vertexConsumer, tickDelta, -y, 1024 - y, colors, 0.25F, 0.15F, 0.2F); + } + + if (activeItem.getItem() == Items.END_CRYSTAL) { + EndCrystalRenderer.render(blockEntity.getAge(), blockEntity.getMaxAge(), tickDelta, matrices, vertexConsumers, light); + } else { + minecraft.getItemRenderer().renderItem(activeItem, ModelTransformation.Mode.GROUND, false, matrices, vertexConsumers, light, overlay, model); + } + matrices.pop(); + } +} diff --git a/src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java b/src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java index 5f17e7a7..3339920f 100644 --- a/src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java +++ b/src/main/java/ru/betterend/client/gui/EndStoneSmelterRecipeBookScreen.java @@ -1,102 +1,102 @@ -package ru.betterend.client.gui; - -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import com.mojang.blaze3d.systems.RenderSystem; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.recipebook.BlastFurnaceRecipeBookScreen; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.Recipe; -import net.minecraft.screen.slot.Slot; -import net.minecraft.util.collection.DefaultedList; -import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; - -@Environment(EnvType.CLIENT) -public class EndStoneSmelterRecipeBookScreen extends BlastFurnaceRecipeBookScreen { - private Iterator fuelIterator; - private Set fuels; - private Slot fuelSlot; - private Item currentItem; - private float frameTime; - - @Override - protected Set getAllowedFuels() { - return EndStoneSmelterBlockEntity.availableFuels().keySet(); - } - - @Override - public void slotClicked(Slot slot) { - super.slotClicked(slot); - if (slot != null && slot.id < this.craftingScreenHandler.getCraftingSlotCount()) { - this.fuelSlot = null; - } - } - - @Override - public void showGhostRecipe(Recipe recipe, List slots) { - this.ghostSlots.reset(); - ItemStack result = recipe.getOutput(); - this.ghostSlots.setRecipe(recipe); - this.ghostSlots.addSlot(Ingredient.ofStacks(result), (slots.get(3)).x, (slots.get(3)).y); - DefaultedList inputs = recipe.getPreviewInputs(); - Iterator iterator = inputs.iterator(); - for(int i = 0; i < 2; i++) { - if (!iterator.hasNext()) { - return; - } - Ingredient ingredient = iterator.next(); - if (!ingredient.isEmpty()) { - Slot slot = slots.get(i); - this.ghostSlots.addSlot(ingredient, slot.x, slot.y); - } - } - this.fuelSlot = slots.get(2); - if (this.fuels == null) { - this.fuels = this.getAllowedFuels(); - } - - this.fuelIterator = this.fuels.iterator(); - this.currentItem = null; - } - - @Override - public void drawGhostSlots(MatrixStack matrices, int x, int y, boolean bl, float f) { - this.ghostSlots.draw(matrices, client, x, y, bl, f); - if (fuelSlot != null) { - if (!Screen.hasControlDown()) { - this.frameTime += f; - } - - int slotX = this.fuelSlot.x + x; - int slotY = this.fuelSlot.y + y; - DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822018048); - this.client.getItemRenderer().renderInGuiWithOverrides(client.player, this.getItem().getDefaultStack(), slotX, slotY); - RenderSystem.depthFunc(516); - DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822083583); - RenderSystem.depthFunc(515); - } - } - - private Item getItem() { - if (this.currentItem == null || this.frameTime > 30.0F) { - this.frameTime = 0.0F; - if (this.fuelIterator == null || !this.fuelIterator.hasNext()) { - if (this.fuels == null) { - this.fuels = this.getAllowedFuels(); - } - this.fuelIterator = this.fuels.iterator(); - } - this.currentItem = this.fuelIterator.next(); - } - return this.currentItem; - } -} +package ru.betterend.client.gui; + +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import com.mojang.blaze3d.systems.RenderSystem; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.recipebook.BlastFurnaceRecipeBookScreen; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.Recipe; +import net.minecraft.screen.slot.Slot; +import net.minecraft.util.collection.DefaultedList; +import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; + +@Environment(EnvType.CLIENT) +public class EndStoneSmelterRecipeBookScreen extends BlastFurnaceRecipeBookScreen { + private Iterator fuelIterator; + private Set fuels; + private Slot fuelSlot; + private Item currentItem; + private float frameTime; + + @Override + protected Set getAllowedFuels() { + return EndStoneSmelterBlockEntity.availableFuels().keySet(); + } + + @Override + public void slotClicked(Slot slot) { + super.slotClicked(slot); + if (slot != null && slot.id < this.craftingScreenHandler.getCraftingSlotCount()) { + this.fuelSlot = null; + } + } + + @Override + public void showGhostRecipe(Recipe recipe, List slots) { + this.ghostSlots.reset(); + ItemStack result = recipe.getOutput(); + this.ghostSlots.setRecipe(recipe); + this.ghostSlots.addSlot(Ingredient.ofStacks(result), (slots.get(3)).x, (slots.get(3)).y); + DefaultedList inputs = recipe.getPreviewInputs(); + Iterator iterator = inputs.iterator(); + for(int i = 0; i < 2; i++) { + if (!iterator.hasNext()) { + return; + } + Ingredient ingredient = iterator.next(); + if (!ingredient.isEmpty()) { + Slot slot = slots.get(i); + this.ghostSlots.addSlot(ingredient, slot.x, slot.y); + } + } + this.fuelSlot = slots.get(2); + if (this.fuels == null) { + this.fuels = this.getAllowedFuels(); + } + + this.fuelIterator = this.fuels.iterator(); + this.currentItem = null; + } + + @Override + public void drawGhostSlots(MatrixStack matrices, int x, int y, boolean bl, float f) { + this.ghostSlots.draw(matrices, client, x, y, bl, f); + if (fuelSlot != null) { + if (!Screen.hasControlDown()) { + this.frameTime += f; + } + + int slotX = this.fuelSlot.x + x; + int slotY = this.fuelSlot.y + y; + DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822018048); + this.client.getItemRenderer().renderInGuiWithOverrides(client.player, this.getItem().getDefaultStack(), slotX, slotY); + RenderSystem.depthFunc(516); + DrawableHelper.fill(matrices, slotX, slotY, slotX + 16, slotY + 16, 822083583); + RenderSystem.depthFunc(515); + } + } + + private Item getItem() { + if (this.currentItem == null || this.frameTime > 30.0F) { + this.frameTime = 0.0F; + if (this.fuelIterator == null || !this.fuelIterator.hasNext()) { + if (this.fuels == null) { + this.fuels = this.getAllowedFuels(); + } + this.fuelIterator = this.fuels.iterator(); + } + this.currentItem = this.fuelIterator.next(); + } + return this.currentItem; + } +} diff --git a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java index 1bd7e27d..8c81c7ff 100644 --- a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java +++ b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreen.java @@ -1,130 +1,130 @@ -package ru.betterend.client.gui; - -import com.mojang.blaze3d.systems.RenderSystem; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.gui.screen.ingame.HandledScreen; -import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; -import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget; -import net.minecraft.client.gui.widget.TexturedButtonWidget; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.slot.Slot; -import net.minecraft.screen.slot.SlotActionType; -import net.minecraft.text.StringVisitable; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; -import ru.betterend.BetterEnd; - -@Environment(EnvType.CLIENT) -public class EndStoneSmelterScreen extends HandledScreen implements RecipeBookProvider { - - private final static Identifier RECIPE_BUTTON_TEXTURE = new Identifier("textures/gui/recipe_button.png"); - private final static Identifier BACKGROUND_TEXTURE = BetterEnd.makeID("textures/gui/smelter_gui.png"); - - public final EndStoneSmelterRecipeBookScreen recipeBook; - private boolean narrow; - - public EndStoneSmelterScreen(EndStoneSmelterScreenHandler handler, PlayerInventory inventory, Text title) { - super(handler, inventory, title); - this.recipeBook = new EndStoneSmelterRecipeBookScreen(); - } - - public void init() { - super.init(); - this.narrow = this.width < 379; - this.recipeBook.initialize(width, height, client, narrow, handler); - this.x = this.recipeBook.findLeftEdge(narrow, width, backgroundWidth); - this.addButton(new TexturedButtonWidget(x + 20, height / 2 - 49, 20, 18, 0, 0, 19, RECIPE_BUTTON_TEXTURE, (buttonWidget) -> { - this.recipeBook.reset(narrow); - this.recipeBook.toggleOpen(); - this.x = this.recipeBook.findLeftEdge(narrow, width, backgroundWidth); - ((TexturedButtonWidget) buttonWidget).setPos(this.x + 20, height / 2 - 49); - })); - this.titleX = (this.backgroundWidth - this.textRenderer.getWidth((StringVisitable)this.title)) / 2; - } - - @Override - public void tick() { - super.tick(); - this.recipeBook.update(); - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.renderBackground(matrices); - if (this.recipeBook.isOpen() && this.narrow) { - this.drawBackground(matrices, delta, mouseX, mouseY); - this.recipeBook.render(matrices, mouseX, mouseY, delta); - } else { - this.recipeBook.render(matrices, mouseX, mouseY, delta); - super.render(matrices, mouseX, mouseY, delta); - this.recipeBook.drawGhostSlots(matrices, x, y, true, delta); - } - - this.drawMouseoverTooltip(matrices, mouseX, mouseY); - this.recipeBook.drawTooltip(matrices, x, y, mouseX, mouseY); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.recipeBook.mouseClicked(mouseX, mouseY, button)) { - return true; - } else { - return this.narrow && this.recipeBook.isOpen() ? true : super.mouseClicked(mouseX, mouseY, button); - } - } - - @Override - protected void onMouseClick(Slot slot, int invSlot, int clickData, SlotActionType actionType) { - super.onMouseClick(slot, invSlot, clickData, actionType); - this.recipeBook.slotClicked(slot); - } - - @Override - public boolean keyPressed(int keyCode, int scanCode, int modifiers) { - return this.recipeBook.keyPressed(keyCode, scanCode, modifiers) ? false : super.keyPressed(keyCode, scanCode, modifiers); - } - - @Override - protected boolean isClickOutsideBounds(double mouseX, double mouseY, int left, int top, int button) { - boolean isMouseOut = mouseX < left || mouseY < top || mouseX >= (left + backgroundWidth) || mouseY >= (top + backgroundHeight); - return this.recipeBook.isClickOutsideBounds(mouseX, mouseY, x, y, backgroundWidth, backgroundHeight, button) && isMouseOut; - } - - @Override - public boolean charTyped(char chr, int keyCode) { - return this.recipeBook.charTyped(chr, keyCode) ? true : super.charTyped(chr, keyCode); - } - - @Override - public void refreshRecipeBook() { - this.recipeBook.refresh(); - } - - @Override - public RecipeBookWidget getRecipeBookWidget() { - return this.recipeBook; - } - - @Override - protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int mouseY) { - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - this.client.getTextureManager().bindTexture(BACKGROUND_TEXTURE); - this.drawTexture(matrices, x, y, 0, 0, backgroundWidth, backgroundHeight); - int p; - if (handler.isBurning()) { - p = handler.getFuelProgress(); - this.drawTexture(matrices, x + 56, y + 36 + 12 - p, 176, 12 - p, 14, p + 1); - } - p = handler.getSmeltProgress(); - this.drawTexture(matrices, x + 92, y + 34, 176, 14, p + 1, 16); - } - - @Override - public void removed() { - this.recipeBook.close(); - super.removed(); - } -} +package ru.betterend.client.gui; + +import com.mojang.blaze3d.systems.RenderSystem; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; +import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget; +import net.minecraft.client.gui.widget.TexturedButtonWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; +import net.minecraft.text.StringVisitable; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import ru.betterend.BetterEnd; + +@Environment(EnvType.CLIENT) +public class EndStoneSmelterScreen extends HandledScreen implements RecipeBookProvider { + + private final static Identifier RECIPE_BUTTON_TEXTURE = new Identifier("textures/gui/recipe_button.png"); + private final static Identifier BACKGROUND_TEXTURE = BetterEnd.makeID("textures/gui/smelter_gui.png"); + + public final EndStoneSmelterRecipeBookScreen recipeBook; + private boolean narrow; + + public EndStoneSmelterScreen(EndStoneSmelterScreenHandler handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + this.recipeBook = new EndStoneSmelterRecipeBookScreen(); + } + + public void init() { + super.init(); + this.narrow = this.width < 379; + this.recipeBook.initialize(width, height, client, narrow, handler); + this.x = this.recipeBook.findLeftEdge(narrow, width, backgroundWidth); + this.addButton(new TexturedButtonWidget(x + 20, height / 2 - 49, 20, 18, 0, 0, 19, RECIPE_BUTTON_TEXTURE, (buttonWidget) -> { + this.recipeBook.reset(narrow); + this.recipeBook.toggleOpen(); + this.x = this.recipeBook.findLeftEdge(narrow, width, backgroundWidth); + ((TexturedButtonWidget) buttonWidget).setPos(this.x + 20, height / 2 - 49); + })); + this.titleX = (this.backgroundWidth - this.textRenderer.getWidth((StringVisitable)this.title)) / 2; + } + + @Override + public void tick() { + super.tick(); + this.recipeBook.update(); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.renderBackground(matrices); + if (this.recipeBook.isOpen() && this.narrow) { + this.drawBackground(matrices, delta, mouseX, mouseY); + this.recipeBook.render(matrices, mouseX, mouseY, delta); + } else { + this.recipeBook.render(matrices, mouseX, mouseY, delta); + super.render(matrices, mouseX, mouseY, delta); + this.recipeBook.drawGhostSlots(matrices, x, y, true, delta); + } + + this.drawMouseoverTooltip(matrices, mouseX, mouseY); + this.recipeBook.drawTooltip(matrices, x, y, mouseX, mouseY); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.recipeBook.mouseClicked(mouseX, mouseY, button)) { + return true; + } else { + return this.narrow && this.recipeBook.isOpen() ? true : super.mouseClicked(mouseX, mouseY, button); + } + } + + @Override + protected void onMouseClick(Slot slot, int invSlot, int clickData, SlotActionType actionType) { + super.onMouseClick(slot, invSlot, clickData, actionType); + this.recipeBook.slotClicked(slot); + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + return this.recipeBook.keyPressed(keyCode, scanCode, modifiers) ? false : super.keyPressed(keyCode, scanCode, modifiers); + } + + @Override + protected boolean isClickOutsideBounds(double mouseX, double mouseY, int left, int top, int button) { + boolean isMouseOut = mouseX < left || mouseY < top || mouseX >= (left + backgroundWidth) || mouseY >= (top + backgroundHeight); + return this.recipeBook.isClickOutsideBounds(mouseX, mouseY, x, y, backgroundWidth, backgroundHeight, button) && isMouseOut; + } + + @Override + public boolean charTyped(char chr, int keyCode) { + return this.recipeBook.charTyped(chr, keyCode) ? true : super.charTyped(chr, keyCode); + } + + @Override + public void refreshRecipeBook() { + this.recipeBook.refresh(); + } + + @Override + public RecipeBookWidget getRecipeBookWidget() { + return this.recipeBook; + } + + @Override + protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int mouseY) { + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + this.client.getTextureManager().bindTexture(BACKGROUND_TEXTURE); + this.drawTexture(matrices, x, y, 0, 0, backgroundWidth, backgroundHeight); + int p; + if (handler.isBurning()) { + p = handler.getFuelProgress(); + this.drawTexture(matrices, x + 56, y + 36 + 12 - p, 176, 12 - p, 14, p + 1); + } + p = handler.getSmeltProgress(); + this.drawTexture(matrices, x + 92, y + 34, 176, 14, p + 1, 16); + } + + @Override + public void removed() { + this.recipeBook.close(); + super.removed(); + } +} diff --git a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java index 69aaa0f8..3bb71d6f 100644 --- a/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java +++ b/src/main/java/ru/betterend/client/gui/EndStoneSmelterScreenHandler.java @@ -1,186 +1,186 @@ -package ru.betterend.client.gui; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Inventory; -import net.minecraft.inventory.SimpleInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeFinder; -import net.minecraft.recipe.RecipeInputProvider; -import net.minecraft.recipe.book.RecipeBookCategory; -import net.minecraft.screen.AbstractRecipeScreenHandler; -import net.minecraft.screen.ArrayPropertyDelegate; -import net.minecraft.screen.PropertyDelegate; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.screen.slot.Slot; -import net.minecraft.world.World; -import ru.betterend.BetterEnd; -import ru.betterend.blocks.EndStoneSmelter; -import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; -import ru.betterend.client.gui.slot.SmelterFuelSlot; -import ru.betterend.client.gui.slot.SmelterOutputSlot; -import ru.betterend.recipe.builders.AlloyingRecipe; - -public class EndStoneSmelterScreenHandler extends AbstractRecipeScreenHandler { - - public final static ScreenHandlerType HANDLER_TYPE = ScreenHandlerRegistry.registerSimple( - BetterEnd.makeID(EndStoneSmelter.ID), EndStoneSmelterScreenHandler::new); - - private final Inventory inventory; - private final PropertyDelegate propertyDelegate; - protected final World world; - - public EndStoneSmelterScreenHandler(int syncId, PlayerInventory playerInventory) { - this(syncId, playerInventory, new SimpleInventory(4), new ArrayPropertyDelegate(4)); - } - - public EndStoneSmelterScreenHandler(int syncId, PlayerInventory playerInventory, Inventory inventory, PropertyDelegate propertyDelegate) { - super(HANDLER_TYPE, syncId); - this.inventory = inventory; - this.propertyDelegate = propertyDelegate; - this.world = playerInventory.player.world; - - this.addProperties(propertyDelegate); - this.addSlot(new Slot(inventory, 0, 45, 17)); - this.addSlot(new Slot(inventory, 1, 67, 17)); - this.addSlot(new SmelterFuelSlot(this, inventory, 2, 56, 53)); - this.addSlot(new SmelterOutputSlot(playerInventory.player, inventory, 3, 129, 35)); - - for(int i = 0; i < 3; ++i) { - for(int j = 0; j < 9; ++j) { - this.addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - for(int i = 0; i < 9; ++i) { - this.addSlot(new Slot(playerInventory, i, 8 + i * 18, 142)); - } - } - - @Override - public void populateRecipeFinder(RecipeFinder finder) { - if (inventory instanceof RecipeInputProvider) { - ((RecipeInputProvider) inventory).provideRecipeInputs(finder); - } - } - - @Override - public void clearCraftingSlots() { - this.inventory.clear(); - } - - @Override - public boolean matches(Recipe recipe) { - return recipe.matches(this.inventory, this.world); - } - - @Override - public int getCraftingResultSlotIndex() { - return 3; - } - - @Override - public int getCraftingWidth() { - return 2; - } - - @Override - public int getCraftingHeight() { - return 1; - } - - @Override - public int getCraftingSlotCount() { - return 4; - } - - @Override - public RecipeBookCategory getCategory() { - return RecipeBookCategory.BLAST_FURNACE; - } - - @Override - public boolean canUse(PlayerEntity player) { - return this.inventory.canPlayerUse(player); - } - - protected boolean isSmeltable(ItemStack itemStack) { - return this.world.getRecipeManager().getFirstMatch(AlloyingRecipe.TYPE, new SimpleInventory(new ItemStack[]{itemStack}), this.world).isPresent(); - } - - public boolean isFuel(ItemStack itemStack) { - return EndStoneSmelterBlockEntity.canUseAsFuel(itemStack); - } - - @Override - public ItemStack transferSlot(PlayerEntity player, int index) { - ItemStack itemStack = ItemStack.EMPTY; - Slot slot = this.slots.get(index); - if (slot != null && slot.hasStack()) { - ItemStack itemStack2 = slot.getStack(); - itemStack = itemStack2.copy(); - if (index == 3) { - if (insertItem(itemStack2, 4, 40, true)) { - return ItemStack.EMPTY; - } - slot.onStackChanged(itemStack2, itemStack); - } else if (index != 2 && index != 1 && index != 0) { - if (isSmeltable(itemStack2)) { - if (!insertItem(itemStack2, 0, 2, false)) { - return ItemStack.EMPTY; - } - } else if (isFuel(itemStack2)) { - if (!this.insertItem(itemStack2, 2, 3, false)) { - return ItemStack.EMPTY; - } - } else if (index >= 4 && index < 31) { - if (!insertItem(itemStack2, 31, 40, false)) { - return ItemStack.EMPTY; - } - } else if (index >= 31 && index < 40 && !insertItem(itemStack2, 4, 31, false)) { - return ItemStack.EMPTY; - } - } else if (!insertItem(itemStack2, 4, 40, false)) { - return ItemStack.EMPTY; - } - - if (itemStack2.isEmpty()) { - slot.setStack(ItemStack.EMPTY); - } else { - slot.markDirty(); - } - - if (itemStack2.getCount() == itemStack.getCount()) { - return ItemStack.EMPTY; - } - - slot.onTakeItem(player, itemStack2); - } - - return itemStack; - } - - @Environment(EnvType.CLIENT) - public int getSmeltProgress() { - int time = this.propertyDelegate.get(2); - int timeTotal = this.propertyDelegate.get(3); - return timeTotal != 0 && time != 0 ? time * 24 / timeTotal : 0; - } - - @Environment(EnvType.CLIENT) - public int getFuelProgress() { - int fuelTime = this.propertyDelegate.get(1); - if (fuelTime == 0) { - fuelTime = 200; - } - return this.propertyDelegate.get(0) * 13 / fuelTime; - } - - @Environment(EnvType.CLIENT) - public boolean isBurning() { - return this.propertyDelegate.get(0) > 0; - } -} +package ru.betterend.client.gui; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.inventory.SimpleInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeFinder; +import net.minecraft.recipe.RecipeInputProvider; +import net.minecraft.recipe.book.RecipeBookCategory; +import net.minecraft.screen.AbstractRecipeScreenHandler; +import net.minecraft.screen.ArrayPropertyDelegate; +import net.minecraft.screen.PropertyDelegate; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.screen.slot.Slot; +import net.minecraft.world.World; +import ru.betterend.BetterEnd; +import ru.betterend.blocks.EndStoneSmelter; +import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; +import ru.betterend.client.gui.slot.SmelterFuelSlot; +import ru.betterend.client.gui.slot.SmelterOutputSlot; +import ru.betterend.recipe.builders.AlloyingRecipe; + +public class EndStoneSmelterScreenHandler extends AbstractRecipeScreenHandler { + + public final static ScreenHandlerType HANDLER_TYPE = ScreenHandlerRegistry.registerSimple( + BetterEnd.makeID(EndStoneSmelter.ID), EndStoneSmelterScreenHandler::new); + + private final Inventory inventory; + private final PropertyDelegate propertyDelegate; + protected final World world; + + public EndStoneSmelterScreenHandler(int syncId, PlayerInventory playerInventory) { + this(syncId, playerInventory, new SimpleInventory(4), new ArrayPropertyDelegate(4)); + } + + public EndStoneSmelterScreenHandler(int syncId, PlayerInventory playerInventory, Inventory inventory, PropertyDelegate propertyDelegate) { + super(HANDLER_TYPE, syncId); + this.inventory = inventory; + this.propertyDelegate = propertyDelegate; + this.world = playerInventory.player.world; + + this.addProperties(propertyDelegate); + this.addSlot(new Slot(inventory, 0, 45, 17)); + this.addSlot(new Slot(inventory, 1, 67, 17)); + this.addSlot(new SmelterFuelSlot(this, inventory, 2, 56, 53)); + this.addSlot(new SmelterOutputSlot(playerInventory.player, inventory, 3, 129, 35)); + + for(int i = 0; i < 3; ++i) { + for(int j = 0; j < 9; ++j) { + this.addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + for(int i = 0; i < 9; ++i) { + this.addSlot(new Slot(playerInventory, i, 8 + i * 18, 142)); + } + } + + @Override + public void populateRecipeFinder(RecipeFinder finder) { + if (inventory instanceof RecipeInputProvider) { + ((RecipeInputProvider) inventory).provideRecipeInputs(finder); + } + } + + @Override + public void clearCraftingSlots() { + this.inventory.clear(); + } + + @Override + public boolean matches(Recipe recipe) { + return recipe.matches(this.inventory, this.world); + } + + @Override + public int getCraftingResultSlotIndex() { + return 3; + } + + @Override + public int getCraftingWidth() { + return 2; + } + + @Override + public int getCraftingHeight() { + return 1; + } + + @Override + public int getCraftingSlotCount() { + return 4; + } + + @Override + public RecipeBookCategory getCategory() { + return RecipeBookCategory.BLAST_FURNACE; + } + + @Override + public boolean canUse(PlayerEntity player) { + return this.inventory.canPlayerUse(player); + } + + protected boolean isSmeltable(ItemStack itemStack) { + return this.world.getRecipeManager().getFirstMatch(AlloyingRecipe.TYPE, new SimpleInventory(new ItemStack[]{itemStack}), this.world).isPresent(); + } + + public boolean isFuel(ItemStack itemStack) { + return EndStoneSmelterBlockEntity.canUseAsFuel(itemStack); + } + + @Override + public ItemStack transferSlot(PlayerEntity player, int index) { + ItemStack itemStack = ItemStack.EMPTY; + Slot slot = this.slots.get(index); + if (slot != null && slot.hasStack()) { + ItemStack itemStack2 = slot.getStack(); + itemStack = itemStack2.copy(); + if (index == 3) { + if (insertItem(itemStack2, 4, 40, true)) { + return ItemStack.EMPTY; + } + slot.onStackChanged(itemStack2, itemStack); + } else if (index != 2 && index != 1 && index != 0) { + if (isSmeltable(itemStack2)) { + if (!insertItem(itemStack2, 0, 2, false)) { + return ItemStack.EMPTY; + } + } else if (isFuel(itemStack2)) { + if (!this.insertItem(itemStack2, 2, 3, false)) { + return ItemStack.EMPTY; + } + } else if (index >= 4 && index < 31) { + if (!insertItem(itemStack2, 31, 40, false)) { + return ItemStack.EMPTY; + } + } else if (index >= 31 && index < 40 && !insertItem(itemStack2, 4, 31, false)) { + return ItemStack.EMPTY; + } + } else if (!insertItem(itemStack2, 4, 40, false)) { + return ItemStack.EMPTY; + } + + if (itemStack2.isEmpty()) { + slot.setStack(ItemStack.EMPTY); + } else { + slot.markDirty(); + } + + if (itemStack2.getCount() == itemStack.getCount()) { + return ItemStack.EMPTY; + } + + slot.onTakeItem(player, itemStack2); + } + + return itemStack; + } + + @Environment(EnvType.CLIENT) + public int getSmeltProgress() { + int time = this.propertyDelegate.get(2); + int timeTotal = this.propertyDelegate.get(3); + return timeTotal != 0 && time != 0 ? time * 24 / timeTotal : 0; + } + + @Environment(EnvType.CLIENT) + public int getFuelProgress() { + int fuelTime = this.propertyDelegate.get(1); + if (fuelTime == 0) { + fuelTime = 200; + } + return this.propertyDelegate.get(0) * 13 / fuelTime; + } + + @Environment(EnvType.CLIENT) + public boolean isBurning() { + return this.propertyDelegate.get(0) > 0; + } +} diff --git a/src/main/java/ru/betterend/client/gui/slot/SmelterFuelSlot.java b/src/main/java/ru/betterend/client/gui/slot/SmelterFuelSlot.java index 3dcd9956..e0381d87 100644 --- a/src/main/java/ru/betterend/client/gui/slot/SmelterFuelSlot.java +++ b/src/main/java/ru/betterend/client/gui/slot/SmelterFuelSlot.java @@ -1,25 +1,25 @@ -package ru.betterend.client.gui.slot; - -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.screen.slot.FurnaceFuelSlot; -import net.minecraft.screen.slot.Slot; -import ru.betterend.client.gui.EndStoneSmelterScreenHandler; - -public class SmelterFuelSlot extends Slot { - - private final EndStoneSmelterScreenHandler handler; - - public SmelterFuelSlot(EndStoneSmelterScreenHandler handler, Inventory inventory, int index, int x, int y) { - super(inventory, index, x, y); - this.handler = handler; - } - - public boolean canInsert(ItemStack stack) { - return this.handler.isFuel(stack) || FurnaceFuelSlot.isBucket(stack); - } - - public int getMaxItemCount(ItemStack stack) { - return FurnaceFuelSlot.isBucket(stack) ? 1 : super.getMaxItemCount(stack); - } -} +package ru.betterend.client.gui.slot; + +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.FurnaceFuelSlot; +import net.minecraft.screen.slot.Slot; +import ru.betterend.client.gui.EndStoneSmelterScreenHandler; + +public class SmelterFuelSlot extends Slot { + + private final EndStoneSmelterScreenHandler handler; + + public SmelterFuelSlot(EndStoneSmelterScreenHandler handler, Inventory inventory, int index, int x, int y) { + super(inventory, index, x, y); + this.handler = handler; + } + + public boolean canInsert(ItemStack stack) { + return this.handler.isFuel(stack) || FurnaceFuelSlot.isBucket(stack); + } + + public int getMaxItemCount(ItemStack stack) { + return FurnaceFuelSlot.isBucket(stack) ? 1 : super.getMaxItemCount(stack); + } +} diff --git a/src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java b/src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java index 163960c7..dfe85893 100644 --- a/src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java +++ b/src/main/java/ru/betterend/client/gui/slot/SmelterOutputSlot.java @@ -1,49 +1,49 @@ -package ru.betterend.client.gui.slot; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.screen.slot.Slot; -import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; - -public class SmelterOutputSlot extends Slot { - - private PlayerEntity player; - private int amount; - - public SmelterOutputSlot(PlayerEntity player, Inventory inventory, int index, int x, int y) { - super(inventory, index, x, y); - this.player = player; - } - - public boolean canInsert(ItemStack stack) { - return false; - } - - public ItemStack takeStack(int amount) { - if (this.hasStack()) { - this.amount += Math.min(amount, this.getStack().getCount()); - } - - return super.takeStack(amount); - } - - public ItemStack onTakeItem(PlayerEntity player, ItemStack stack) { - this.onCrafted(stack); - super.onTakeItem(player, stack); - return stack; - } - - protected void onCrafted(ItemStack stack, int amount) { - this.amount += amount; - this.onCrafted(stack); - } - - protected void onCrafted(ItemStack stack) { - stack.onCraft(this.player.world, this.player, this.amount); - if (!this.player.world.isClient && this.inventory instanceof EndStoneSmelterBlockEntity) { - ((EndStoneSmelterBlockEntity) this.inventory).dropExperience(player); - } - this.amount = 0; - } -} +package ru.betterend.client.gui.slot; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; +import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; + +public class SmelterOutputSlot extends Slot { + + private PlayerEntity player; + private int amount; + + public SmelterOutputSlot(PlayerEntity player, Inventory inventory, int index, int x, int y) { + super(inventory, index, x, y); + this.player = player; + } + + public boolean canInsert(ItemStack stack) { + return false; + } + + public ItemStack takeStack(int amount) { + if (this.hasStack()) { + this.amount += Math.min(amount, this.getStack().getCount()); + } + + return super.takeStack(amount); + } + + public ItemStack onTakeItem(PlayerEntity player, ItemStack stack) { + this.onCrafted(stack); + super.onTakeItem(player, stack); + return stack; + } + + protected void onCrafted(ItemStack stack, int amount) { + this.amount += amount; + this.onCrafted(stack); + } + + protected void onCrafted(ItemStack stack) { + stack.onCraft(this.player.world, this.player, this.amount); + if (!this.player.world.isClient && this.inventory instanceof EndStoneSmelterBlockEntity) { + ((EndStoneSmelterBlockEntity) this.inventory).dropExperience(player); + } + this.amount = 0; + } +} diff --git a/src/main/java/ru/betterend/client/render/BeamRenderer.java b/src/main/java/ru/betterend/client/render/BeamRenderer.java index edb0b181..894462a7 100644 --- a/src/main/java/ru/betterend/client/render/BeamRenderer.java +++ b/src/main/java/ru/betterend/client/render/BeamRenderer.java @@ -1,62 +1,62 @@ -package ru.betterend.client.render; - -import net.minecraft.client.render.OverlayTexture; -import net.minecraft.client.render.VertexConsumer; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Matrix3f; -import net.minecraft.util.math.Matrix4f; - -public class BeamRenderer { - public static void renderLightBeam(MatrixStack matrixStack, VertexConsumer vertexConsumer, float tick, int minY, int maxY, float[] colors, float alpha, float h, float k) { - int m = minY + maxY; - - float o = maxY < 0 ? tick : -tick; - float p = MathHelper.fractionalPart(o * 0.2F - (float) MathHelper.floor(o * 0.1F)); - float red = colors[0]; - float green = colors[1]; - float blue = colors[2]; - - matrixStack.push(); - matrixStack.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(tick * 2.25F - 45.0F)); - float af = 0.0F; - float ai = 0.0F; - float aj = -h; - float aa = -h; - float ap = -1.0F + p; - float aq = (float) maxY * (0.5F / h) + ap; - - renderBeam(matrixStack, vertexConsumer, red, green, blue, alpha, minY, m, 0.0F, h, h, 0.0F, aj, 0.0F, 0.0F, aa, 0.0F, 1.0F, aq, ap); - matrixStack.pop(); - - af = -k; - float ag = -k; - ai = -k; - aj = -k; - ap = -1.0F + p; - aq = (float) maxY + ap; - renderBeam(matrixStack, vertexConsumer, red, green, blue, alpha, minY, m, af, ag, k, ai, aj, k, k, k, 0.0F, 1.0F, aq, ap); - } - - private static void renderBeam(MatrixStack matrixStack, VertexConsumer vertexConsumer, float red, float green, float blue, float alpha, int j, int k, float l, float m, float n, float o, float p, float q, float r, float s, float t, float u, float v, float w) { - MatrixStack.Entry entry = matrixStack.peek(); - Matrix4f matrix4f = entry.getModel(); - Matrix3f matrix3f = entry.getNormal(); - renderBeam(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, k, l, m, n, o, t, u, v, w); - renderBeam(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, k, r, s, p, q, t, u, v, w); - renderBeam(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, k, n, o, r, s, t, u, v, w); - renderBeam(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, k, p, q, l, m, t, u, v, w); - } - - private static void renderBeam(Matrix4f matrix4f, Matrix3f matrix3f, VertexConsumer vertexConsumer, float red, float green, float blue, float alpha, int j, int k, float l, float m, float n, float o, float p, float q, float r, float s) { - addVertex(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, k, l, m, q, r); - addVertex(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, l, m, q, s); - addVertex(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, n, o, p, s); - addVertex(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, k, n, o, p, r); - } - - private static void addVertex(Matrix4f matrix4f, Matrix3f matrix3f, VertexConsumer vertexConsumer, float red, float green, float blue, float alpha, float y, float x, float l, float m, float n) { - vertexConsumer.vertex(matrix4f, x, y, l).color(red, green, blue, alpha).texture(m, n).overlay(OverlayTexture.DEFAULT_UV).light(15728880).normal(matrix3f, 0.0F, 1.0F, 0.0F).next(); - } -} +package ru.betterend.client.render; + +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Matrix3f; +import net.minecraft.util.math.Matrix4f; + +public class BeamRenderer { + public static void renderLightBeam(MatrixStack matrixStack, VertexConsumer vertexConsumer, float tick, int minY, int maxY, float[] colors, float alpha, float h, float k) { + int m = minY + maxY; + + float o = maxY < 0 ? tick : -tick; + float p = MathHelper.fractionalPart(o * 0.2F - (float) MathHelper.floor(o * 0.1F)); + float red = colors[0]; + float green = colors[1]; + float blue = colors[2]; + + matrixStack.push(); + matrixStack.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(tick * 2.25F - 45.0F)); + float af = 0.0F; + float ai = 0.0F; + float aj = -h; + float aa = -h; + float ap = -1.0F + p; + float aq = (float) maxY * (0.5F / h) + ap; + + renderBeam(matrixStack, vertexConsumer, red, green, blue, alpha, minY, m, 0.0F, h, h, 0.0F, aj, 0.0F, 0.0F, aa, 0.0F, 1.0F, aq, ap); + matrixStack.pop(); + + af = -k; + float ag = -k; + ai = -k; + aj = -k; + ap = -1.0F + p; + aq = (float) maxY + ap; + renderBeam(matrixStack, vertexConsumer, red, green, blue, alpha, minY, m, af, ag, k, ai, aj, k, k, k, 0.0F, 1.0F, aq, ap); + } + + private static void renderBeam(MatrixStack matrixStack, VertexConsumer vertexConsumer, float red, float green, float blue, float alpha, int j, int k, float l, float m, float n, float o, float p, float q, float r, float s, float t, float u, float v, float w) { + MatrixStack.Entry entry = matrixStack.peek(); + Matrix4f matrix4f = entry.getModel(); + Matrix3f matrix3f = entry.getNormal(); + renderBeam(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, k, l, m, n, o, t, u, v, w); + renderBeam(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, k, r, s, p, q, t, u, v, w); + renderBeam(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, k, n, o, r, s, t, u, v, w); + renderBeam(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, k, p, q, l, m, t, u, v, w); + } + + private static void renderBeam(Matrix4f matrix4f, Matrix3f matrix3f, VertexConsumer vertexConsumer, float red, float green, float blue, float alpha, int j, int k, float l, float m, float n, float o, float p, float q, float r, float s) { + addVertex(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, k, l, m, q, r); + addVertex(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, l, m, q, s); + addVertex(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, j, n, o, p, s); + addVertex(matrix4f, matrix3f, vertexConsumer, red, green, blue, alpha, k, n, o, p, r); + } + + private static void addVertex(Matrix4f matrix4f, Matrix3f matrix3f, VertexConsumer vertexConsumer, float red, float green, float blue, float alpha, float y, float x, float l, float m, float n) { + vertexConsumer.vertex(matrix4f, x, y, l).color(red, green, blue, alpha).texture(m, n).overlay(OverlayTexture.DEFAULT_UV).light(15728880).normal(matrix3f, 0.0F, 1.0F, 0.0F).next(); + } +} diff --git a/src/main/java/ru/betterend/client/render/ERenderLayer.java b/src/main/java/ru/betterend/client/render/ERenderLayer.java index 0bbf2358..3d18d635 100644 --- a/src/main/java/ru/betterend/client/render/ERenderLayer.java +++ b/src/main/java/ru/betterend/client/render/ERenderLayer.java @@ -1,6 +1,6 @@ -package ru.betterend.client.render; - -public enum ERenderLayer { - CUTOUT, - TRANSLUCENT; -} +package ru.betterend.client.render; + +public enum ERenderLayer { + CUTOUT, + TRANSLUCENT; +} diff --git a/src/main/java/ru/betterend/compat/REIAlloyingDisplay.java b/src/main/java/ru/betterend/compat/REIAlloyingDisplay.java index 3b8e4d6d..09ebbb5f 100644 --- a/src/main/java/ru/betterend/compat/REIAlloyingDisplay.java +++ b/src/main/java/ru/betterend/compat/REIAlloyingDisplay.java @@ -1,111 +1,111 @@ -package ru.betterend.compat; - -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.jetbrains.annotations.NotNull; - -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.TransferRecipeDisplay; -import me.shedaniel.rei.server.ContainerInfo; -import net.minecraft.item.Item; -import net.minecraft.recipe.BlastingRecipe; -import net.minecraft.recipe.Recipe; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Formatting; -import net.minecraft.util.Identifier; -import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; -import ru.betterend.recipe.builders.AlloyingRecipe; - -public class REIAlloyingDisplay implements TransferRecipeDisplay { - - private static List fuel; - - private Recipe recipe; - private List> input; - private List output; - private float xp; - private double smeltTime; - - public REIAlloyingDisplay(AlloyingRecipe recipe) { - this.recipe = recipe; - this.input = EntryStack.ofIngredients(recipe.getPreviewInputs()); - this.output = Collections.singletonList(EntryStack.create(recipe.getOutput())); - this.xp = recipe.getExperience(); - this.smeltTime = recipe.getSmeltTime(); - } - - public REIAlloyingDisplay(BlastingRecipe recipe) { - this.recipe = recipe; - this.input = EntryStack.ofIngredients(recipe.getPreviewInputs()); - this.output = Collections.singletonList(EntryStack.create(recipe.getOutput())); - this.xp = recipe.getExperience(); - this.smeltTime = recipe.getCookTime(); - } - - public static List getFuel() { - return fuel; - } - - @Override - public @NotNull Optional getRecipeLocation() { - return Optional.ofNullable(recipe).map(Recipe::getId); - } - - @Override - public @NotNull List> getInputEntries() { - return this.input; - } - - @Override - public @NotNull List> getResultingEntries() { - return Collections.singletonList(output); - } - - @Override - public @NotNull Identifier getRecipeCategory() { - return AlloyingRecipe.ID; - } - - @Override - public @NotNull List> getRequiredEntries() { - return this.input; - } - - public float getXp() { - return this.xp; - } - - public double getSmeltTime() { - return this.smeltTime; - } - - public Optional> getOptionalRecipe() { - return Optional.ofNullable(recipe); - } - - @Override - public int getWidth() { - return 2; - } - - @Override - public int getHeight() { - return 1; - } - - @Override - public List> getOrganisedInputEntries(ContainerInfo containerInfo, ScreenHandler container) { - return this.input; - } - - static { - fuel = EndStoneSmelterBlockEntity.availableFuels().keySet().stream() - .map(Item::getDefaultStack).map(EntryStack::create) - .map(e -> e.setting(EntryStack.Settings.TOOLTIP_APPEND_EXTRA, stack -> Collections.singletonList(new TranslatableText("category.rei.smelting.fuel") - .formatted(Formatting.YELLOW)))).collect(Collectors.toList()); - } -} +package ru.betterend.compat; + +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import org.jetbrains.annotations.NotNull; + +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.TransferRecipeDisplay; +import me.shedaniel.rei.server.ContainerInfo; +import net.minecraft.item.Item; +import net.minecraft.recipe.BlastingRecipe; +import net.minecraft.recipe.Recipe; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; +import ru.betterend.blocks.entities.EndStoneSmelterBlockEntity; +import ru.betterend.recipe.builders.AlloyingRecipe; + +public class REIAlloyingDisplay implements TransferRecipeDisplay { + + private static List fuel; + + private Recipe recipe; + private List> input; + private List output; + private float xp; + private double smeltTime; + + public REIAlloyingDisplay(AlloyingRecipe recipe) { + this.recipe = recipe; + this.input = EntryStack.ofIngredients(recipe.getPreviewInputs()); + this.output = Collections.singletonList(EntryStack.create(recipe.getOutput())); + this.xp = recipe.getExperience(); + this.smeltTime = recipe.getSmeltTime(); + } + + public REIAlloyingDisplay(BlastingRecipe recipe) { + this.recipe = recipe; + this.input = EntryStack.ofIngredients(recipe.getPreviewInputs()); + this.output = Collections.singletonList(EntryStack.create(recipe.getOutput())); + this.xp = recipe.getExperience(); + this.smeltTime = recipe.getCookTime(); + } + + public static List getFuel() { + return fuel; + } + + @Override + public @NotNull Optional getRecipeLocation() { + return Optional.ofNullable(recipe).map(Recipe::getId); + } + + @Override + public @NotNull List> getInputEntries() { + return this.input; + } + + @Override + public @NotNull List> getResultingEntries() { + return Collections.singletonList(output); + } + + @Override + public @NotNull Identifier getRecipeCategory() { + return AlloyingRecipe.ID; + } + + @Override + public @NotNull List> getRequiredEntries() { + return this.input; + } + + public float getXp() { + return this.xp; + } + + public double getSmeltTime() { + return this.smeltTime; + } + + public Optional> getOptionalRecipe() { + return Optional.ofNullable(recipe); + } + + @Override + public int getWidth() { + return 2; + } + + @Override + public int getHeight() { + return 1; + } + + @Override + public List> getOrganisedInputEntries(ContainerInfo containerInfo, ScreenHandler container) { + return this.input; + } + + static { + fuel = EndStoneSmelterBlockEntity.availableFuels().keySet().stream() + .map(Item::getDefaultStack).map(EntryStack::create) + .map(e -> e.setting(EntryStack.Settings.TOOLTIP_APPEND_EXTRA, stack -> Collections.singletonList(new TranslatableText("category.rei.smelting.fuel") + .formatted(Formatting.YELLOW)))).collect(Collectors.toList()); + } +} diff --git a/src/main/java/ru/betterend/compat/REIAnvilCategory.java b/src/main/java/ru/betterend/compat/REIAnvilCategory.java index 65175ebb..87f12de9 100644 --- a/src/main/java/ru/betterend/compat/REIAnvilCategory.java +++ b/src/main/java/ru/betterend/compat/REIAnvilCategory.java @@ -1,84 +1,84 @@ -package ru.betterend.compat; - -import java.util.Collections; -import java.util.List; - -import org.jetbrains.annotations.NotNull; - -import com.google.common.collect.Lists; - -import it.unimi.dsi.fastutil.ints.IntList; -import me.shedaniel.math.Point; -import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.TransferRecipeCategory; -import me.shedaniel.rei.api.widgets.Widgets; -import me.shedaniel.rei.gui.entries.RecipeEntry; -import me.shedaniel.rei.gui.entries.SimpleRecipeEntry; -import me.shedaniel.rei.gui.widget.Widget; -import net.minecraft.block.Blocks; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Identifier; -import ru.betterend.util.LangUtil; - -public class REIAnvilCategory implements TransferRecipeCategory { - - @Override - public @NotNull Identifier getIdentifier() { - return REIPlugin.SMITHING; - } - - @Override - public @NotNull String getCategoryName() { - return LangUtil.translate(Blocks.ANVIL.getTranslationKey()); - } - - @Override - public @NotNull EntryStack getLogo() { - return REIPlugin.ANVIL; - } - - @Override - public @NotNull List setupDisplay(REIAnvilDisplay display, Rectangle bounds) { - Point startPoint = new Point(bounds.getCenterX() - 41, bounds.y + 10); - List widgets = Lists.newArrayList(); - widgets.add(Widgets.createRecipeBase(bounds)); - int x = startPoint.x + 10; - int y = startPoint.y; - widgets.add(Widgets.createResultSlotBackground(new Point(x + 61, y + 4))); - List> inputEntries = display.getInputEntries(); - widgets.add(Widgets.createArrow(new Point(x + 24, y + 3))); - widgets.add(Widgets.createLabel(new Point(bounds.x + bounds.width - 5, bounds.y + bounds.height - 12), - new TranslatableText("category.rei.damage.amount&dmg", display.getDamage())).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB)); - widgets.add(Widgets.createSlot(new Point(x - 20, y + 3)).entries(inputEntries.get(0)).markInput()); - widgets.add(Widgets.createSlot(new Point(x + 1, y + 3)).entries(inputEntries.get(1)).markInput()); - widgets.add(Widgets.createSlot(new Point(x + 61, y + 4)).entries(display.getResultingEntries().get(0)).disableBackground().markOutput()); - return widgets; - } - - @Override - public void renderRedSlots(MatrixStack matrices, List widgets, Rectangle bounds, REIAnvilDisplay display, - IntList redSlots) { - Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); - matrices.push(); - matrices.translate(0, 0, 400); - if (redSlots.contains(0)) { - DrawableHelper.fill(matrices, startPoint.x - 20, startPoint.y + 3, startPoint.x - 20 + 16, startPoint.y + 3 + 16, 1090453504); - DrawableHelper.fill(matrices, startPoint.x + 1, startPoint.y + 3, startPoint.x + 1 + 16, startPoint.y + 3 + 16, 1090453504); - } - matrices.pop(); - } - - @Override - public @NotNull RecipeEntry getSimpleRenderer(REIAnvilDisplay recipe) { - return SimpleRecipeEntry.from(Collections.singletonList(recipe.getInputEntries().get(0)), recipe.getResultingEntries()); - } - - @Override - public int getDisplayHeight() { - return 49; - } - -} +package ru.betterend.compat; + +import java.util.Collections; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import com.google.common.collect.Lists; + +import it.unimi.dsi.fastutil.ints.IntList; +import me.shedaniel.math.Point; +import me.shedaniel.math.Rectangle; +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.TransferRecipeCategory; +import me.shedaniel.rei.api.widgets.Widgets; +import me.shedaniel.rei.gui.entries.RecipeEntry; +import me.shedaniel.rei.gui.entries.SimpleRecipeEntry; +import me.shedaniel.rei.gui.widget.Widget; +import net.minecraft.block.Blocks; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Identifier; +import ru.betterend.util.LangUtil; + +public class REIAnvilCategory implements TransferRecipeCategory { + + @Override + public @NotNull Identifier getIdentifier() { + return REIPlugin.SMITHING; + } + + @Override + public @NotNull String getCategoryName() { + return LangUtil.translate(Blocks.ANVIL.getTranslationKey()); + } + + @Override + public @NotNull EntryStack getLogo() { + return REIPlugin.ANVIL; + } + + @Override + public @NotNull List setupDisplay(REIAnvilDisplay display, Rectangle bounds) { + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.y + 10); + List widgets = Lists.newArrayList(); + widgets.add(Widgets.createRecipeBase(bounds)); + int x = startPoint.x + 10; + int y = startPoint.y; + widgets.add(Widgets.createResultSlotBackground(new Point(x + 61, y + 4))); + List> inputEntries = display.getInputEntries(); + widgets.add(Widgets.createArrow(new Point(x + 24, y + 3))); + widgets.add(Widgets.createLabel(new Point(bounds.x + bounds.width - 5, bounds.y + bounds.height - 12), + new TranslatableText("category.rei.damage.amount&dmg", display.getDamage())).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB)); + widgets.add(Widgets.createSlot(new Point(x - 20, y + 3)).entries(inputEntries.get(0)).markInput()); + widgets.add(Widgets.createSlot(new Point(x + 1, y + 3)).entries(inputEntries.get(1)).markInput()); + widgets.add(Widgets.createSlot(new Point(x + 61, y + 4)).entries(display.getResultingEntries().get(0)).disableBackground().markOutput()); + return widgets; + } + + @Override + public void renderRedSlots(MatrixStack matrices, List widgets, Rectangle bounds, REIAnvilDisplay display, + IntList redSlots) { + Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); + matrices.push(); + matrices.translate(0, 0, 400); + if (redSlots.contains(0)) { + DrawableHelper.fill(matrices, startPoint.x - 20, startPoint.y + 3, startPoint.x - 20 + 16, startPoint.y + 3 + 16, 1090453504); + DrawableHelper.fill(matrices, startPoint.x + 1, startPoint.y + 3, startPoint.x + 1 + 16, startPoint.y + 3 + 16, 1090453504); + } + matrices.pop(); + } + + @Override + public @NotNull RecipeEntry getSimpleRenderer(REIAnvilDisplay recipe) { + return SimpleRecipeEntry.from(Collections.singletonList(recipe.getInputEntries().get(0)), recipe.getResultingEntries()); + } + + @Override + public int getDisplayHeight() { + return 49; + } + +} diff --git a/src/main/java/ru/betterend/compat/REIAnvilDisplay.java b/src/main/java/ru/betterend/compat/REIAnvilDisplay.java index f554b8d9..ddca40b1 100644 --- a/src/main/java/ru/betterend/compat/REIAnvilDisplay.java +++ b/src/main/java/ru/betterend/compat/REIAnvilDisplay.java @@ -1,73 +1,73 @@ -package ru.betterend.compat; - -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -import org.jetbrains.annotations.NotNull; - -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.TransferRecipeDisplay; -import me.shedaniel.rei.server.ContainerInfo; -import net.minecraft.recipe.Recipe; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.util.Identifier; -import ru.betterend.recipe.builders.AnvilSmithingRecipe; - -public class REIAnvilDisplay implements TransferRecipeDisplay { - - private AnvilSmithingRecipe recipe; - private List> input; - private List output; - - public REIAnvilDisplay(AnvilSmithingRecipe recipe) { - this.recipe = recipe; - this.input = EntryStack.ofIngredients(recipe.getPreviewInputs()); - this.output = Collections.singletonList(EntryStack.create(recipe.getOutput())); - } - - public int getDamage() { - return this.recipe.getDamage(); - } - - @Override - public @NotNull Optional getRecipeLocation() { - return Optional.ofNullable(recipe).map(Recipe::getId); - } - - @Override - public @NotNull List> getInputEntries() { - return this.input; - } - - @Override - public @NotNull List> getResultingEntries() { - return Collections.singletonList(output); - } - - @Override - public @NotNull Identifier getRecipeCategory() { - return REIPlugin.SMITHING; - } - - @Override - public @NotNull List> getRequiredEntries() { - return this.input; - } - - @Override - public int getWidth() { - return 2; - } - - @Override - public int getHeight() { - return 1; - } - - @Override - public List> getOrganisedInputEntries(ContainerInfo containerInfo, - ScreenHandler container) { - return this.input; - } -} +package ru.betterend.compat; + +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +import org.jetbrains.annotations.NotNull; + +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.TransferRecipeDisplay; +import me.shedaniel.rei.server.ContainerInfo; +import net.minecraft.recipe.Recipe; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.util.Identifier; +import ru.betterend.recipe.builders.AnvilSmithingRecipe; + +public class REIAnvilDisplay implements TransferRecipeDisplay { + + private AnvilSmithingRecipe recipe; + private List> input; + private List output; + + public REIAnvilDisplay(AnvilSmithingRecipe recipe) { + this.recipe = recipe; + this.input = EntryStack.ofIngredients(recipe.getPreviewInputs()); + this.output = Collections.singletonList(EntryStack.create(recipe.getOutput())); + } + + public int getDamage() { + return this.recipe.getDamage(); + } + + @Override + public @NotNull Optional getRecipeLocation() { + return Optional.ofNullable(recipe).map(Recipe::getId); + } + + @Override + public @NotNull List> getInputEntries() { + return this.input; + } + + @Override + public @NotNull List> getResultingEntries() { + return Collections.singletonList(output); + } + + @Override + public @NotNull Identifier getRecipeCategory() { + return REIPlugin.SMITHING; + } + + @Override + public @NotNull List> getRequiredEntries() { + return this.input; + } + + @Override + public int getWidth() { + return 2; + } + + @Override + public int getHeight() { + return 1; + } + + @Override + public List> getOrganisedInputEntries(ContainerInfo containerInfo, + ScreenHandler container) { + return this.input; + } +} diff --git a/src/main/java/ru/betterend/compat/REIContainer.java b/src/main/java/ru/betterend/compat/REIContainer.java index ec5f4946..9c6f242e 100644 --- a/src/main/java/ru/betterend/compat/REIContainer.java +++ b/src/main/java/ru/betterend/compat/REIContainer.java @@ -1,14 +1,14 @@ -package ru.betterend.compat; - -import me.shedaniel.rei.plugin.containers.CraftingContainerInfoWrapper; -import me.shedaniel.rei.server.ContainerInfoHandler; -import ru.betterend.client.gui.EndStoneSmelterScreenHandler; -import ru.betterend.recipe.builders.AlloyingRecipe; - -public class REIContainer implements Runnable { - - @Override - public void run() { - ContainerInfoHandler.registerContainerInfo(AlloyingRecipe.ID, CraftingContainerInfoWrapper.create(EndStoneSmelterScreenHandler.class)); - } -} +package ru.betterend.compat; + +import me.shedaniel.rei.plugin.containers.CraftingContainerInfoWrapper; +import me.shedaniel.rei.server.ContainerInfoHandler; +import ru.betterend.client.gui.EndStoneSmelterScreenHandler; +import ru.betterend.recipe.builders.AlloyingRecipe; + +public class REIContainer implements Runnable { + + @Override + public void run() { + ContainerInfoHandler.registerContainerInfo(AlloyingRecipe.ID, CraftingContainerInfoWrapper.create(EndStoneSmelterScreenHandler.class)); + } +} diff --git a/src/main/java/ru/betterend/config/Config.java b/src/main/java/ru/betterend/config/Config.java index c30533c1..52354aed 100644 --- a/src/main/java/ru/betterend/config/Config.java +++ b/src/main/java/ru/betterend/config/Config.java @@ -1,115 +1,115 @@ -package ru.betterend.config; - -import ru.betterend.BetterEnd; -import ru.betterend.config.ConfigKeeper.BooleanEntry; -import ru.betterend.config.ConfigKeeper.Entry; -import ru.betterend.config.ConfigKeeper.FloatEntry; -import ru.betterend.config.ConfigKeeper.IntegerEntry; -import ru.betterend.config.ConfigKeeper.RangeEntry; -import ru.betterend.config.ConfigKeeper.StringEntry; - -public abstract class Config { - - protected final ConfigKeeper configKeeper = new ConfigKeeper(); - - public abstract void saveChanges(); - - public > E getEntry(String key) { - return this.configKeeper.getEntry(key); - } - - public T getDefault(String key) { - Entry entry = configKeeper.getEntry(key); - return entry != null ? entry.getDefault() : null; - } - - public String getString(String key) { - String str = configKeeper.getValue(key); - return str != null ? str : ""; - } - - public boolean setString(String key, String value) { - try { - StringEntry entry = configKeeper.getEntry(key); - entry.setValue(value); - this.configKeeper.set(key, entry); - - return true; - } catch (NullPointerException ex) { - BetterEnd.LOGGER.catching(ex); - } - - return false; - } - - public int getInt(String key) { - Integer val = configKeeper.getValue(key); - return val != null ? val : 0; - } - - public boolean setInt(String key, int value) { - try { - IntegerEntry entry = configKeeper.getEntry(key); - entry.setValue(value); - this.configKeeper.set(key, entry); - - return true; - } catch (NullPointerException ex) { - BetterEnd.LOGGER.catching(ex); - } - - return false; - } - - public > boolean setRanged(String key, T value) { - try { - RangeEntry entry = configKeeper.getEntry(key); - entry.setValue(value); - this.configKeeper.set(key, entry); - - return true; - } catch (NullPointerException | ClassCastException ex) { - BetterEnd.LOGGER.catching(ex); - } - - return false; - } - - public float getFloat(String key) { - Float val = configKeeper.getValue(key); - return val != null ? val : 0.0F; - } - - public boolean setFloat(String key, float value) { - try { - FloatEntry entry = configKeeper.getEntry(key); - entry.setValue(value); - this.configKeeper.set(key, entry); - - return true; - } catch (NullPointerException ex) { - BetterEnd.LOGGER.catching(ex); - } - - return false; - } - - public boolean getBoolean(String key) { - Boolean val = configKeeper.getValue(key); - return val != null ? val : false; - } - - public boolean setBoolean(String key, boolean value) { - try { - BooleanEntry entry = configKeeper.getEntry(key); - entry.setValue(value); - this.configKeeper.set(key, entry); - - return true; - } catch (NullPointerException ex) { - BetterEnd.LOGGER.catching(ex); - } - - return false; - } -} +package ru.betterend.config; + +import ru.betterend.BetterEnd; +import ru.betterend.config.ConfigKeeper.BooleanEntry; +import ru.betterend.config.ConfigKeeper.Entry; +import ru.betterend.config.ConfigKeeper.FloatEntry; +import ru.betterend.config.ConfigKeeper.IntegerEntry; +import ru.betterend.config.ConfigKeeper.RangeEntry; +import ru.betterend.config.ConfigKeeper.StringEntry; + +public abstract class Config { + + protected final ConfigKeeper configKeeper = new ConfigKeeper(); + + public abstract void saveChanges(); + + public > E getEntry(String key) { + return this.configKeeper.getEntry(key); + } + + public T getDefault(String key) { + Entry entry = configKeeper.getEntry(key); + return entry != null ? entry.getDefault() : null; + } + + public String getString(String key) { + String str = configKeeper.getValue(key); + return str != null ? str : ""; + } + + public boolean setString(String key, String value) { + try { + StringEntry entry = configKeeper.getEntry(key); + entry.setValue(value); + this.configKeeper.set(key, entry); + + return true; + } catch (NullPointerException ex) { + BetterEnd.LOGGER.catching(ex); + } + + return false; + } + + public int getInt(String key) { + Integer val = configKeeper.getValue(key); + return val != null ? val : 0; + } + + public boolean setInt(String key, int value) { + try { + IntegerEntry entry = configKeeper.getEntry(key); + entry.setValue(value); + this.configKeeper.set(key, entry); + + return true; + } catch (NullPointerException ex) { + BetterEnd.LOGGER.catching(ex); + } + + return false; + } + + public > boolean setRanged(String key, T value) { + try { + RangeEntry entry = configKeeper.getEntry(key); + entry.setValue(value); + this.configKeeper.set(key, entry); + + return true; + } catch (NullPointerException | ClassCastException ex) { + BetterEnd.LOGGER.catching(ex); + } + + return false; + } + + public float getFloat(String key) { + Float val = configKeeper.getValue(key); + return val != null ? val : 0.0F; + } + + public boolean setFloat(String key, float value) { + try { + FloatEntry entry = configKeeper.getEntry(key); + entry.setValue(value); + this.configKeeper.set(key, entry); + + return true; + } catch (NullPointerException ex) { + BetterEnd.LOGGER.catching(ex); + } + + return false; + } + + public boolean getBoolean(String key) { + Boolean val = configKeeper.getValue(key); + return val != null ? val : false; + } + + public boolean setBoolean(String key, boolean value) { + try { + BooleanEntry entry = configKeeper.getEntry(key); + entry.setValue(value); + this.configKeeper.set(key, entry); + + return true; + } catch (NullPointerException ex) { + BetterEnd.LOGGER.catching(ex); + } + + return false; + } +} diff --git a/src/main/java/ru/betterend/config/ConfigKeeper.java b/src/main/java/ru/betterend/config/ConfigKeeper.java index 0ad9043b..df05b8c7 100644 --- a/src/main/java/ru/betterend/config/ConfigKeeper.java +++ b/src/main/java/ru/betterend/config/ConfigKeeper.java @@ -1,342 +1,342 @@ -package ru.betterend.config; - -import java.util.HashMap; -import java.util.Map; -import java.util.function.Consumer; -import java.util.function.Supplier; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.minecraft.util.JsonHelper; -import ru.betterend.BetterEnd; - -public final class ConfigKeeper { - - private Map> configEntries = new HashMap<>(); - - public JsonElement toJson(JsonObject jsonObject) { - for (String param : configEntries.keySet()) { - jsonObject.addProperty(param, configEntries.get(param).asString()); - } - - return jsonObject; - } - - public void fromJson(JsonObject jsonObject) { - for (String param : configEntries.keySet()) { - if (jsonObject.has(param)) { - Entry entry = configEntries.get(param); - entry.fromString(JsonHelper.getString(jsonObject, param)); - } - } - } - - @SuppressWarnings("unchecked") - public > E getEntry(String key) { - Entry entry = this.configEntries.get(key); - if (entry == null) { - BetterEnd.LOGGER.warning(String.format("Entry '%s' doesn't exists.", key)); - return null; - } - return (E) entry; - } - - public T getValue(String key) { - Entry entry = this.getEntry(key); - if (entry == null) { - BetterEnd.LOGGER.warning("Empty value will be returned."); - return null; - } - return entry.getValue(); - } - - public void set(String key, Entry entry) { - configEntries.put(key, entry); - } - - public > void registerEntry(String key, T entry) { - configEntries.put(key, entry); - } - - public static class BooleanEntry extends Entry { - - public BooleanEntry(Boolean defaultValue, Consumer consumer, Supplier supplier) { - super(defaultValue, consumer, supplier); - } - - @Override - public Boolean getValue() { - return this.getter.get(); - } - - @Override - public void setValue(Boolean value) { - this.setter.accept(value); - } - - @Override - public Boolean getDefault() { - return this.defaultValue; - } - - @Override - public String asString() { - return this.getValue() ? "true" : "false"; - } - - @Override - public void fromString(String value) { - this.setValue(value.equals("true") ? true : false); - } - - } - - public static class FloatEntry extends Entry { - - public FloatEntry(Float defaultValue, Consumer consumer, Supplier supplier) { - super(defaultValue, consumer, supplier); - } - - @Override - public Float getValue() { - return this.getter.get(); - } - - @Override - public void setValue(Float value) { - this.setter.accept(value); - } - - @Override - public Float getDefault() { - return this.defaultValue; - } - - @Override - public String asString() { - return Float.toString(getValue()); - } - - @Override - public void fromString(String value) { - this.setValue(Float.valueOf(value)); - } - - } - - public static class FloatRange extends RangeEntry { - - public FloatRange(Float defaultValue, Consumer consumer, Supplier supplier, Float minVal, Float maxVal) { - super(defaultValue, consumer, supplier, minVal, maxVal); - } - - @Override - public Float getValue() { - return this.getter.get(); - } - - @Override - public Float getDefault() { - return this.defaultValue; - } - - @Override - public void fromString(String value) { - this.setValue(Float.valueOf(value)); - } - - @Override - public String asString() { - return Float.toString(getValue()); - } - - } - - public static class IntegerEntry extends Entry { - - public IntegerEntry(Integer defaultValue, Consumer consumer, Supplier supplier) { - super(defaultValue, consumer, supplier); - } - - @Override - public Integer getValue() { - return this.getter.get(); - } - - @Override - public void setValue(Integer value) { - this.setter.accept(value); - } - - @Override - public Integer getDefault() { - return this.defaultValue; - } - - @Override - public String asString() { - return Integer.toString(getValue()); - } - - @Override - public void fromString(String value) { - this.setValue(Integer.valueOf(value)); - } - - } - - public static class IntegerRange extends RangeEntry { - - public IntegerRange(Integer defaultValue, Consumer consumer, Supplier supplier, Integer minVal, Integer maxVal) { - super(defaultValue, consumer, supplier, minVal, maxVal); - } - - @Override - public Integer getValue() { - return this.getter.get(); - } - - @Override - public Integer getDefault() { - return this.defaultValue; - } - - @Override - public void fromString(String value) { - this.setValue(Integer.valueOf(value)); - } - - @Override - public String asString() { - return Integer.toString(getValue()); - } - - } - - public static class StringEntry extends Entry { - - public StringEntry(String defaultValue, Consumer consumer, Supplier supplier) { - super(defaultValue, consumer, supplier); - } - - @Override - public String getValue() { - return this.getter.get(); - } - - @Override - public void setValue(String value) { - this.setter.accept(value); - } - - @Override - public String getDefault() { - return this.defaultValue; - } - - @Override - public String asString() { - return getValue(); - } - - @Override - public void fromString(String value) { - this.setValue(value); - } - - } - - public static class EnumEntry> extends Entry { - - public EnumEntry(T defaultValue, Consumer consumer, Supplier supplier) { - super(defaultValue, consumer, supplier); - } - - @Override - public T getValue() { - return this.getter.get(); - } - - @Override - public void setValue(T value) { - this.setter.accept(value); - } - - @SuppressWarnings("unchecked") - public boolean setValue(String name) { - try { - this.setter.accept((T) Enum.valueOf(this.defaultValue.getClass(), name)); - return true; - } catch(IllegalArgumentException ex) { - BetterEnd.LOGGER.catching(ex); - } - - return false; - } - - @Override - public T getDefault() { - return this.defaultValue; - } - - @Override - public String asString() { - return getValue().name(); - } - - @Override - public void fromString(String value) { - this.setValue(value); - } - } - - public static abstract class RangeEntry> extends Entry { - - private final T min, max; - - public RangeEntry(T defaultValue, Consumer consumer, Supplier supplier, T minVal, T maxVal) { - super(defaultValue, consumer, supplier); - - this.min = minVal; - this.max = maxVal; - } - - @Override - public void setValue(T value) { - this.setter.accept(value.compareTo(min) < 0 ? min : value.compareTo(max) > 0 ? max : value); - } - - public T minValue() { - return this.min; - } - - public T maxValue() { - return this.max; - } - } - - public static abstract class Entry { - - protected final T defaultValue; - - protected final Consumer setter; - protected final Supplier getter; - - public Entry (T defaultValue, Consumer consumer, Supplier supplier) { - this.defaultValue = defaultValue; - this.setter = consumer; - this.getter = supplier; - } - - public abstract T getValue(); - public abstract void setValue(T value); - public abstract T getDefault(); - public abstract void fromString(String value); - public abstract String asString(); - - public void setDefault() { - this.setter.accept(defaultValue); - } - } -} +package ru.betterend.config; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Supplier; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import net.minecraft.util.JsonHelper; +import ru.betterend.BetterEnd; + +public final class ConfigKeeper { + + private Map> configEntries = new HashMap<>(); + + public JsonElement toJson(JsonObject jsonObject) { + for (String param : configEntries.keySet()) { + jsonObject.addProperty(param, configEntries.get(param).asString()); + } + + return jsonObject; + } + + public void fromJson(JsonObject jsonObject) { + for (String param : configEntries.keySet()) { + if (jsonObject.has(param)) { + Entry entry = configEntries.get(param); + entry.fromString(JsonHelper.getString(jsonObject, param)); + } + } + } + + @SuppressWarnings("unchecked") + public > E getEntry(String key) { + Entry entry = this.configEntries.get(key); + if (entry == null) { + BetterEnd.LOGGER.warning(String.format("Entry '%s' doesn't exists.", key)); + return null; + } + return (E) entry; + } + + public T getValue(String key) { + Entry entry = this.getEntry(key); + if (entry == null) { + BetterEnd.LOGGER.warning("Empty value will be returned."); + return null; + } + return entry.getValue(); + } + + public void set(String key, Entry entry) { + configEntries.put(key, entry); + } + + public > void registerEntry(String key, T entry) { + configEntries.put(key, entry); + } + + public static class BooleanEntry extends Entry { + + public BooleanEntry(Boolean defaultValue, Consumer consumer, Supplier supplier) { + super(defaultValue, consumer, supplier); + } + + @Override + public Boolean getValue() { + return this.getter.get(); + } + + @Override + public void setValue(Boolean value) { + this.setter.accept(value); + } + + @Override + public Boolean getDefault() { + return this.defaultValue; + } + + @Override + public String asString() { + return this.getValue() ? "true" : "false"; + } + + @Override + public void fromString(String value) { + this.setValue(value.equals("true") ? true : false); + } + + } + + public static class FloatEntry extends Entry { + + public FloatEntry(Float defaultValue, Consumer consumer, Supplier supplier) { + super(defaultValue, consumer, supplier); + } + + @Override + public Float getValue() { + return this.getter.get(); + } + + @Override + public void setValue(Float value) { + this.setter.accept(value); + } + + @Override + public Float getDefault() { + return this.defaultValue; + } + + @Override + public String asString() { + return Float.toString(getValue()); + } + + @Override + public void fromString(String value) { + this.setValue(Float.valueOf(value)); + } + + } + + public static class FloatRange extends RangeEntry { + + public FloatRange(Float defaultValue, Consumer consumer, Supplier supplier, Float minVal, Float maxVal) { + super(defaultValue, consumer, supplier, minVal, maxVal); + } + + @Override + public Float getValue() { + return this.getter.get(); + } + + @Override + public Float getDefault() { + return this.defaultValue; + } + + @Override + public void fromString(String value) { + this.setValue(Float.valueOf(value)); + } + + @Override + public String asString() { + return Float.toString(getValue()); + } + + } + + public static class IntegerEntry extends Entry { + + public IntegerEntry(Integer defaultValue, Consumer consumer, Supplier supplier) { + super(defaultValue, consumer, supplier); + } + + @Override + public Integer getValue() { + return this.getter.get(); + } + + @Override + public void setValue(Integer value) { + this.setter.accept(value); + } + + @Override + public Integer getDefault() { + return this.defaultValue; + } + + @Override + public String asString() { + return Integer.toString(getValue()); + } + + @Override + public void fromString(String value) { + this.setValue(Integer.valueOf(value)); + } + + } + + public static class IntegerRange extends RangeEntry { + + public IntegerRange(Integer defaultValue, Consumer consumer, Supplier supplier, Integer minVal, Integer maxVal) { + super(defaultValue, consumer, supplier, minVal, maxVal); + } + + @Override + public Integer getValue() { + return this.getter.get(); + } + + @Override + public Integer getDefault() { + return this.defaultValue; + } + + @Override + public void fromString(String value) { + this.setValue(Integer.valueOf(value)); + } + + @Override + public String asString() { + return Integer.toString(getValue()); + } + + } + + public static class StringEntry extends Entry { + + public StringEntry(String defaultValue, Consumer consumer, Supplier supplier) { + super(defaultValue, consumer, supplier); + } + + @Override + public String getValue() { + return this.getter.get(); + } + + @Override + public void setValue(String value) { + this.setter.accept(value); + } + + @Override + public String getDefault() { + return this.defaultValue; + } + + @Override + public String asString() { + return getValue(); + } + + @Override + public void fromString(String value) { + this.setValue(value); + } + + } + + public static class EnumEntry> extends Entry { + + public EnumEntry(T defaultValue, Consumer consumer, Supplier supplier) { + super(defaultValue, consumer, supplier); + } + + @Override + public T getValue() { + return this.getter.get(); + } + + @Override + public void setValue(T value) { + this.setter.accept(value); + } + + @SuppressWarnings("unchecked") + public boolean setValue(String name) { + try { + this.setter.accept((T) Enum.valueOf(this.defaultValue.getClass(), name)); + return true; + } catch(IllegalArgumentException ex) { + BetterEnd.LOGGER.catching(ex); + } + + return false; + } + + @Override + public T getDefault() { + return this.defaultValue; + } + + @Override + public String asString() { + return getValue().name(); + } + + @Override + public void fromString(String value) { + this.setValue(value); + } + } + + public static abstract class RangeEntry> extends Entry { + + private final T min, max; + + public RangeEntry(T defaultValue, Consumer consumer, Supplier supplier, T minVal, T maxVal) { + super(defaultValue, consumer, supplier); + + this.min = minVal; + this.max = maxVal; + } + + @Override + public void setValue(T value) { + this.setter.accept(value.compareTo(min) < 0 ? min : value.compareTo(max) > 0 ? max : value); + } + + public T minValue() { + return this.min; + } + + public T maxValue() { + return this.max; + } + } + + public static abstract class Entry { + + protected final T defaultValue; + + protected final Consumer setter; + protected final Supplier getter; + + public Entry (T defaultValue, Consumer consumer, Supplier supplier) { + this.defaultValue = defaultValue; + this.setter = consumer; + this.getter = supplier; + } + + public abstract T getValue(); + public abstract void setValue(T value); + public abstract T getDefault(); + public abstract void fromString(String value); + public abstract String asString(); + + public void setDefault() { + this.setter.accept(defaultValue); + } + } +} diff --git a/src/main/java/ru/betterend/config/ConfigWriter.java b/src/main/java/ru/betterend/config/ConfigWriter.java index 30f9f32c..77ba15f9 100644 --- a/src/main/java/ru/betterend/config/ConfigWriter.java +++ b/src/main/java/ru/betterend/config/ConfigWriter.java @@ -1,79 +1,79 @@ -package ru.betterend.config; - -import java.io.File; -import java.nio.file.Path; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.fabricmc.loader.api.FabricLoader; -import ru.betterend.BetterEnd; -import ru.betterend.util.JsonFactory; - -public class ConfigWriter { - - private final static Path GAME_CONFIG_DIR = FabricLoader.getInstance().getConfigDir(); - public final static File MOD_CONFIG_DIR = new File(GAME_CONFIG_DIR.toFile(), BetterEnd.MOD_ID); - private final static File MAIN_CONFIG_FILE = new File(MOD_CONFIG_DIR, "settings.json"); - - private static JsonObject mainConfig; - - private JsonObject configObject; - private File configFile; - - public JsonObject getConfig() { - return configObject; - } - - public JsonObject loadConfig(File configFile) { - this.configFile = configFile; - if (configObject == null) { - configObject = load(configFile); - } - - return configObject; - } - - public void saveConfig() { - if (configFile == null || configObject == null) { - return; - } - save(configFile, configObject); - } - - public static JsonObject load() { - if (mainConfig == null) { - mainConfig = load(MAIN_CONFIG_FILE); - } - return mainConfig; - } - - public static JsonObject load(File configFile) { - return JsonFactory.getJsonObject(configFile); - } - - public static void save() { - save(MAIN_CONFIG_FILE, mainConfig); - } - - public static void save(JsonElement config) { - save(MAIN_CONFIG_FILE, config); - } - - public static void save(File configFile, JsonElement config) { - JsonFactory.storeJson(configFile, config); - } - - public static String scrubFileName(String input) { - input = input.replaceAll("[/\\ ]+", "_"); - input = input.replaceAll("[,:&\"\\|\\<\\>\\?\\*]", "_"); - - return input; - } - - static { - if (!MOD_CONFIG_DIR.exists()) { - MOD_CONFIG_DIR.mkdirs(); - } - } -} +package ru.betterend.config; + +import java.io.File; +import java.nio.file.Path; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import net.fabricmc.loader.api.FabricLoader; +import ru.betterend.BetterEnd; +import ru.betterend.util.JsonFactory; + +public class ConfigWriter { + + private final static Path GAME_CONFIG_DIR = FabricLoader.getInstance().getConfigDir(); + public final static File MOD_CONFIG_DIR = new File(GAME_CONFIG_DIR.toFile(), BetterEnd.MOD_ID); + private final static File MAIN_CONFIG_FILE = new File(MOD_CONFIG_DIR, "settings.json"); + + private static JsonObject mainConfig; + + private JsonObject configObject; + private File configFile; + + public JsonObject getConfig() { + return configObject; + } + + public JsonObject loadConfig(File configFile) { + this.configFile = configFile; + if (configObject == null) { + configObject = load(configFile); + } + + return configObject; + } + + public void saveConfig() { + if (configFile == null || configObject == null) { + return; + } + save(configFile, configObject); + } + + public static JsonObject load() { + if (mainConfig == null) { + mainConfig = load(MAIN_CONFIG_FILE); + } + return mainConfig; + } + + public static JsonObject load(File configFile) { + return JsonFactory.getJsonObject(configFile); + } + + public static void save() { + save(MAIN_CONFIG_FILE, mainConfig); + } + + public static void save(JsonElement config) { + save(MAIN_CONFIG_FILE, config); + } + + public static void save(File configFile, JsonElement config) { + JsonFactory.storeJson(configFile, config); + } + + public static String scrubFileName(String input) { + input = input.replaceAll("[/\\ ]+", "_"); + input = input.replaceAll("[,:&\"\\|\\<\\>\\?\\*]", "_"); + + return input; + } + + static { + if (!MOD_CONFIG_DIR.exists()) { + MOD_CONFIG_DIR.mkdirs(); + } + } +} diff --git a/src/main/java/ru/betterend/config/MainConfig.java b/src/main/java/ru/betterend/config/MainConfig.java index 9f8b8e8a..ab8c9260 100644 --- a/src/main/java/ru/betterend/config/MainConfig.java +++ b/src/main/java/ru/betterend/config/MainConfig.java @@ -1,34 +1,34 @@ -package ru.betterend.config; - -import com.google.gson.JsonObject; - -public class MainConfig extends Config { - - private static MainConfig instance; - - public static MainConfig getInstance() { - if (instance == null) { - instance = new MainConfig(); - } - - return instance; - } - - private MainConfig() { - //TODO: Need to register config params in the Keeper - - JsonObject config = ConfigWriter.load(); - if (config.size() > 0) { - this.configKeeper.fromJson(config); - } else { - this.configKeeper.toJson(config); - ConfigWriter.save(); - } - } - - @Override - public void saveChanges() { - this.configKeeper.toJson(ConfigWriter.load()); - ConfigWriter.save(); - } -} +package ru.betterend.config; + +import com.google.gson.JsonObject; + +public class MainConfig extends Config { + + private static MainConfig instance; + + public static MainConfig getInstance() { + if (instance == null) { + instance = new MainConfig(); + } + + return instance; + } + + private MainConfig() { + //TODO: Need to register config params in the Keeper + + JsonObject config = ConfigWriter.load(); + if (config.size() > 0) { + this.configKeeper.fromJson(config); + } else { + this.configKeeper.toJson(config); + ConfigWriter.save(); + } + } + + @Override + public void saveChanges() { + this.configKeeper.toJson(ConfigWriter.load()); + ConfigWriter.save(); + } +} diff --git a/src/main/java/ru/betterend/effects/EndEnchantments.java b/src/main/java/ru/betterend/effects/EndEnchantments.java index f59e545d..08474c88 100644 --- a/src/main/java/ru/betterend/effects/EndEnchantments.java +++ b/src/main/java/ru/betterend/effects/EndEnchantments.java @@ -1,16 +1,16 @@ -package ru.betterend.effects; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.util.registry.Registry; -import ru.betterend.BetterEnd; -import ru.betterend.effects.enchantment.EndVeilEnchantment; - -public class EndEnchantments { - public final static Enchantment END_VEIL = registerEnchantment("end_veil", new EndVeilEnchantment()); - - public static Enchantment registerEnchantment(String name, Enchantment enchantment) { - return Registry.register(Registry.ENCHANTMENT, BetterEnd.makeID(name), enchantment); - } - - public static void register() {} -} +package ru.betterend.effects; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.util.registry.Registry; +import ru.betterend.BetterEnd; +import ru.betterend.effects.enchantment.EndVeilEnchantment; + +public class EndEnchantments { + public final static Enchantment END_VEIL = registerEnchantment("end_veil", new EndVeilEnchantment()); + + public static Enchantment registerEnchantment(String name, Enchantment enchantment) { + return Registry.register(Registry.ENCHANTMENT, BetterEnd.makeID(name), enchantment); + } + + public static void register() {} +} diff --git a/src/main/java/ru/betterend/effects/EndStatusEffects.java b/src/main/java/ru/betterend/effects/EndStatusEffects.java index db3e701d..50e049ff 100644 --- a/src/main/java/ru/betterend/effects/EndStatusEffects.java +++ b/src/main/java/ru/betterend/effects/EndStatusEffects.java @@ -1,15 +1,15 @@ -package ru.betterend.effects; - -import net.minecraft.entity.effect.StatusEffect; -import net.minecraft.util.registry.Registry; -import ru.betterend.BetterEnd; -import ru.betterend.effects.status.EndVeilEffect; - -public class EndStatusEffects { - - public final static StatusEffect END_VEIL = registerEffect("end_veil", new EndVeilEffect()); - - public static StatusEffect registerEffect(String name, E effect) { - return Registry.register(Registry.STATUS_EFFECT, BetterEnd.makeID(name), effect); - } -} +package ru.betterend.effects; + +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.util.registry.Registry; +import ru.betterend.BetterEnd; +import ru.betterend.effects.status.EndVeilEffect; + +public class EndStatusEffects { + + public final static StatusEffect END_VEIL = registerEffect("end_veil", new EndVeilEffect()); + + public static StatusEffect registerEffect(String name, E effect) { + return Registry.register(Registry.STATUS_EFFECT, BetterEnd.makeID(name), effect); + } +} diff --git a/src/main/java/ru/betterend/effects/enchantment/EndVeilEnchantment.java b/src/main/java/ru/betterend/effects/enchantment/EndVeilEnchantment.java index ecda6750..bdf29bb4 100644 --- a/src/main/java/ru/betterend/effects/enchantment/EndVeilEnchantment.java +++ b/src/main/java/ru/betterend/effects/enchantment/EndVeilEnchantment.java @@ -1,17 +1,17 @@ -package ru.betterend.effects.enchantment; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentTarget; -import net.minecraft.entity.EquipmentSlot; - -public class EndVeilEnchantment extends Enchantment { - - public EndVeilEnchantment() { - super(Enchantment.Rarity.VERY_RARE, EnchantmentTarget.ARMOR_HEAD, new EquipmentSlot[] { EquipmentSlot.HEAD }); - } - - @Override - public boolean isAvailableForRandomSelection() { - return false; - } -} +package ru.betterend.effects.enchantment; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentTarget; +import net.minecraft.entity.EquipmentSlot; + +public class EndVeilEnchantment extends Enchantment { + + public EndVeilEnchantment() { + super(Enchantment.Rarity.VERY_RARE, EnchantmentTarget.ARMOR_HEAD, new EquipmentSlot[] { EquipmentSlot.HEAD }); + } + + @Override + public boolean isAvailableForRandomSelection() { + return false; + } +} diff --git a/src/main/java/ru/betterend/effects/status/EndVeilEffect.java b/src/main/java/ru/betterend/effects/status/EndVeilEffect.java index b4e1489d..98e2d8ee 100644 --- a/src/main/java/ru/betterend/effects/status/EndVeilEffect.java +++ b/src/main/java/ru/betterend/effects/status/EndVeilEffect.java @@ -1,16 +1,16 @@ -package ru.betterend.effects.status; - -import net.minecraft.entity.effect.StatusEffect; -import net.minecraft.entity.effect.StatusEffectType; - -public class EndVeilEffect extends StatusEffect { - - public EndVeilEffect() { - super(StatusEffectType.BENEFICIAL, 0x0D554A); - } - - @Override - public boolean canApplyUpdateEffect(int duration, int amplifier) { - return false; - } -} +package ru.betterend.effects.status; + +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectType; + +public class EndVeilEffect extends StatusEffect { + + public EndVeilEffect() { + super(StatusEffectType.BENEFICIAL, 0x0D554A); + } + + @Override + public boolean canApplyUpdateEffect(int duration, int amplifier) { + return false; + } +} diff --git a/src/main/java/ru/betterend/entity/EntityShadowWalker.java b/src/main/java/ru/betterend/entity/EntityShadowWalker.java new file mode 100644 index 00000000..38a41e50 --- /dev/null +++ b/src/main/java/ru/betterend/entity/EntityShadowWalker.java @@ -0,0 +1,139 @@ +package ru.betterend.entity; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.goal.FollowTargetGoal; +import net.minecraft.entity.ai.goal.LookAroundGoal; +import net.minecraft.entity.ai.goal.LookAtEntityGoal; +import net.minecraft.entity.ai.goal.MeleeAttackGoal; +import net.minecraft.entity.ai.goal.WanderAroundFarGoal; +import net.minecraft.entity.attribute.DefaultAttributeContainer; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.mob.HostileEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import ru.betterend.registry.EndSounds; +import ru.betterend.util.MHelper; + +public class EntityShadowWalker extends HostileEntity { + public EntityShadowWalker(EntityType entityType, World world) { + super(entityType, world); + } + + @Override + protected void initGoals() { + this.goalSelector.add(2, new AttackGoal(this, 1.0D, false)); + this.goalSelector.add(7, new WanderAroundFarGoal(this, 1.0D)); + this.goalSelector.add(8, new LookAtEntityGoal(this, PlayerEntity.class, 8.0F)); + this.goalSelector.add(8, new LookAroundGoal(this)); + this.targetSelector.add(2, new FollowTargetGoal(this, PlayerEntity.class, true)); + } + + public static DefaultAttributeContainer.Builder createMobAttributes() { + return HostileEntity.createHostileAttributes() + .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 35.0) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.15) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 4.5) + .add(EntityAttributes.GENERIC_ARMOR, 2.0) + .add(EntityAttributes.ZOMBIE_SPAWN_REINFORCEMENTS); + } + + @Override + public void tick() { + super.tick(); + world.addParticle(ParticleTypes.ASH, + getX() + random.nextGaussian() * 0.2, + getY() + random.nextGaussian() * 0.5 + 1, + getZ() + random.nextGaussian() * 0.2, + 0, 0, 0); + world.addParticle(ParticleTypes.SMOKE, + getX() + random.nextGaussian() * 0.2, + getY() + random.nextGaussian() * 0.5 + 1, + getZ() + random.nextGaussian() * 0.2, + 0, 0, 0); + world.addParticle(ParticleTypes.ENTITY_EFFECT, + getX() + random.nextGaussian() * 0.2, + getY() + random.nextGaussian() * 0.5 + 1, + getZ() + random.nextGaussian() * 0.2, + 0, 0, 0); + } + + @Override + protected SoundEvent getAmbientSound() { + return EndSounds.ENTITY_SHADOW_WALKER; + } + + @Override + protected SoundEvent getHurtSound(DamageSource source) { + return EndSounds.ENTITY_SHADOW_WALKER_DAMAGE; + } + + @Override + protected SoundEvent getDeathSound() { + return EndSounds.ENTITY_SHADOW_WALKER_DEATH; + } + + @Override + protected void playStepSound(BlockPos pos, BlockState state) {} + + @Override + protected float getSoundVolume() { + return MHelper.randRange(0.4F, 0.6F, random); + } + + @Override + protected float getSoundPitch() { + return MHelper.randRange(0.75F, 1.25F, random); + } + + @Override + public boolean tryAttack(Entity target) { + boolean attack = super.tryAttack(target); + if (attack && target instanceof LivingEntity) { + LivingEntity living = (LivingEntity) target; + if (!(living.hasStatusEffect(StatusEffects.BLINDNESS))) { + living.addStatusEffect(new StatusEffectInstance(StatusEffects.BLINDNESS, 60)); + } + } + return attack; + } + + private final class AttackGoal extends MeleeAttackGoal { + private final EntityShadowWalker walker; + private int ticks; + + public AttackGoal(EntityShadowWalker walker, double speed, boolean pauseWhenMobIdle) { + super(walker, speed, pauseWhenMobIdle); + this.walker = walker; + } + + public void start() { + super.start(); + this.ticks = 0; + } + + public void stop() { + super.stop(); + this.walker.setAttacking(false); + } + + public void tick() { + super.tick(); + ++this.ticks; + if (this.ticks >= 5 && this.method_28348() < this.method_28349() / 2) { + this.walker.setAttacking(true); + } + else { + this.walker.setAttacking(false); + } + } + } +} diff --git a/src/main/java/ru/betterend/entity/render/RendererEntityShadowWalker.java b/src/main/java/ru/betterend/entity/render/RendererEntityShadowWalker.java new file mode 100644 index 00000000..6e3b8291 --- /dev/null +++ b/src/main/java/ru/betterend/entity/render/RendererEntityShadowWalker.java @@ -0,0 +1,21 @@ +package ru.betterend.entity.render; + +import net.minecraft.client.render.entity.BipedEntityRenderer; +import net.minecraft.client.render.entity.EntityRenderDispatcher; +import net.minecraft.client.render.entity.model.PlayerEntityModel; +import net.minecraft.util.Identifier; +import ru.betterend.BetterEnd; +import ru.betterend.entity.EntityShadowWalker; + +public class RendererEntityShadowWalker extends BipedEntityRenderer> { + private static final Identifier TEXTURE = BetterEnd.makeID("textures/entity/shadow_walker.png"); + + public RendererEntityShadowWalker(EntityRenderDispatcher entityRenderDispatcher) { + super(entityRenderDispatcher, new PlayerEntityModel(0.0F, false), 0.5F); + } + + @Override + public Identifier getTexture(EntityShadowWalker zombieEntity) { + return TEXTURE; + } +} diff --git a/src/main/java/ru/betterend/interfaces/CompoundSerializer.java b/src/main/java/ru/betterend/interfaces/CompoundSerializer.java index a441ddc1..8fd82c18 100644 --- a/src/main/java/ru/betterend/interfaces/CompoundSerializer.java +++ b/src/main/java/ru/betterend/interfaces/CompoundSerializer.java @@ -1,8 +1,8 @@ -package ru.betterend.interfaces; - -import net.minecraft.nbt.CompoundTag; - -public interface CompoundSerializer { - public abstract CompoundTag toTag(CompoundTag tag); - public abstract T fromTag(CompoundTag tag); -} +package ru.betterend.interfaces; + +import net.minecraft.nbt.CompoundTag; + +public interface CompoundSerializer { + public abstract CompoundTag toTag(CompoundTag tag); + public abstract T fromTag(CompoundTag tag); +} diff --git a/src/main/java/ru/betterend/interfaces/IColorProvider.java b/src/main/java/ru/betterend/interfaces/IColorProvider.java index fb0a2101..ae6d0db5 100644 --- a/src/main/java/ru/betterend/interfaces/IColorProvider.java +++ b/src/main/java/ru/betterend/interfaces/IColorProvider.java @@ -1,10 +1,10 @@ -package ru.betterend.interfaces; - -import net.minecraft.client.color.block.BlockColorProvider; -import net.minecraft.client.color.item.ItemColorProvider; - -public interface IColorProvider { - BlockColorProvider getProvider(); - - ItemColorProvider getItemProvider(); -} +package ru.betterend.interfaces; + +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.client.color.item.ItemColorProvider; + +public interface IColorProvider { + BlockColorProvider getProvider(); + + ItemColorProvider getItemProvider(); +} diff --git a/src/main/java/ru/betterend/interfaces/IRenderTypeable.java b/src/main/java/ru/betterend/interfaces/IRenderTypeable.java index fb81963c..1a5c029c 100644 --- a/src/main/java/ru/betterend/interfaces/IRenderTypeable.java +++ b/src/main/java/ru/betterend/interfaces/IRenderTypeable.java @@ -1,8 +1,8 @@ -package ru.betterend.interfaces; - -import ru.betterend.client.render.ERenderLayer; - -public interface IRenderTypeable -{ - public ERenderLayer getRenderLayer(); -} +package ru.betterend.interfaces; + +import ru.betterend.client.render.ERenderLayer; + +public interface IRenderTypeable +{ + public ERenderLayer getRenderLayer(); +} diff --git a/src/main/java/ru/betterend/interfaces/ISlime.java b/src/main/java/ru/betterend/interfaces/ISlime.java index 1ecacda2..646490c8 100644 --- a/src/main/java/ru/betterend/interfaces/ISlime.java +++ b/src/main/java/ru/betterend/interfaces/ISlime.java @@ -1,5 +1,5 @@ -package ru.betterend.interfaces; - -public interface ISlime { - public void setSlimeSize(int size, boolean heal); -} +package ru.betterend.interfaces; + +public interface ISlime { + public void setSlimeSize(int size, boolean heal); +} diff --git a/src/main/java/ru/betterend/interfaces/IdentifiedContext.java b/src/main/java/ru/betterend/interfaces/IdentifiedContext.java index bc2ce453..e03bfbb6 100644 --- a/src/main/java/ru/betterend/interfaces/IdentifiedContext.java +++ b/src/main/java/ru/betterend/interfaces/IdentifiedContext.java @@ -1,12 +1,12 @@ -package ru.betterend.interfaces; - -import net.minecraft.util.Identifier; - -public interface IdentifiedContext { - public Identifier getContextId(); - public void setContextId(Identifier id); - - default void removeId() { - this.setContextId(null); - } -} +package ru.betterend.interfaces; + +import net.minecraft.util.Identifier; + +public interface IdentifiedContext { + public Identifier getContextId(); + public void setContextId(Identifier id); + + default void removeId() { + this.setContextId(null); + } +} diff --git a/src/main/java/ru/betterend/interfaces/TeleportingEntity.java b/src/main/java/ru/betterend/interfaces/TeleportingEntity.java index c46a2c6a..f91957b6 100644 --- a/src/main/java/ru/betterend/interfaces/TeleportingEntity.java +++ b/src/main/java/ru/betterend/interfaces/TeleportingEntity.java @@ -1,14 +1,14 @@ -package ru.betterend.interfaces; - -import net.minecraft.util.math.BlockPos; - -public interface TeleportingEntity { - public abstract long beGetCooldown(); - public abstract void beSetCooldown(long time); - public abstract void beSetExitPos(BlockPos pos); - public abstract BlockPos beGetExitPos(); - - default boolean hasCooldown() { - return this.beGetCooldown() > 0; - } -} +package ru.betterend.interfaces; + +import net.minecraft.util.math.BlockPos; + +public interface TeleportingEntity { + public abstract long beGetCooldown(); + public abstract void beSetCooldown(long time); + public abstract void beSetExitPos(BlockPos pos); + public abstract BlockPos beGetExitPos(); + + default boolean hasCooldown() { + return this.beGetCooldown() > 0; + } +} diff --git a/src/main/java/ru/betterend/item/EndAxe.java b/src/main/java/ru/betterend/item/EndAxe.java index 3379eea2..cfc36b61 100644 --- a/src/main/java/ru/betterend/item/EndAxe.java +++ b/src/main/java/ru/betterend/item/EndAxe.java @@ -1,26 +1,26 @@ -package ru.betterend.item; - -import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; -import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.AxeItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ToolMaterial; -import net.minecraft.tag.Tag; - -public class EndAxe extends AxeItem implements DynamicAttributeTool { - - public EndAxe(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } - - @Override - public int getMiningLevel(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { - if (tag.equals(FabricToolTags.AXES)) { - return this.getMaterial().getMiningLevel(); - } - return 0; - } -} +package ru.betterend.item; + +import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.AxeItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolMaterial; +import net.minecraft.tag.Tag; + +public class EndAxe extends AxeItem implements DynamicAttributeTool { + + public EndAxe(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } + + @Override + public int getMiningLevel(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { + if (tag.equals(FabricToolTags.AXES)) { + return this.getMaterial().getMiningLevel(); + } + return 0; + } +} diff --git a/src/main/java/ru/betterend/item/EndHammer.java b/src/main/java/ru/betterend/item/EndHammer.java index 1cb71c5f..077ff219 100644 --- a/src/main/java/ru/betterend/item/EndHammer.java +++ b/src/main/java/ru/betterend/item/EndHammer.java @@ -1,135 +1,135 @@ -package ru.betterend.item; - -import java.util.UUID; - -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableMultimap.Builder; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; - -import io.netty.util.internal.ThreadLocalRandom; -import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.Material; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.attribute.EntityAttribute; -import net.minecraft.entity.attribute.EntityAttributeModifier; -import net.minecraft.entity.attribute.EntityAttributes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.MiningToolItem; -import net.minecraft.item.ToolMaterial; -import net.minecraft.tag.Tag; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; -import ru.betterend.registry.EndTags; - -public class EndHammer extends MiningToolItem implements DynamicAttributeTool { - - public final static UUID ATTACK_KNOCKBACK_MODIFIER_ID = MathHelper.randomUuid(ThreadLocalRandom.current()); - - private final Multimap attributeModifiers; - - public EndHammer(ToolMaterial material, float attackDamage, float attackSpeed, double knockback, Settings settings) { - super(attackDamage, attackSpeed, material, Sets.newHashSet(), settings); - - Builder builder = ImmutableMultimap.builder(); - builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Weapon modifier", attackDamage + material.getAttackDamage(), EntityAttributeModifier.Operation.ADDITION)); - builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Weapon modifier", attackSpeed, EntityAttributeModifier.Operation.ADDITION)); - builder.put(EntityAttributes.GENERIC_ATTACK_KNOCKBACK, new EntityAttributeModifier(ATTACK_KNOCKBACK_MODIFIER_ID, "Weapon modifier", knockback, EntityAttributeModifier.Operation.ADDITION)); - this.attributeModifiers = builder.build(); - } - - @Override - public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity miner) { - return state.getMaterial().equals(Material.STONE) || - state.getMaterial().equals(Material.GLASS) || - state.isOf(Blocks.DIAMOND_BLOCK) || - state.isOf(Blocks.EMERALD_BLOCK) || - state.isOf(Blocks.LAPIS_BLOCK) || - state.isOf(Blocks.REDSTONE_BLOCK); - } - - @Override - public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { - stack.damage(1, attacker, ((entity) -> { - entity.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND); - })); - - return true; - } - - @Override - public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { - if (state.getHardness(world, pos) != 0.0F) { - stack.damage(1, miner, ((entity) -> { - entity.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND); - })); - } - - return true; - } - - @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - if (state.getMaterial().equals(Material.GLASS)) { - return this.getMaterial().getMiningSpeedMultiplier() * 2.0F; - } - if (isEffectiveOn(state)) { - float mult = 1.0F; - if (state.isOf(Blocks.DIAMOND_BLOCK) || state.isOf(Blocks.EMERALD_BLOCK) || state.isOf(Blocks.LAPIS_BLOCK) || state.isOf(Blocks.REDSTONE_BLOCK)) { - mult = this.getMaterial().getMiningSpeedMultiplier(); - } else { - mult = this.getMaterial().getMiningSpeedMultiplier() / 2.0F; - } - return mult > 1.0F ? mult : 1.0F; - } - return 1.0F; - } - - @Override - public float getMiningSpeedMultiplier(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { - if (tag.equals(EndTags.HAMMERS)) { - return this.getMiningSpeedMultiplier(stack, state); - } - return 1.0F; - } - - @Override - public int getMiningLevel(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { - if (tag.equals(EndTags.HAMMERS)) { - return this.getMaterial().getMiningLevel(); - } - return 0; - } - - @Override - public boolean isEffectiveOn(BlockState state) { - if (state.getMaterial().equals(Material.GLASS)) { - return true; - } - if (!state.isOf(Blocks.REDSTONE_BLOCK) && !state.isOf(Blocks.DIAMOND_BLOCK) && !state.isOf(Blocks.EMERALD_BLOCK) && !state.isOf(Blocks.LAPIS_BLOCK) && !state.getMaterial().equals(Material.STONE)) { - return false; - } - int level = this.getMaterial().getMiningLevel(); - if (state.isOf(Blocks.IRON_ORE) || state.isOf(Blocks.LAPIS_BLOCK) || state.isOf(Blocks.LAPIS_ORE)) { - return level >= 1; - } - if (state.isOf(Blocks.DIAMOND_BLOCK) && !state.isOf(Blocks.DIAMOND_ORE) || state.isOf(Blocks.EMERALD_ORE) || state.isOf(Blocks.EMERALD_BLOCK) || state.isOf(Blocks.GOLD_ORE) || state.isOf(Blocks.REDSTONE_ORE)) { - return level >= 2; - } - if (state.isOf(Blocks.OBSIDIAN) || state.isOf(Blocks.CRYING_OBSIDIAN) || state.isOf(Blocks.RESPAWN_ANCHOR) || state.isOf(Blocks.ANCIENT_DEBRIS)) { - return level >= 3; - } - return true; - } - - @Override - public Multimap getAttributeModifiers(EquipmentSlot slot) { - return slot == EquipmentSlot.MAINHAND ? this.attributeModifiers : super.getAttributeModifiers(slot); - } -} +package ru.betterend.item; + +import java.util.UUID; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableMultimap.Builder; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; + +import io.netty.util.internal.ThreadLocalRandom; +import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.Material; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.MiningToolItem; +import net.minecraft.item.ToolMaterial; +import net.minecraft.tag.Tag; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import ru.betterend.registry.EndTags; + +public class EndHammer extends MiningToolItem implements DynamicAttributeTool { + + public final static UUID ATTACK_KNOCKBACK_MODIFIER_ID = MathHelper.randomUuid(ThreadLocalRandom.current()); + + private final Multimap attributeModifiers; + + public EndHammer(ToolMaterial material, float attackDamage, float attackSpeed, double knockback, Settings settings) { + super(attackDamage, attackSpeed, material, Sets.newHashSet(), settings); + + Builder builder = ImmutableMultimap.builder(); + builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Weapon modifier", attackDamage + material.getAttackDamage(), EntityAttributeModifier.Operation.ADDITION)); + builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Weapon modifier", attackSpeed, EntityAttributeModifier.Operation.ADDITION)); + builder.put(EntityAttributes.GENERIC_ATTACK_KNOCKBACK, new EntityAttributeModifier(ATTACK_KNOCKBACK_MODIFIER_ID, "Weapon modifier", knockback, EntityAttributeModifier.Operation.ADDITION)); + this.attributeModifiers = builder.build(); + } + + @Override + public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity miner) { + return state.getMaterial().equals(Material.STONE) || + state.getMaterial().equals(Material.GLASS) || + state.isOf(Blocks.DIAMOND_BLOCK) || + state.isOf(Blocks.EMERALD_BLOCK) || + state.isOf(Blocks.LAPIS_BLOCK) || + state.isOf(Blocks.REDSTONE_BLOCK); + } + + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + stack.damage(1, attacker, ((entity) -> { + entity.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND); + })); + + return true; + } + + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + if (state.getHardness(world, pos) != 0.0F) { + stack.damage(1, miner, ((entity) -> { + entity.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND); + })); + } + + return true; + } + + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + if (state.getMaterial().equals(Material.GLASS)) { + return this.getMaterial().getMiningSpeedMultiplier() * 2.0F; + } + if (isEffectiveOn(state)) { + float mult = 1.0F; + if (state.isOf(Blocks.DIAMOND_BLOCK) || state.isOf(Blocks.EMERALD_BLOCK) || state.isOf(Blocks.LAPIS_BLOCK) || state.isOf(Blocks.REDSTONE_BLOCK)) { + mult = this.getMaterial().getMiningSpeedMultiplier(); + } else { + mult = this.getMaterial().getMiningSpeedMultiplier() / 2.0F; + } + return mult > 1.0F ? mult : 1.0F; + } + return 1.0F; + } + + @Override + public float getMiningSpeedMultiplier(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { + if (tag.equals(EndTags.HAMMERS)) { + return this.getMiningSpeedMultiplier(stack, state); + } + return 1.0F; + } + + @Override + public int getMiningLevel(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { + if (tag.equals(EndTags.HAMMERS)) { + return this.getMaterial().getMiningLevel(); + } + return 0; + } + + @Override + public boolean isEffectiveOn(BlockState state) { + if (state.getMaterial().equals(Material.GLASS)) { + return true; + } + if (!state.isOf(Blocks.REDSTONE_BLOCK) && !state.isOf(Blocks.DIAMOND_BLOCK) && !state.isOf(Blocks.EMERALD_BLOCK) && !state.isOf(Blocks.LAPIS_BLOCK) && !state.getMaterial().equals(Material.STONE)) { + return false; + } + int level = this.getMaterial().getMiningLevel(); + if (state.isOf(Blocks.IRON_ORE) || state.isOf(Blocks.LAPIS_BLOCK) || state.isOf(Blocks.LAPIS_ORE)) { + return level >= 1; + } + if (state.isOf(Blocks.DIAMOND_BLOCK) && !state.isOf(Blocks.DIAMOND_ORE) || state.isOf(Blocks.EMERALD_ORE) || state.isOf(Blocks.EMERALD_BLOCK) || state.isOf(Blocks.GOLD_ORE) || state.isOf(Blocks.REDSTONE_ORE)) { + return level >= 2; + } + if (state.isOf(Blocks.OBSIDIAN) || state.isOf(Blocks.CRYING_OBSIDIAN) || state.isOf(Blocks.RESPAWN_ANCHOR) || state.isOf(Blocks.ANCIENT_DEBRIS)) { + return level >= 3; + } + return true; + } + + @Override + public Multimap getAttributeModifiers(EquipmentSlot slot) { + return slot == EquipmentSlot.MAINHAND ? this.attributeModifiers : super.getAttributeModifiers(slot); + } +} diff --git a/src/main/java/ru/betterend/item/EndHoe.java b/src/main/java/ru/betterend/item/EndHoe.java index 78bc3993..6497503f 100644 --- a/src/main/java/ru/betterend/item/EndHoe.java +++ b/src/main/java/ru/betterend/item/EndHoe.java @@ -1,11 +1,11 @@ -package ru.betterend.item; - -import net.minecraft.item.HoeItem; -import net.minecraft.item.ToolMaterial; - -public class EndHoe extends HoeItem { - - public EndHoe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } -} +package ru.betterend.item; + +import net.minecraft.item.HoeItem; +import net.minecraft.item.ToolMaterial; + +public class EndHoe extends HoeItem { + + public EndHoe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } +} diff --git a/src/main/java/ru/betterend/item/EndPickaxe.java b/src/main/java/ru/betterend/item/EndPickaxe.java index 0d3db593..27cebcd7 100644 --- a/src/main/java/ru/betterend/item/EndPickaxe.java +++ b/src/main/java/ru/betterend/item/EndPickaxe.java @@ -1,26 +1,26 @@ -package ru.betterend.item; - -import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; -import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.PickaxeItem; -import net.minecraft.item.ToolMaterial; -import net.minecraft.tag.Tag; - -public class EndPickaxe extends PickaxeItem implements DynamicAttributeTool { - - public EndPickaxe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); - } - - @Override - public int getMiningLevel(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { - if (tag.equals(FabricToolTags.PICKAXES)) { - return this.getMaterial().getMiningLevel(); - } - return 0; - } -} +package ru.betterend.item; + +import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.PickaxeItem; +import net.minecraft.item.ToolMaterial; +import net.minecraft.tag.Tag; + +public class EndPickaxe extends PickaxeItem implements DynamicAttributeTool { + + public EndPickaxe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } + + @Override + public int getMiningLevel(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { + if (tag.equals(FabricToolTags.PICKAXES)) { + return this.getMaterial().getMiningLevel(); + } + return 0; + } +} diff --git a/src/main/java/ru/betterend/item/EternalCrystal.java b/src/main/java/ru/betterend/item/EternalCrystal.java index 29e2974e..acf3b7ff 100644 --- a/src/main/java/ru/betterend/item/EternalCrystal.java +++ b/src/main/java/ru/betterend/item/EternalCrystal.java @@ -1,11 +1,11 @@ -package ru.betterend.item; - -import net.minecraft.item.Item; -import ru.betterend.registry.EndItems; - -public class EternalCrystal extends Item { - - public EternalCrystal() { - super(EndItems.makeSettings()); - } +package ru.betterend.item; + +import net.minecraft.item.Item; +import ru.betterend.registry.EndItems; + +public class EternalCrystal extends Item { + + public EternalCrystal() { + super(EndItems.makeSettings()); + } } \ No newline at end of file diff --git a/src/main/java/ru/betterend/mixin/client/ClientRecipeBookMixin.java b/src/main/java/ru/betterend/mixin/client/ClientRecipeBookMixin.java index 1bae0e59..1ef0fa79 100644 --- a/src/main/java/ru/betterend/mixin/client/ClientRecipeBookMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ClientRecipeBookMixin.java @@ -1,22 +1,22 @@ -package ru.betterend.mixin.client; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.client.recipebook.ClientRecipeBook; -import net.minecraft.client.recipebook.RecipeBookGroup; -import net.minecraft.recipe.Recipe; -import ru.betterend.recipe.builders.AlloyingRecipe; - -@Mixin(ClientRecipeBook.class) -public abstract class ClientRecipeBookMixin { - @Inject(method = "getGroupForRecipe", at = @At("HEAD"), cancellable = true) - private static void getGroupForRecipe(Recipe recipe, CallbackInfoReturnable cinfo) { - if (recipe instanceof AlloyingRecipe) { - cinfo.setReturnValue(RecipeBookGroup.BLAST_FURNACE_MISC); - cinfo.cancel(); - } - } -} +package ru.betterend.mixin.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.client.recipebook.ClientRecipeBook; +import net.minecraft.client.recipebook.RecipeBookGroup; +import net.minecraft.recipe.Recipe; +import ru.betterend.recipe.builders.AlloyingRecipe; + +@Mixin(ClientRecipeBook.class) +public abstract class ClientRecipeBookMixin { + @Inject(method = "getGroupForRecipe", at = @At("HEAD"), cancellable = true) + private static void getGroupForRecipe(Recipe recipe, CallbackInfoReturnable cinfo) { + if (recipe instanceof AlloyingRecipe) { + cinfo.setReturnValue(RecipeBookGroup.BLAST_FURNACE_MISC); + cinfo.cancel(); + } + } +} diff --git a/src/main/java/ru/betterend/mixin/client/DeserializationContextMixin.java b/src/main/java/ru/betterend/mixin/client/DeserializationContextMixin.java index 35adb265..0852e1e2 100644 --- a/src/main/java/ru/betterend/mixin/client/DeserializationContextMixin.java +++ b/src/main/java/ru/betterend/mixin/client/DeserializationContextMixin.java @@ -1,23 +1,23 @@ -package ru.betterend.mixin.client; - -import org.spongepowered.asm.mixin.Mixin; - -import net.minecraft.client.render.model.json.ModelVariantMap.DeserializationContext; -import net.minecraft.util.Identifier; -import ru.betterend.interfaces.IdentifiedContext; - -@Mixin(DeserializationContext.class) -public class DeserializationContextMixin implements IdentifiedContext { - - private Identifier contextId; - - @Override - public Identifier getContextId() { - return this.contextId; - } - - @Override - public void setContextId(Identifier id) { - this.contextId = id; - } -} +package ru.betterend.mixin.client; + +import org.spongepowered.asm.mixin.Mixin; + +import net.minecraft.client.render.model.json.ModelVariantMap.DeserializationContext; +import net.minecraft.util.Identifier; +import ru.betterend.interfaces.IdentifiedContext; + +@Mixin(DeserializationContext.class) +public class DeserializationContextMixin implements IdentifiedContext { + + private Identifier contextId; + + @Override + public Identifier getContextId() { + return this.contextId; + } + + @Override + public void setContextId(Identifier id) { + this.contextId = id; + } +} diff --git a/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java b/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java index 214f6ffa..bdafb3bd 100644 --- a/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java +++ b/src/main/java/ru/betterend/mixin/client/NamespaceResourceManagerMixin.java @@ -1,47 +1,47 @@ -package ru.betterend.mixin.client; - -import java.util.List; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.At.Shift; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import com.google.common.collect.Lists; - -import net.minecraft.block.Block; -import net.minecraft.resource.NamespaceResourceManager; -import net.minecraft.resource.Resource; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import ru.betterend.BetterEnd; -import ru.betterend.interfaces.Patterned; - -@Mixin(NamespaceResourceManager.class) -public abstract class NamespaceResourceManagerMixin { - - @Shadow - public abstract Resource getResource(Identifier id); - - @Inject(method = "getAllResources", cancellable = true, at = @At( - value = "NEW", - target = "java/io/FileNotFoundException", - shift = Shift.BEFORE)) - public void getStatesPattern(Identifier id, CallbackInfoReturnable> info) { - if (id.getNamespace().contains(BetterEnd.MOD_ID)) { - String[] data = id.getPath().split("/"); - if (data.length > 1) { - Identifier blockId = BetterEnd.makeID(data[1].replace(".json", "")); - Block block = Registry.BLOCK.get(blockId); - if (block instanceof Patterned) { - List resources = Lists.newArrayList(); - resources.add(this.getResource(((Patterned) block).statePatternId())); - info.setReturnValue(resources); - info.cancel(); - } - } - } - } -} +package ru.betterend.mixin.client; + +import java.util.List; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.At.Shift; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.google.common.collect.Lists; + +import net.minecraft.block.Block; +import net.minecraft.resource.NamespaceResourceManager; +import net.minecraft.resource.Resource; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import ru.betterend.BetterEnd; +import ru.betterend.interfaces.Patterned; + +@Mixin(NamespaceResourceManager.class) +public abstract class NamespaceResourceManagerMixin { + + @Shadow + public abstract Resource getResource(Identifier id); + + @Inject(method = "getAllResources", cancellable = true, at = @At( + value = "NEW", + target = "java/io/FileNotFoundException", + shift = Shift.BEFORE)) + public void getStatesPattern(Identifier id, CallbackInfoReturnable> info) { + if (id.getNamespace().contains(BetterEnd.MOD_ID)) { + String[] data = id.getPath().split("/"); + if (data.length > 1) { + Identifier blockId = BetterEnd.makeID(data[1].replace(".json", "")); + Block block = Registry.BLOCK.get(blockId); + if (block instanceof Patterned) { + List resources = Lists.newArrayList(); + resources.add(this.getResource(((Patterned) block).statePatternId())); + info.setReturnValue(resources); + info.cancel(); + } + } + } + } +} diff --git a/src/main/java/ru/betterend/mixin/common/AbstractBlockMixin.java b/src/main/java/ru/betterend/mixin/common/AbstractBlockMixin.java index 8c0b3358..68df0c6b 100644 --- a/src/main/java/ru/betterend/mixin/common/AbstractBlockMixin.java +++ b/src/main/java/ru/betterend/mixin/common/AbstractBlockMixin.java @@ -1,51 +1,51 @@ -package ru.betterend.mixin.common; - -import java.util.List; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import com.google.common.collect.Lists; - -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.loot.context.LootContext; -import net.minecraft.loot.context.LootContextParameters; -import net.minecraft.util.math.MathHelper; -import ru.betterend.item.EndHammer; -import ru.betterend.util.MHelper; - -@Mixin(AbstractBlock.class) -public abstract class AbstractBlockMixin { - - @Inject(method = "getDroppedStacks", at = @At("HEAD"), cancellable = true) - public void getDroppedStacks(BlockState state, LootContext.Builder builder, CallbackInfoReturnable> info) { - if (state.isOf(Blocks.GLOWSTONE)) { - ItemStack tool = builder.get(LootContextParameters.TOOL); - if (tool != null && tool.getItem() instanceof EndHammer) { - int min = 3; - int max = 4; - int count = 0; - int fortune = EnchantmentHelper.getLevel(Enchantments.FORTUNE, tool); - if (fortune > 0) { - fortune /= Enchantments.FORTUNE.getMaxLevel(); - min = MathHelper.clamp(min + fortune, min, max); - if (min == max) { - info.setReturnValue(Lists.newArrayList(new ItemStack(Items.GLOWSTONE_DUST, max))); - info.cancel(); - } - } - count = MHelper.randRange(min, max, MHelper.RANDOM); - info.setReturnValue(Lists.newArrayList(new ItemStack(Items.GLOWSTONE_DUST, count))); - info.cancel(); - } - } - } -} +package ru.betterend.mixin.common; + +import java.util.List; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.google.common.collect.Lists; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.loot.context.LootContext; +import net.minecraft.loot.context.LootContextParameters; +import net.minecraft.util.math.MathHelper; +import ru.betterend.item.EndHammer; +import ru.betterend.util.MHelper; + +@Mixin(AbstractBlock.class) +public abstract class AbstractBlockMixin { + + @Inject(method = "getDroppedStacks", at = @At("HEAD"), cancellable = true) + public void getDroppedStacks(BlockState state, LootContext.Builder builder, CallbackInfoReturnable> info) { + if (state.isOf(Blocks.GLOWSTONE)) { + ItemStack tool = builder.get(LootContextParameters.TOOL); + if (tool != null && tool.getItem() instanceof EndHammer) { + int min = 3; + int max = 4; + int count = 0; + int fortune = EnchantmentHelper.getLevel(Enchantments.FORTUNE, tool); + if (fortune > 0) { + fortune /= Enchantments.FORTUNE.getMaxLevel(); + min = MathHelper.clamp(min + fortune, min, max); + if (min == max) { + info.setReturnValue(Lists.newArrayList(new ItemStack(Items.GLOWSTONE_DUST, max))); + info.cancel(); + } + } + count = MHelper.randRange(min, max, MHelper.RANDOM); + info.setReturnValue(Lists.newArrayList(new ItemStack(Items.GLOWSTONE_DUST, count))); + info.cancel(); + } + } + } +} diff --git a/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java b/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java index d2292b3d..c8a4aa23 100644 --- a/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java +++ b/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java @@ -1,92 +1,92 @@ -package ru.betterend.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.block.AnvilBlock; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.recipe.RecipeManager; -import net.minecraft.screen.AnvilScreenHandler; -import net.minecraft.screen.ForgingScreenHandler; -import net.minecraft.screen.ScreenHandlerContext; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.tag.BlockTags; -import net.minecraft.world.World; -import ru.betterend.recipe.builders.AnvilSmithingRecipe; - -@Mixin(AnvilScreenHandler.class) -public abstract class AnvilScreenHandlerMixin extends ForgingScreenHandler { - - private final World world = this.player.world; - private final RecipeManager recipeManager = this.world.getRecipeManager(); - private AnvilSmithingRecipe currentRecipe; - - public AnvilScreenHandlerMixin(ScreenHandlerType type, int syncId, PlayerInventory playerInventory, - ScreenHandlerContext context) { - super(type, syncId, playerInventory, context); - } - - @Shadow - public abstract void updateResult(); - - @Inject(method = "canTakeOutput", at = @At("HEAD"), cancellable = true) - protected void canTakeOutput(PlayerEntity player, boolean present, CallbackInfoReturnable info) { - if (currentRecipe != null) { - ItemStack output = this.currentRecipe.craft(input, player); - if (!output.isEmpty()) { - info.setReturnValue(true); - info.cancel(); - } - } - } - - @Inject(method = "onTakeOutput", at = @At("HEAD"), cancellable = true) - protected void onTakeOutput(PlayerEntity player, ItemStack stack, CallbackInfoReturnable info) { - if (currentRecipe != null) { - this.input.getStack(1).decrement(1); - this.updateResult(); - this.context.run((world, blockPos) -> { - BlockState anvilState = world.getBlockState(blockPos); - if (!player.abilities.creativeMode && anvilState.isIn(BlockTags.ANVIL) && player.getRandom().nextFloat() < 0.12F) { - BlockState landingState = AnvilBlock.getLandingState(anvilState); - if (landingState == null) { - world.removeBlock(blockPos, false); - world.syncWorldEvent(1029, blockPos, 0); - } else { - world.setBlockState(blockPos, landingState, 2); - world.syncWorldEvent(1030, blockPos, 0); - } - } else { - world.syncWorldEvent(1030, blockPos, 0); - } - - }); - info.setReturnValue(stack); - info.cancel(); - } - } - - @Inject(method = "updateResult", at = @At("HEAD"), cancellable = true) - public void updateOutput(CallbackInfo info) { - this.currentRecipe = this.recipeManager.getFirstMatch(AnvilSmithingRecipe.TYPE, input, world).orElse(null); - if (currentRecipe != null) { - this.output.setStack(0, currentRecipe.craft(input)); - this.sendContentUpdates(); - info.cancel(); - } - } - - @Inject(method = "setNewItemName", at = @At("HEAD"), cancellable = true) - public void setNewItemName(String string, CallbackInfo info) { - if (currentRecipe != null) { - info.cancel(); - } - } -} +package ru.betterend.mixin.common; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.block.AnvilBlock; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.RecipeManager; +import net.minecraft.screen.AnvilScreenHandler; +import net.minecraft.screen.ForgingScreenHandler; +import net.minecraft.screen.ScreenHandlerContext; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.tag.BlockTags; +import net.minecraft.world.World; +import ru.betterend.recipe.builders.AnvilSmithingRecipe; + +@Mixin(AnvilScreenHandler.class) +public abstract class AnvilScreenHandlerMixin extends ForgingScreenHandler { + + private final World world = this.player.world; + private final RecipeManager recipeManager = this.world.getRecipeManager(); + private AnvilSmithingRecipe currentRecipe; + + public AnvilScreenHandlerMixin(ScreenHandlerType type, int syncId, PlayerInventory playerInventory, + ScreenHandlerContext context) { + super(type, syncId, playerInventory, context); + } + + @Shadow + public abstract void updateResult(); + + @Inject(method = "canTakeOutput", at = @At("HEAD"), cancellable = true) + protected void canTakeOutput(PlayerEntity player, boolean present, CallbackInfoReturnable info) { + if (currentRecipe != null) { + ItemStack output = this.currentRecipe.craft(input, player); + if (!output.isEmpty()) { + info.setReturnValue(true); + info.cancel(); + } + } + } + + @Inject(method = "onTakeOutput", at = @At("HEAD"), cancellable = true) + protected void onTakeOutput(PlayerEntity player, ItemStack stack, CallbackInfoReturnable info) { + if (currentRecipe != null) { + this.input.getStack(1).decrement(1); + this.updateResult(); + this.context.run((world, blockPos) -> { + BlockState anvilState = world.getBlockState(blockPos); + if (!player.abilities.creativeMode && anvilState.isIn(BlockTags.ANVIL) && player.getRandom().nextFloat() < 0.12F) { + BlockState landingState = AnvilBlock.getLandingState(anvilState); + if (landingState == null) { + world.removeBlock(blockPos, false); + world.syncWorldEvent(1029, blockPos, 0); + } else { + world.setBlockState(blockPos, landingState, 2); + world.syncWorldEvent(1030, blockPos, 0); + } + } else { + world.syncWorldEvent(1030, blockPos, 0); + } + + }); + info.setReturnValue(stack); + info.cancel(); + } + } + + @Inject(method = "updateResult", at = @At("HEAD"), cancellable = true) + public void updateOutput(CallbackInfo info) { + this.currentRecipe = this.recipeManager.getFirstMatch(AnvilSmithingRecipe.TYPE, input, world).orElse(null); + if (currentRecipe != null) { + this.output.setStack(0, currentRecipe.craft(input)); + this.sendContentUpdates(); + info.cancel(); + } + } + + @Inject(method = "setNewItemName", at = @At("HEAD"), cancellable = true) + public void setNewItemName(String string, CallbackInfo info) { + if (currentRecipe != null) { + info.cancel(); + } + } +} diff --git a/src/main/java/ru/betterend/mixin/common/BrewingAccessor.java b/src/main/java/ru/betterend/mixin/common/BrewingAccessor.java index 751ee040..17129e52 100644 --- a/src/main/java/ru/betterend/mixin/common/BrewingAccessor.java +++ b/src/main/java/ru/betterend/mixin/common/BrewingAccessor.java @@ -1,16 +1,16 @@ -package ru.betterend.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.item.Item; -import net.minecraft.potion.Potion; -import net.minecraft.recipe.BrewingRecipeRegistry; - -@Mixin(BrewingRecipeRegistry.class) -public interface BrewingAccessor { - @Invoker - static void callRegisterPotionRecipe(Potion input, Item item, Potion output) { - throw new AssertionError("@Invoker dummy body called"); - } -} +package ru.betterend.mixin.common; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.item.Item; +import net.minecraft.potion.Potion; +import net.minecraft.recipe.BrewingRecipeRegistry; + +@Mixin(BrewingRecipeRegistry.class) +public interface BrewingAccessor { + @Invoker + static void callRegisterPotionRecipe(Potion input, Item item, Potion output) { + throw new AssertionError("@Invoker dummy body called"); + } +} diff --git a/src/main/java/ru/betterend/mixin/common/EndermanEntityMixin.java b/src/main/java/ru/betterend/mixin/common/EndermanEntityMixin.java index c815399d..5bd9b493 100644 --- a/src/main/java/ru/betterend/mixin/common/EndermanEntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/EndermanEntityMixin.java @@ -1,26 +1,26 @@ -package ru.betterend.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.mob.EndermanEntity; -import net.minecraft.entity.player.PlayerEntity; -import ru.betterend.effects.EndEnchantments; -import ru.betterend.effects.EndStatusEffects; - -@Mixin(EndermanEntity.class) -public abstract class EndermanEntityMixin { - - @Inject(method = "isPlayerStaring", at = @At("HEAD"), cancellable = true) - private void isPlayerStaring(PlayerEntity player, CallbackInfoReturnable info) { - if (player.isCreative() || player.hasStatusEffect(EndStatusEffects.END_VEIL) || - EnchantmentHelper.getLevel(EndEnchantments.END_VEIL, player.getEquippedStack(EquipmentSlot.HEAD)) > 0) { - info.setReturnValue(false); - info.cancel(); - } - } -} +package ru.betterend.mixin.common; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.mob.EndermanEntity; +import net.minecraft.entity.player.PlayerEntity; +import ru.betterend.effects.EndEnchantments; +import ru.betterend.effects.EndStatusEffects; + +@Mixin(EndermanEntity.class) +public abstract class EndermanEntityMixin { + + @Inject(method = "isPlayerStaring", at = @At("HEAD"), cancellable = true) + private void isPlayerStaring(PlayerEntity player, CallbackInfoReturnable info) { + if (player.isCreative() || player.hasStatusEffect(EndStatusEffects.END_VEIL) || + EnchantmentHelper.getLevel(EndEnchantments.END_VEIL, player.getEquippedStack(EquipmentSlot.HEAD)) > 0) { + info.setReturnValue(false); + info.cancel(); + } + } +} diff --git a/src/main/java/ru/betterend/mixin/common/EntityMixin.java b/src/main/java/ru/betterend/mixin/common/EntityMixin.java index 023a58fa..3710312a 100644 --- a/src/main/java/ru/betterend/mixin/common/EntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/EntityMixin.java @@ -1,116 +1,116 @@ -package ru.betterend.mixin.common; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.TeleportTarget; -import net.minecraft.world.World; -import ru.betterend.interfaces.TeleportingEntity; - -@Mixin(Entity.class) -public abstract class EntityMixin implements TeleportingEntity { - - private BlockPos beExitPos; - private long beCooldown; - - @Shadow - public float yaw; - @Shadow - public float pitch; - @Shadow - public boolean removed; - @Shadow - public World world; - - @Final - @Shadow - public abstract void detach(); - - @Shadow - public abstract Vec3d getVelocity(); - - @Shadow - public abstract EntityType getType(); - - @Shadow - public abstract void copyFrom(Entity original); - - @Shadow - public abstract Entity moveToWorld(ServerWorld destination); - - @Shadow - protected abstract TeleportTarget getTeleportTarget(ServerWorld destination); - - @Inject(method = "moveToWorld", at = @At("HEAD"), cancellable = true) - public void moveToWorld(ServerWorld destination, CallbackInfoReturnable info) { - if (!removed && beExitPos != null && world instanceof ServerWorld) { - this.detach(); - this.world.getProfiler().push("changeDimension"); - this.world.getProfiler().push("reposition"); - TeleportTarget teleportTarget = this.getTeleportTarget(destination); - if (teleportTarget != null) { - this.world.getProfiler().swap("reloading"); - Entity entity = this.getType().create(destination); - if (entity != null) { - entity.copyFrom(Entity.class.cast(this)); - entity.refreshPositionAndAngles(teleportTarget.position.x, teleportTarget.position.y, teleportTarget.position.z, teleportTarget.yaw, entity.pitch); - entity.setVelocity(teleportTarget.velocity); - destination.onDimensionChanged(entity); - } - this.removed = true; - this.world.getProfiler().pop(); - ((ServerWorld) this.world).resetIdleTimeout(); - destination.resetIdleTimeout(); - this.world.getProfiler().pop(); - this.beExitPos = null; - info.setReturnValue(entity); - info.cancel(); - } - } - } - - @Inject(method = "getTeleportTarget", at = @At("HEAD"), cancellable = true) - protected void getTeleportTarget(ServerWorld destination, CallbackInfoReturnable info) { - if (beExitPos != null) { - info.setReturnValue(new TeleportTarget(new Vec3d(beExitPos.getX() + 0.5D, beExitPos.getY(), beExitPos.getZ() + 0.5D), getVelocity(), yaw, pitch)); - info.cancel(); - } - } - - @Inject(method = "baseTick", at = @At("TAIL")) - public void baseTick(CallbackInfo info) { - if (hasCooldown()) { - this.beCooldown--; - } - } - - @Override - public long beGetCooldown() { - return this.beCooldown; - } - - @Override - public void beSetCooldown(long time) { - this.beCooldown = time; - } - - @Override - public void beSetExitPos(BlockPos pos) { - this.beExitPos = pos; - } - - @Override - public BlockPos beGetExitPos() { - return this.beExitPos; - } -} +package ru.betterend.mixin.common; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.TeleportTarget; +import net.minecraft.world.World; +import ru.betterend.interfaces.TeleportingEntity; + +@Mixin(Entity.class) +public abstract class EntityMixin implements TeleportingEntity { + + private BlockPos beExitPos; + private long beCooldown; + + @Shadow + public float yaw; + @Shadow + public float pitch; + @Shadow + public boolean removed; + @Shadow + public World world; + + @Final + @Shadow + public abstract void detach(); + + @Shadow + public abstract Vec3d getVelocity(); + + @Shadow + public abstract EntityType getType(); + + @Shadow + public abstract void copyFrom(Entity original); + + @Shadow + public abstract Entity moveToWorld(ServerWorld destination); + + @Shadow + protected abstract TeleportTarget getTeleportTarget(ServerWorld destination); + + @Inject(method = "moveToWorld", at = @At("HEAD"), cancellable = true) + public void moveToWorld(ServerWorld destination, CallbackInfoReturnable info) { + if (!removed && beExitPos != null && world instanceof ServerWorld) { + this.detach(); + this.world.getProfiler().push("changeDimension"); + this.world.getProfiler().push("reposition"); + TeleportTarget teleportTarget = this.getTeleportTarget(destination); + if (teleportTarget != null) { + this.world.getProfiler().swap("reloading"); + Entity entity = this.getType().create(destination); + if (entity != null) { + entity.copyFrom(Entity.class.cast(this)); + entity.refreshPositionAndAngles(teleportTarget.position.x, teleportTarget.position.y, teleportTarget.position.z, teleportTarget.yaw, entity.pitch); + entity.setVelocity(teleportTarget.velocity); + destination.onDimensionChanged(entity); + } + this.removed = true; + this.world.getProfiler().pop(); + ((ServerWorld) this.world).resetIdleTimeout(); + destination.resetIdleTimeout(); + this.world.getProfiler().pop(); + this.beExitPos = null; + info.setReturnValue(entity); + info.cancel(); + } + } + } + + @Inject(method = "getTeleportTarget", at = @At("HEAD"), cancellable = true) + protected void getTeleportTarget(ServerWorld destination, CallbackInfoReturnable info) { + if (beExitPos != null) { + info.setReturnValue(new TeleportTarget(new Vec3d(beExitPos.getX() + 0.5D, beExitPos.getY(), beExitPos.getZ() + 0.5D), getVelocity(), yaw, pitch)); + info.cancel(); + } + } + + @Inject(method = "baseTick", at = @At("TAIL")) + public void baseTick(CallbackInfo info) { + if (hasCooldown()) { + this.beCooldown--; + } + } + + @Override + public long beGetCooldown() { + return this.beCooldown; + } + + @Override + public void beSetCooldown(long time) { + this.beCooldown = time; + } + + @Override + public void beSetExitPos(BlockPos pos) { + this.beExitPos = pos; + } + + @Override + public BlockPos beGetExitPos() { + return this.beExitPos; + } +} diff --git a/src/main/java/ru/betterend/mixin/common/IngredientMixin.java b/src/main/java/ru/betterend/mixin/common/IngredientMixin.java index 53466da3..5144e268 100644 --- a/src/main/java/ru/betterend/mixin/common/IngredientMixin.java +++ b/src/main/java/ru/betterend/mixin/common/IngredientMixin.java @@ -1,46 +1,46 @@ -package ru.betterend.mixin.common; - -import java.util.Arrays; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.recipe.Ingredient; - -import ru.betterend.interfaces.CompoundSerializer; - -@Mixin(Ingredient.class) -public abstract class IngredientMixin implements CompoundSerializer { - - @Shadow - private ItemStack[] matchingStacks; - - @Shadow - protected abstract void cacheMatchingStacks(); - - @Override - public CompoundTag toTag(CompoundTag tag) { - this.cacheMatchingStacks(); - int i = 0; - tag.putInt("length", matchingStacks.length); - for (ItemStack stack : matchingStacks) { - String key = Integer.toString(i); - tag.put(key, stack.toTag(new CompoundTag())); - i++; - } - return tag; - } - - @Override - public Ingredient fromTag(CompoundTag tag) { - int length = tag.getInt("length"); - ItemStack[] stacks = new ItemStack[length]; - for (int i = 0; i < length; i++) { - String key = Integer.toString(i); - stacks[i] = ItemStack.fromTag(tag.getCompound(key)); - } - return Ingredient.ofStacks(Arrays.stream(stacks)); - } -} +package ru.betterend.mixin.common; + +import java.util.Arrays; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.recipe.Ingredient; + +import ru.betterend.interfaces.CompoundSerializer; + +@Mixin(Ingredient.class) +public abstract class IngredientMixin implements CompoundSerializer { + + @Shadow + private ItemStack[] matchingStacks; + + @Shadow + protected abstract void cacheMatchingStacks(); + + @Override + public CompoundTag toTag(CompoundTag tag) { + this.cacheMatchingStacks(); + int i = 0; + tag.putInt("length", matchingStacks.length); + for (ItemStack stack : matchingStacks) { + String key = Integer.toString(i); + tag.put(key, stack.toTag(new CompoundTag())); + i++; + } + return tag; + } + + @Override + public Ingredient fromTag(CompoundTag tag) { + int length = tag.getInt("length"); + ItemStack[] stacks = new ItemStack[length]; + for (int i = 0; i < length; i++) { + String key = Integer.toString(i); + stacks[i] = ItemStack.fromTag(tag.getCompound(key)); + } + return Ingredient.ofStacks(Arrays.stream(stacks)); + } +} diff --git a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java index 61c9e8ba..954e0276 100644 --- a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java @@ -1,47 +1,47 @@ -package ru.betterend.mixin.common; - -import java.util.Collection; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.ModifyArg; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.attribute.EntityAttributeModifier; -import net.minecraft.entity.attribute.EntityAttributes; -import net.minecraft.entity.damage.DamageSource; -import net.minecraft.item.Item; - -@Mixin(LivingEntity.class) -public abstract class LivingEntityMixin { - - private Entity lastAttacker; - - @Inject(method = "damage", at = @At("HEAD")) - public void damage(DamageSource source, float amount, CallbackInfoReturnable info) { - this.lastAttacker = source.getAttacker(); - } - - @ModifyArg(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;takeKnockback(FDD)V")) - private float increaseKnockback(float value, double x, double z) { - if (lastAttacker != null && lastAttacker instanceof LivingEntity) { - LivingEntity attacker = (LivingEntity) lastAttacker; - value += this.getKnockback(attacker.getMainHandStack().getItem()); - } - return value; - } - - private double getKnockback(Item tool) { - if (tool == null) return 0.0D; - Collection modifiers = tool.getAttributeModifiers(EquipmentSlot.MAINHAND) - .get(EntityAttributes.GENERIC_ATTACK_KNOCKBACK); - if (modifiers.size() > 0) { - return modifiers.iterator().next().getValue(); - } - return 0.0D; - } -} +package ru.betterend.mixin.common; + +import java.util.Collection; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.item.Item; + +@Mixin(LivingEntity.class) +public abstract class LivingEntityMixin { + + private Entity lastAttacker; + + @Inject(method = "damage", at = @At("HEAD")) + public void damage(DamageSource source, float amount, CallbackInfoReturnable info) { + this.lastAttacker = source.getAttacker(); + } + + @ModifyArg(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;takeKnockback(FDD)V")) + private float increaseKnockback(float value, double x, double z) { + if (lastAttacker != null && lastAttacker instanceof LivingEntity) { + LivingEntity attacker = (LivingEntity) lastAttacker; + value += this.getKnockback(attacker.getMainHandStack().getItem()); + } + return value; + } + + private double getKnockback(Item tool) { + if (tool == null) return 0.0D; + Collection modifiers = tool.getAttributeModifiers(EquipmentSlot.MAINHAND) + .get(EntityAttributes.GENERIC_ATTACK_KNOCKBACK); + if (modifiers.size() > 0) { + return modifiers.iterator().next().getValue(); + } + return 0.0D; + } +} diff --git a/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java b/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java index 102cb8ea..4128a8c4 100644 --- a/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java +++ b/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java @@ -1,41 +1,41 @@ -package ru.betterend.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.math.BlockPos; -import ru.betterend.interfaces.TeleportingEntity; - -@Mixin(ServerPlayerEntity.class) -public abstract class ServerPlayerEntityMixin implements TeleportingEntity { - - private long beCooldown; - - @Inject(method = "tick", at = @At("TAIL")) - public void baseTick(CallbackInfo info) { - if (hasCooldown()) { - this.beCooldown--; - } - } - - @Override - public long beGetCooldown() { - return this.beCooldown; - } - - @Override - public void beSetCooldown(long time) { - this.beCooldown = time; - } - - @Override - public void beSetExitPos(BlockPos pos) {} - - @Override - public BlockPos beGetExitPos() { - return null; - } -} +package ru.betterend.mixin.common; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.math.BlockPos; +import ru.betterend.interfaces.TeleportingEntity; + +@Mixin(ServerPlayerEntity.class) +public abstract class ServerPlayerEntityMixin implements TeleportingEntity { + + private long beCooldown; + + @Inject(method = "tick", at = @At("TAIL")) + public void baseTick(CallbackInfo info) { + if (hasCooldown()) { + this.beCooldown--; + } + } + + @Override + public long beGetCooldown() { + return this.beCooldown; + } + + @Override + public void beSetCooldown(long time) { + this.beCooldown = time; + } + + @Override + public void beSetExitPos(BlockPos pos) {} + + @Override + public BlockPos beGetExitPos() { + return null; + } +} diff --git a/src/main/java/ru/betterend/particle/PaticlePortalSphere.java b/src/main/java/ru/betterend/particle/PaticlePortalSphere.java index c80fd158..7268fcf5 100644 --- a/src/main/java/ru/betterend/particle/PaticlePortalSphere.java +++ b/src/main/java/ru/betterend/particle/PaticlePortalSphere.java @@ -1,76 +1,76 @@ -package ru.betterend.particle; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.particle.AnimatedParticle; -import net.minecraft.client.particle.Particle; -import net.minecraft.client.particle.ParticleFactory; -import net.minecraft.client.particle.SpriteProvider; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.particle.DefaultParticleType; -import net.minecraft.util.math.MathHelper; -import ru.betterend.util.MHelper; - -public class PaticlePortalSphere extends AnimatedParticle { - private int ticks; - private double preVX; - private double preVY; - private double preVZ; - private double nextVX; - private double nextVY; - private double nextVZ; - - public PaticlePortalSphere(ClientWorld world, double x, double y, double z, SpriteProvider spriteProvider) { - super(world, x, y, z, spriteProvider, 0); - setSprite(spriteProvider.getSprite(random)); - this.maxAge = MHelper.randRange(20, 80, random); - this.scale = MHelper.randRange(0.05F, 0.15F, random); - this.setColor(0xFEBBD5); - this.setTargetColor(0xBBFEE4); - this.setSpriteForAge(spriteProvider); - - preVX = random.nextGaussian() * 0.02; - preVY = random.nextGaussian() * 0.02; - preVZ = random.nextGaussian() * 0.02; - - nextVX = random.nextGaussian() * 0.02; - nextVY = random.nextGaussian() * 0.02; - nextVZ = random.nextGaussian() * 0.02; - } - - @Override - public void tick() { - ticks++; - if (ticks > 30) { - preVX = nextVX; - preVY = nextVY; - preVZ = nextVZ; - nextVX = random.nextGaussian() * 0.02; - nextVY = random.nextGaussian() * 0.02; - nextVZ = random.nextGaussian() * 0.02; - ticks = 0; - } - double delta = (double) ticks / 30.0; - - this.velocityX = MathHelper.lerp(delta, preVX, nextVX); - this.velocityY = MathHelper.lerp(delta, preVY, nextVY); - this.velocityZ = MathHelper.lerp(delta, preVZ, nextVZ); - - super.tick(); - } - - @Environment(EnvType.CLIENT) - public static class FactoryPortalSphere implements ParticleFactory { - - private final SpriteProvider sprites; - - public FactoryPortalSphere(SpriteProvider sprites) { - this.sprites = sprites; - } - - @Override - public Particle createParticle(DefaultParticleType type, ClientWorld world, double x, double y, double z, double vX, double vY, double vZ) { - return new PaticlePortalSphere(world, x, y, z, sprites); - } - } -} +package ru.betterend.particle; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.particle.AnimatedParticle; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleFactory; +import net.minecraft.client.particle.SpriteProvider; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.particle.DefaultParticleType; +import net.minecraft.util.math.MathHelper; +import ru.betterend.util.MHelper; + +public class PaticlePortalSphere extends AnimatedParticle { + private int ticks; + private double preVX; + private double preVY; + private double preVZ; + private double nextVX; + private double nextVY; + private double nextVZ; + + public PaticlePortalSphere(ClientWorld world, double x, double y, double z, SpriteProvider spriteProvider) { + super(world, x, y, z, spriteProvider, 0); + setSprite(spriteProvider.getSprite(random)); + this.maxAge = MHelper.randRange(20, 80, random); + this.scale = MHelper.randRange(0.05F, 0.15F, random); + this.setColor(0xFEBBD5); + this.setTargetColor(0xBBFEE4); + this.setSpriteForAge(spriteProvider); + + preVX = random.nextGaussian() * 0.02; + preVY = random.nextGaussian() * 0.02; + preVZ = random.nextGaussian() * 0.02; + + nextVX = random.nextGaussian() * 0.02; + nextVY = random.nextGaussian() * 0.02; + nextVZ = random.nextGaussian() * 0.02; + } + + @Override + public void tick() { + ticks++; + if (ticks > 30) { + preVX = nextVX; + preVY = nextVY; + preVZ = nextVZ; + nextVX = random.nextGaussian() * 0.02; + nextVY = random.nextGaussian() * 0.02; + nextVZ = random.nextGaussian() * 0.02; + ticks = 0; + } + double delta = (double) ticks / 30.0; + + this.velocityX = MathHelper.lerp(delta, preVX, nextVX); + this.velocityY = MathHelper.lerp(delta, preVY, nextVY); + this.velocityZ = MathHelper.lerp(delta, preVZ, nextVZ); + + super.tick(); + } + + @Environment(EnvType.CLIENT) + public static class FactoryPortalSphere implements ParticleFactory { + + private final SpriteProvider sprites; + + public FactoryPortalSphere(SpriteProvider sprites) { + this.sprites = sprites; + } + + @Override + public Particle createParticle(DefaultParticleType type, ClientWorld world, double x, double y, double z, double vX, double vY, double vZ) { + return new PaticlePortalSphere(world, x, y, z, sprites); + } + } +} diff --git a/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java b/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java index 9b590cc4..4441c93f 100644 --- a/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java @@ -1,273 +1,273 @@ -package ru.betterend.recipe.builders; - -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemConvertible; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.RecipeType; -import net.minecraft.tag.Tag; -import net.minecraft.util.Identifier; -import net.minecraft.util.JsonHelper; -import net.minecraft.util.collection.DefaultedList; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; -import ru.betterend.BetterEnd; -import ru.betterend.recipe.EndRecipeManager; -import ru.betterend.registry.EndBlocks; -import ru.betterend.util.RecipeHelper; - -public class AlloyingRecipe implements Recipe { - - public final static String GROUP = "alloying"; - public final static RecipeType TYPE = EndRecipeManager.registerType(GROUP); - public final static Serializer SERIALIZER = EndRecipeManager.registerSerializer(GROUP, new Serializer()); - public final static Identifier ID = BetterEnd.makeID(GROUP); - - protected final RecipeType type; - protected final Identifier id; - protected final Ingredient primaryInput; - protected final Ingredient secondaryInput; - protected final ItemStack output; - protected final String group; - protected final float experience; - protected final int smeltTime; - - public AlloyingRecipe(Identifier id, String group, Ingredient primaryInput, Ingredient secondaryInput, ItemStack output, float experience, int smeltTime) { - this.group = group; - this.id = id; - this.primaryInput = primaryInput; - this.secondaryInput = secondaryInput; - this.output = output; - this.experience = experience; - this.smeltTime = smeltTime; - this.type = TYPE; - } - - public float getExperience() { - return this.experience; - } - - public int getSmeltTime() { - return this.smeltTime; - } - - @Override - public DefaultedList getPreviewInputs() { - DefaultedList defaultedList = DefaultedList.of(); - defaultedList.add(primaryInput); - defaultedList.add(secondaryInput); - - return defaultedList; - } - - @Override - public boolean matches(Inventory inv, World world) { - return this.primaryInput.test(inv.getStack(0)) && this.secondaryInput.test(inv.getStack(1)) || - this.primaryInput.test(inv.getStack(1)) && this.secondaryInput.test(inv.getStack(0)); - } - - @Override - public ItemStack craft(Inventory inv) { - return this.output.copy(); - } - - @Override - public boolean fits(int width, int height) { - return true; - } - - @Override - public ItemStack getOutput() { - return this.output; - } - - @Override - public Identifier getId() { - return this.id; - } - - @Override - public RecipeSerializer getSerializer() { - return SERIALIZER; - } - - @Override - public RecipeType getType() { - return this.type; - } - - @Override - @Environment(EnvType.CLIENT) - public String getGroup() { - return this.group; - } - - @Environment(EnvType.CLIENT) - public ItemStack getRecipeKindIcon() { - return new ItemStack(EndBlocks.END_STONE_SMELTER); - } - - public static class Builder { - private final static Builder INSTANCE = new Builder(); - - public static Builder create(Identifier id) { - INSTANCE.id = id; - INSTANCE.group = String.format("%s_%s", GROUP, id); - INSTANCE.primaryInput = null; - INSTANCE.secondaryInput = null; - INSTANCE.output = null; - INSTANCE.experience = 0.0F; - INSTANCE.smeltTime = 350; - - return INSTANCE; - } - - public static Builder create(String id) { - return create(BetterEnd.makeID(id)); - } - - private Identifier id; - private Ingredient primaryInput; - private Ingredient secondaryInput; - private ItemStack output; - private String group; - private float experience; - private int smeltTime; - private boolean alright = true; - - private Builder() {} - - public Builder setGroup(String group) { - this.group = group; - return this; - } - - public Builder setPrimaryInput(ItemConvertible... inputs) { - for (ItemConvertible item : inputs) { - this.alright &= RecipeHelper.exists(item); - } - this.primaryInput = Ingredient.ofItems(inputs); - return this; - } - - public Builder setSecondaryInput(ItemConvertible... inputs) { - for (ItemConvertible item : inputs) { - this.alright &= RecipeHelper.exists(item); - } - this.secondaryInput = Ingredient.ofItems(inputs); - return this; - } - - public Builder setPrimaryInput(Tag input) { - this.primaryInput = Ingredient.fromTag(input); - return this; - } - - public Builder setSecondaryInput(Tag input) { - this.secondaryInput = Ingredient.fromTag(input); - return this; - } - - public Builder setInput(ItemConvertible primaryInput, ItemConvertible secondaryInput) { - this.setPrimaryInput(primaryInput); - this.setSecondaryInput(secondaryInput); - return this; - } - - public Builder setInput(Tag primaryInput, Tag secondaryInput) { - this.setPrimaryInput(primaryInput); - this.setSecondaryInput(secondaryInput); - return this; - } - - public Builder setOutput(ItemConvertible output, int amount) { - this.alright &= RecipeHelper.exists(output); - this.output = new ItemStack(output, amount); - return this; - } - - public Builder setExpiriense(float amount) { - this.experience = amount; - return this; - } - - public Builder setSmeltTime(int time) { - this.smeltTime = time; - return this; - } - - public void build() { - if (primaryInput == null) { - BetterEnd.LOGGER.warning("Primary input for Alloying recipe can't be 'null', recipe {} will be ignored!", id); - return; - } - if(secondaryInput == null) { - BetterEnd.LOGGER.warning("Secondary input for Alloying can't be 'null', recipe {} will be ignored!", id); - return; - } - if(output == null) { - BetterEnd.LOGGER.warning("Output for Alloying can't be 'null', recipe {} will be ignored!", id); - return; - } - if (EndRecipeManager.getRecipe(TYPE, id) != null) { - BetterEnd.LOGGER.warning("Can't add Alloying recipe! Id {} already exists!", id); - return; - } - if (!alright) { - BetterEnd.LOGGER.debug("Can't add Alloying recipe {}! Ingeredient or output not exists.", id); - return; - } - EndRecipeManager.addRecipe(TYPE, new AlloyingRecipe(id, group, primaryInput, secondaryInput, output, experience, smeltTime)); - } - } - - public static class Serializer implements RecipeSerializer { - @Override - public AlloyingRecipe read(Identifier id, JsonObject json) { - JsonArray ingredients = JsonHelper.getArray(json, "ingredients"); - Ingredient primaryInput = Ingredient.fromJson(ingredients.get(0)); - Ingredient secondaryInput = Ingredient.fromJson(ingredients.get(1)); - String resultStr = JsonHelper.getString(json, "result"); - String group = JsonHelper.getString(json, "group", ""); - Identifier resultId = new Identifier(resultStr); - ItemStack output = new ItemStack(Registry.ITEM.getOrEmpty(resultId).orElseThrow(() -> { - return new IllegalStateException("Item: " + resultStr + " does not exists!"); - })); - float experience = JsonHelper.getFloat(json, "experience", 0.0F); - int smeltTime = JsonHelper.getInt(json, "smelttime", 350); - - return new AlloyingRecipe(id, group, primaryInput, secondaryInput, output, experience, smeltTime); - } - - @Override - public AlloyingRecipe read(Identifier id, PacketByteBuf packetBuffer) { - String group = packetBuffer.readString(32767); - Ingredient primary = Ingredient.fromPacket(packetBuffer); - Ingredient secondary = Ingredient.fromPacket(packetBuffer); - ItemStack output = packetBuffer.readItemStack(); - float experience = packetBuffer.readFloat(); - int smeltTime = packetBuffer.readVarInt(); - - return new AlloyingRecipe(id, group, primary, secondary, output, experience, smeltTime); - } - - @Override - public void write(PacketByteBuf packetBuffer, AlloyingRecipe recipe) { - packetBuffer.writeString(recipe.group); - recipe.primaryInput.write(packetBuffer); - recipe.secondaryInput.write(packetBuffer); - packetBuffer.writeItemStack(recipe.output); - packetBuffer.writeFloat(recipe.experience); - packetBuffer.writeVarInt(recipe.smeltTime); - } - } -} +package ru.betterend.recipe.builders; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.RecipeType; +import net.minecraft.tag.Tag; +import net.minecraft.util.Identifier; +import net.minecraft.util.JsonHelper; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.World; +import ru.betterend.BetterEnd; +import ru.betterend.recipe.EndRecipeManager; +import ru.betterend.registry.EndBlocks; +import ru.betterend.util.RecipeHelper; + +public class AlloyingRecipe implements Recipe { + + public final static String GROUP = "alloying"; + public final static RecipeType TYPE = EndRecipeManager.registerType(GROUP); + public final static Serializer SERIALIZER = EndRecipeManager.registerSerializer(GROUP, new Serializer()); + public final static Identifier ID = BetterEnd.makeID(GROUP); + + protected final RecipeType type; + protected final Identifier id; + protected final Ingredient primaryInput; + protected final Ingredient secondaryInput; + protected final ItemStack output; + protected final String group; + protected final float experience; + protected final int smeltTime; + + public AlloyingRecipe(Identifier id, String group, Ingredient primaryInput, Ingredient secondaryInput, ItemStack output, float experience, int smeltTime) { + this.group = group; + this.id = id; + this.primaryInput = primaryInput; + this.secondaryInput = secondaryInput; + this.output = output; + this.experience = experience; + this.smeltTime = smeltTime; + this.type = TYPE; + } + + public float getExperience() { + return this.experience; + } + + public int getSmeltTime() { + return this.smeltTime; + } + + @Override + public DefaultedList getPreviewInputs() { + DefaultedList defaultedList = DefaultedList.of(); + defaultedList.add(primaryInput); + defaultedList.add(secondaryInput); + + return defaultedList; + } + + @Override + public boolean matches(Inventory inv, World world) { + return this.primaryInput.test(inv.getStack(0)) && this.secondaryInput.test(inv.getStack(1)) || + this.primaryInput.test(inv.getStack(1)) && this.secondaryInput.test(inv.getStack(0)); + } + + @Override + public ItemStack craft(Inventory inv) { + return this.output.copy(); + } + + @Override + public boolean fits(int width, int height) { + return true; + } + + @Override + public ItemStack getOutput() { + return this.output; + } + + @Override + public Identifier getId() { + return this.id; + } + + @Override + public RecipeSerializer getSerializer() { + return SERIALIZER; + } + + @Override + public RecipeType getType() { + return this.type; + } + + @Override + @Environment(EnvType.CLIENT) + public String getGroup() { + return this.group; + } + + @Environment(EnvType.CLIENT) + public ItemStack getRecipeKindIcon() { + return new ItemStack(EndBlocks.END_STONE_SMELTER); + } + + public static class Builder { + private final static Builder INSTANCE = new Builder(); + + public static Builder create(Identifier id) { + INSTANCE.id = id; + INSTANCE.group = String.format("%s_%s", GROUP, id); + INSTANCE.primaryInput = null; + INSTANCE.secondaryInput = null; + INSTANCE.output = null; + INSTANCE.experience = 0.0F; + INSTANCE.smeltTime = 350; + + return INSTANCE; + } + + public static Builder create(String id) { + return create(BetterEnd.makeID(id)); + } + + private Identifier id; + private Ingredient primaryInput; + private Ingredient secondaryInput; + private ItemStack output; + private String group; + private float experience; + private int smeltTime; + private boolean alright = true; + + private Builder() {} + + public Builder setGroup(String group) { + this.group = group; + return this; + } + + public Builder setPrimaryInput(ItemConvertible... inputs) { + for (ItemConvertible item : inputs) { + this.alright &= RecipeHelper.exists(item); + } + this.primaryInput = Ingredient.ofItems(inputs); + return this; + } + + public Builder setSecondaryInput(ItemConvertible... inputs) { + for (ItemConvertible item : inputs) { + this.alright &= RecipeHelper.exists(item); + } + this.secondaryInput = Ingredient.ofItems(inputs); + return this; + } + + public Builder setPrimaryInput(Tag input) { + this.primaryInput = Ingredient.fromTag(input); + return this; + } + + public Builder setSecondaryInput(Tag input) { + this.secondaryInput = Ingredient.fromTag(input); + return this; + } + + public Builder setInput(ItemConvertible primaryInput, ItemConvertible secondaryInput) { + this.setPrimaryInput(primaryInput); + this.setSecondaryInput(secondaryInput); + return this; + } + + public Builder setInput(Tag primaryInput, Tag secondaryInput) { + this.setPrimaryInput(primaryInput); + this.setSecondaryInput(secondaryInput); + return this; + } + + public Builder setOutput(ItemConvertible output, int amount) { + this.alright &= RecipeHelper.exists(output); + this.output = new ItemStack(output, amount); + return this; + } + + public Builder setExpiriense(float amount) { + this.experience = amount; + return this; + } + + public Builder setSmeltTime(int time) { + this.smeltTime = time; + return this; + } + + public void build() { + if (primaryInput == null) { + BetterEnd.LOGGER.warning("Primary input for Alloying recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if(secondaryInput == null) { + BetterEnd.LOGGER.warning("Secondary input for Alloying can't be 'null', recipe {} will be ignored!", id); + return; + } + if(output == null) { + BetterEnd.LOGGER.warning("Output for Alloying can't be 'null', recipe {} will be ignored!", id); + return; + } + if (EndRecipeManager.getRecipe(TYPE, id) != null) { + BetterEnd.LOGGER.warning("Can't add Alloying recipe! Id {} already exists!", id); + return; + } + if (!alright) { + BetterEnd.LOGGER.debug("Can't add Alloying recipe {}! Ingeredient or output not exists.", id); + return; + } + EndRecipeManager.addRecipe(TYPE, new AlloyingRecipe(id, group, primaryInput, secondaryInput, output, experience, smeltTime)); + } + } + + public static class Serializer implements RecipeSerializer { + @Override + public AlloyingRecipe read(Identifier id, JsonObject json) { + JsonArray ingredients = JsonHelper.getArray(json, "ingredients"); + Ingredient primaryInput = Ingredient.fromJson(ingredients.get(0)); + Ingredient secondaryInput = Ingredient.fromJson(ingredients.get(1)); + String resultStr = JsonHelper.getString(json, "result"); + String group = JsonHelper.getString(json, "group", ""); + Identifier resultId = new Identifier(resultStr); + ItemStack output = new ItemStack(Registry.ITEM.getOrEmpty(resultId).orElseThrow(() -> { + return new IllegalStateException("Item: " + resultStr + " does not exists!"); + })); + float experience = JsonHelper.getFloat(json, "experience", 0.0F); + int smeltTime = JsonHelper.getInt(json, "smelttime", 350); + + return new AlloyingRecipe(id, group, primaryInput, secondaryInput, output, experience, smeltTime); + } + + @Override + public AlloyingRecipe read(Identifier id, PacketByteBuf packetBuffer) { + String group = packetBuffer.readString(32767); + Ingredient primary = Ingredient.fromPacket(packetBuffer); + Ingredient secondary = Ingredient.fromPacket(packetBuffer); + ItemStack output = packetBuffer.readItemStack(); + float experience = packetBuffer.readFloat(); + int smeltTime = packetBuffer.readVarInt(); + + return new AlloyingRecipe(id, group, primary, secondary, output, experience, smeltTime); + } + + @Override + public void write(PacketByteBuf packetBuffer, AlloyingRecipe recipe) { + packetBuffer.writeString(recipe.group); + recipe.primaryInput.write(packetBuffer); + recipe.secondaryInput.write(packetBuffer); + packetBuffer.writeItemStack(recipe.output); + packetBuffer.writeFloat(recipe.experience); + packetBuffer.writeVarInt(recipe.smeltTime); + } + } +} diff --git a/src/main/java/ru/betterend/recipe/builders/AnvilSmithingRecipe.java b/src/main/java/ru/betterend/recipe/builders/AnvilSmithingRecipe.java index cafe68c4..6620d5bd 100644 --- a/src/main/java/ru/betterend/recipe/builders/AnvilSmithingRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/AnvilSmithingRecipe.java @@ -1,241 +1,241 @@ -package ru.betterend.recipe.builders; - -import com.google.gson.JsonObject; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemConvertible; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ToolItem; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.RecipeType; -import net.minecraft.tag.Tag; -import net.minecraft.util.Identifier; -import net.minecraft.util.JsonHelper; -import net.minecraft.util.collection.DefaultedList; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; -import ru.betterend.BetterEnd; -import ru.betterend.recipe.EndRecipeManager; -import ru.betterend.registry.EndTags; -import ru.betterend.util.RecipeHelper; - -public class AnvilSmithingRecipe implements Recipe { - - public final static String GROUP = "smithing"; - public final static RecipeType TYPE = EndRecipeManager.registerType(GROUP); - public final static Serializer SERIALIZER = EndRecipeManager.registerSerializer(GROUP, new Serializer()); - public final static Identifier ID = BetterEnd.makeID(GROUP); - - private final Identifier id; - private final Ingredient input; - private final ItemStack output; - private final int damage; - private final int level; - - public AnvilSmithingRecipe(Identifier identifier, Ingredient input, ItemStack output, int level, int damage) { - this.id = identifier; - this.input = input; - this.output = output; - this.level = level; - this.damage = damage; - } - - @Override - public RecipeSerializer getSerializer() { - return SERIALIZER; - } - - @Override - public ItemStack getOutput() { - return this.output; - } - - @Override - public boolean matches(Inventory craftingInventory, World world) { - return this.matches(craftingInventory); - } - - @Override - public ItemStack craft(Inventory craftingInventory) { - return this.output.copy(); - } - - public ItemStack craft(Inventory craftingInventory, PlayerEntity player) { - if (!player.isCreative()) { - ItemStack hammer = craftingInventory.getStack(0); - int damage = hammer.getDamage() + this.damage; - if (damage >= hammer.getMaxDamage()) return ItemStack.EMPTY; - hammer.damage(this.damage, player, entity -> { - entity.sendEquipmentBreakStatus(null); - }); - } - return this.craft(craftingInventory); - } - - public boolean matches(Inventory craftingInventory) { - ItemStack hammer = craftingInventory.getStack(0); - if (hammer.isEmpty() || !EndTags.HAMMERS.contains(hammer.getItem())) { - return false; - } - int level = ((ToolItem) hammer.getItem()).getMaterial().getMiningLevel(); - return level >= this.level && this.input.test(craftingInventory.getStack(1)); - } - - public int getDamage() { - return this.damage; - } - - @Override - public DefaultedList getPreviewInputs() { - DefaultedList defaultedList = DefaultedList.of(); - defaultedList.add(Ingredient.ofStacks(EndTags.HAMMERS.values().stream().filter(hammer -> { - return ((ToolItem) hammer).getMaterial().getMiningLevel() >= level; - }).map(ItemStack::new))); - defaultedList.add(input); - - return defaultedList; - } - - @Override - @Environment(EnvType.CLIENT) - public boolean fits(int width, int height) { - return true; - } - - @Override - public Identifier getId() { - return this.id; - } - - @Override - public RecipeType getType() { - return TYPE; - } - - @Override - public boolean isIgnoredInRecipeBook() { - return true; - } - - public static class Builder { - private final static Builder INSTANCE = new Builder(); - - public static Builder create(String id) { - return create(BetterEnd.makeID(id)); - } - - public static Builder create(Identifier id) { - INSTANCE.id = id; - INSTANCE.input = null; - INSTANCE.output = null; - INSTANCE.level = 1; - INSTANCE.damage = 1; - - return INSTANCE; - } - - private Identifier id; - private Ingredient input; - private ItemStack output; - private int level = 1; - private int damage = 1; - private boolean alright = true; - - private Builder() {} - - public Builder setInput(ItemConvertible... inputItems) { - for (ItemConvertible item : inputItems) { - this.alright &= RecipeHelper.exists(item); - } - this.setInput(Ingredient.ofItems(inputItems)); - return this; - } - - public Builder setInput(Tag inputTag) { - this.setInput(Ingredient.fromTag(inputTag)); - return this; - } - - public Builder setInput(Ingredient ingredient) { - this.input = ingredient; - return this; - } - - public Builder setOutput(ItemConvertible output, int amount) { - this.alright &= RecipeHelper.exists(output); - this.output = new ItemStack(output, amount); - return this; - } - - public Builder setLevel(int level) { - this.level = level; - return this; - } - - public Builder setDamage(int damage) { - this.damage = damage; - return this; - } - - public void build() { - if (input == null) { - BetterEnd.LOGGER.warning("Input for Smithing recipe can't be 'null', recipe {} will be ignored!", id); - return; - } - if(output == null) { - BetterEnd.LOGGER.warning("Output for Smithing recipe can't be 'null', recipe {} will be ignored!", id); - return; - } - if (EndRecipeManager.getRecipe(TYPE, id) != null) { - BetterEnd.LOGGER.warning("Can't add Smithing recipe! Id {} already exists!", id); - return; - } - if (!alright) { - BetterEnd.LOGGER.debug("Can't add Smithing recipe {}! Ingeredient or output not exists.", id); - return; - } - EndRecipeManager.addRecipe(TYPE, new AnvilSmithingRecipe(id, input, output, level, damage)); - } - } - - public static class Serializer implements RecipeSerializer { - @Override - public AnvilSmithingRecipe read(Identifier id, JsonObject json) { - Ingredient input = Ingredient.fromJson(JsonHelper.getObject(json, "input")); - String resultStr = JsonHelper.getString(json, "result"); - Identifier resultId = new Identifier(resultStr); - ItemStack output = new ItemStack(Registry.ITEM.getOrEmpty(resultId).orElseThrow(() -> { - return new IllegalStateException("Item: " + resultStr + " does not exists!"); - })); - int level = JsonHelper.getInt(json, "level", 1); - int damage = JsonHelper.getInt(json, "damage", 1); - - return new AnvilSmithingRecipe(id, input, output, level, damage); - } - - @Override - public AnvilSmithingRecipe read(Identifier id, PacketByteBuf packetBuffer) { - Ingredient input = Ingredient.fromPacket(packetBuffer); - ItemStack output = packetBuffer.readItemStack(); - int level = packetBuffer.readVarInt(); - int damage = packetBuffer.readVarInt(); - - return new AnvilSmithingRecipe(id, input, output, level, damage); - } - - @Override - public void write(PacketByteBuf packetBuffer, AnvilSmithingRecipe recipe) { - recipe.input.write(packetBuffer); - packetBuffer.writeItemStack(recipe.output); - packetBuffer.writeVarInt(recipe.level); - packetBuffer.writeVarInt(recipe.damage); - } - } -} +package ru.betterend.recipe.builders; + +import com.google.gson.JsonObject; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolItem; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.RecipeType; +import net.minecraft.tag.Tag; +import net.minecraft.util.Identifier; +import net.minecraft.util.JsonHelper; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.World; +import ru.betterend.BetterEnd; +import ru.betterend.recipe.EndRecipeManager; +import ru.betterend.registry.EndTags; +import ru.betterend.util.RecipeHelper; + +public class AnvilSmithingRecipe implements Recipe { + + public final static String GROUP = "smithing"; + public final static RecipeType TYPE = EndRecipeManager.registerType(GROUP); + public final static Serializer SERIALIZER = EndRecipeManager.registerSerializer(GROUP, new Serializer()); + public final static Identifier ID = BetterEnd.makeID(GROUP); + + private final Identifier id; + private final Ingredient input; + private final ItemStack output; + private final int damage; + private final int level; + + public AnvilSmithingRecipe(Identifier identifier, Ingredient input, ItemStack output, int level, int damage) { + this.id = identifier; + this.input = input; + this.output = output; + this.level = level; + this.damage = damage; + } + + @Override + public RecipeSerializer getSerializer() { + return SERIALIZER; + } + + @Override + public ItemStack getOutput() { + return this.output; + } + + @Override + public boolean matches(Inventory craftingInventory, World world) { + return this.matches(craftingInventory); + } + + @Override + public ItemStack craft(Inventory craftingInventory) { + return this.output.copy(); + } + + public ItemStack craft(Inventory craftingInventory, PlayerEntity player) { + if (!player.isCreative()) { + ItemStack hammer = craftingInventory.getStack(0); + int damage = hammer.getDamage() + this.damage; + if (damage >= hammer.getMaxDamage()) return ItemStack.EMPTY; + hammer.damage(this.damage, player, entity -> { + entity.sendEquipmentBreakStatus(null); + }); + } + return this.craft(craftingInventory); + } + + public boolean matches(Inventory craftingInventory) { + ItemStack hammer = craftingInventory.getStack(0); + if (hammer.isEmpty() || !EndTags.HAMMERS.contains(hammer.getItem())) { + return false; + } + int level = ((ToolItem) hammer.getItem()).getMaterial().getMiningLevel(); + return level >= this.level && this.input.test(craftingInventory.getStack(1)); + } + + public int getDamage() { + return this.damage; + } + + @Override + public DefaultedList getPreviewInputs() { + DefaultedList defaultedList = DefaultedList.of(); + defaultedList.add(Ingredient.ofStacks(EndTags.HAMMERS.values().stream().filter(hammer -> { + return ((ToolItem) hammer).getMaterial().getMiningLevel() >= level; + }).map(ItemStack::new))); + defaultedList.add(input); + + return defaultedList; + } + + @Override + @Environment(EnvType.CLIENT) + public boolean fits(int width, int height) { + return true; + } + + @Override + public Identifier getId() { + return this.id; + } + + @Override + public RecipeType getType() { + return TYPE; + } + + @Override + public boolean isIgnoredInRecipeBook() { + return true; + } + + public static class Builder { + private final static Builder INSTANCE = new Builder(); + + public static Builder create(String id) { + return create(BetterEnd.makeID(id)); + } + + public static Builder create(Identifier id) { + INSTANCE.id = id; + INSTANCE.input = null; + INSTANCE.output = null; + INSTANCE.level = 1; + INSTANCE.damage = 1; + + return INSTANCE; + } + + private Identifier id; + private Ingredient input; + private ItemStack output; + private int level = 1; + private int damage = 1; + private boolean alright = true; + + private Builder() {} + + public Builder setInput(ItemConvertible... inputItems) { + for (ItemConvertible item : inputItems) { + this.alright &= RecipeHelper.exists(item); + } + this.setInput(Ingredient.ofItems(inputItems)); + return this; + } + + public Builder setInput(Tag inputTag) { + this.setInput(Ingredient.fromTag(inputTag)); + return this; + } + + public Builder setInput(Ingredient ingredient) { + this.input = ingredient; + return this; + } + + public Builder setOutput(ItemConvertible output, int amount) { + this.alright &= RecipeHelper.exists(output); + this.output = new ItemStack(output, amount); + return this; + } + + public Builder setLevel(int level) { + this.level = level; + return this; + } + + public Builder setDamage(int damage) { + this.damage = damage; + return this; + } + + public void build() { + if (input == null) { + BetterEnd.LOGGER.warning("Input for Smithing recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if(output == null) { + BetterEnd.LOGGER.warning("Output for Smithing recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if (EndRecipeManager.getRecipe(TYPE, id) != null) { + BetterEnd.LOGGER.warning("Can't add Smithing recipe! Id {} already exists!", id); + return; + } + if (!alright) { + BetterEnd.LOGGER.debug("Can't add Smithing recipe {}! Ingeredient or output not exists.", id); + return; + } + EndRecipeManager.addRecipe(TYPE, new AnvilSmithingRecipe(id, input, output, level, damage)); + } + } + + public static class Serializer implements RecipeSerializer { + @Override + public AnvilSmithingRecipe read(Identifier id, JsonObject json) { + Ingredient input = Ingredient.fromJson(JsonHelper.getObject(json, "input")); + String resultStr = JsonHelper.getString(json, "result"); + Identifier resultId = new Identifier(resultStr); + ItemStack output = new ItemStack(Registry.ITEM.getOrEmpty(resultId).orElseThrow(() -> { + return new IllegalStateException("Item: " + resultStr + " does not exists!"); + })); + int level = JsonHelper.getInt(json, "level", 1); + int damage = JsonHelper.getInt(json, "damage", 1); + + return new AnvilSmithingRecipe(id, input, output, level, damage); + } + + @Override + public AnvilSmithingRecipe read(Identifier id, PacketByteBuf packetBuffer) { + Ingredient input = Ingredient.fromPacket(packetBuffer); + ItemStack output = packetBuffer.readItemStack(); + int level = packetBuffer.readVarInt(); + int damage = packetBuffer.readVarInt(); + + return new AnvilSmithingRecipe(id, input, output, level, damage); + } + + @Override + public void write(PacketByteBuf packetBuffer, AnvilSmithingRecipe recipe) { + recipe.input.write(packetBuffer); + packetBuffer.writeItemStack(recipe.output); + packetBuffer.writeVarInt(recipe.level); + packetBuffer.writeVarInt(recipe.damage); + } + } +} diff --git a/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java b/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java index 2560af1b..118bd966 100644 --- a/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java @@ -1,253 +1,253 @@ -package ru.betterend.recipe.builders; - -import java.util.Arrays; - -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemConvertible; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.RecipeType; -import net.minecraft.util.Identifier; -import net.minecraft.util.JsonHelper; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; - -import ru.betterend.BetterEnd; -import ru.betterend.interfaces.CompoundSerializer; -import ru.betterend.recipe.EndRecipeManager; -import ru.betterend.rituals.InfusionRitual; - -public class InfusionRecipe implements Recipe { - - public final static String GROUP = "infusion"; - public final static RecipeType TYPE = EndRecipeManager.registerType(GROUP); - public final static Serializer SERIALIZER = EndRecipeManager.registerSerializer(GROUP, new Serializer()); - public final static Identifier ID = BetterEnd.makeID(GROUP); - - private final Identifier id; - private Ingredient input; - private ItemStack output; - private int time = 1; - private Ingredient[] catalysts = new Ingredient[8]; - - private InfusionRecipe(Identifier id) { - this(id, null, null); - } - - private InfusionRecipe(Identifier id, Ingredient input, ItemStack output) { - this.id = id; - this.input = input; - this.output = output; - Arrays.fill(catalysts, Ingredient.EMPTY); - } - - public int getInfusionTime() { - return this.time; - } - - @Override - public boolean matches(InfusionRitual inv, World world) { - boolean valid = this.input.test(inv.getStack(0)); - if (!valid) return false; - for (int i = 1; i < 9; i++) { - valid &= this.catalysts[i].test(inv.getStack(i)); - } - return valid; - } - - @Override - public ItemStack craft(InfusionRitual ritual) { - return this.output.copy(); - } - - @Override - public boolean fits(int width, int height) { - return true; - } - - @Override - public ItemStack getOutput() { - return this.output; - } - - @Override - public Identifier getId() { - return this.id; - } - - @Override - public RecipeSerializer getSerializer() { - return SERIALIZER; - } - - @Override - public RecipeType getType() { - return TYPE; - } - - public InfusionRecipe fromTag(CompoundTag tag) { - return SERIALIZER.fromTag(tag); - } - - public CompoundTag toTag(CompoundTag tag) { - return SERIALIZER.toTag(this, tag); - } - - public static class Builder { - private final static Builder INSTANCE = new Builder(); - - public static Builder create(String id) { - return create(BetterEnd.makeID(id)); - } - - public static Builder create(Identifier id) { - INSTANCE.id = id; - INSTANCE.input = null; - INSTANCE.output = null; - INSTANCE.time = 1; - - Arrays.fill(INSTANCE.catalysts, Ingredient.EMPTY); - - return INSTANCE; - } - - private Identifier id; - private Ingredient input; - private ItemStack output; - private int time = 1; - private Ingredient[] catalysts = new Ingredient[8]; - - private Builder() { - Arrays.fill(catalysts, Ingredient.EMPTY); - } - - public Builder setInput(ItemConvertible input) { - this.input = Ingredient.ofItems(input); - return this; - } - - public Builder setOutput(ItemStack output) { - this.output = output; - this.output.setCount(1); - return this; - } - - public Builder setTime(int time) { - this.time = time; - return this; - } - - public Builder addCatalyst(int slot, ItemConvertible item) { - if (slot > 7) return this; - this.catalysts[slot] = Ingredient.ofItems(item); - return this; - } - - public void build() { - if (input == null) { - BetterEnd.LOGGER.warning("Input for Infusion recipe can't be 'null', recipe {} will be ignored!", id); - return; - } - if (output == null) { - BetterEnd.LOGGER.warning("Output for Infusion recipe can't be 'null', recipe {} will be ignored!", id); - return; - } - InfusionRecipe recipe = new InfusionRecipe(id, input, output); - recipe.time = time; - int empty = 0; - for (int i = 0; i < catalysts.length; i++) { - if (catalysts[i].isEmpty()) empty++; - else recipe.catalysts[i] = catalysts[i]; - } - if (empty == catalysts.length) { - BetterEnd.LOGGER.warning("At least one catalyst must be non empty, recipe {} will be ignored!", id); - return; - } - EndRecipeManager.addRecipe(TYPE, recipe); - } - } - - public static class Serializer implements RecipeSerializer { - @Override - public InfusionRecipe read(Identifier id, JsonObject json) { - InfusionRecipe recipe = new InfusionRecipe(id); - recipe.input = Ingredient.fromJson(json.get("input")); - Identifier outId = new Identifier(JsonHelper.getString(json, "output")); - recipe.output = new ItemStack(Registry.ITEM.getOrEmpty(outId).orElseThrow(() -> { - return new IllegalStateException("Item: " + outId + " does not exists!"); - })); - recipe.time = JsonHelper.getInt(json, "time", 1); - JsonArray catalysts = JsonHelper.asArray(json, "catalysts"); - for (int i = 0; i < catalysts.size(); i++) { - ItemStack stack = new ItemStack(Registry.ITEM.getOrEmpty(outId).orElse(null)); - recipe.catalysts[i] = Ingredient.ofStacks( - Arrays.stream(new ItemStack[] { stack })); - } - return recipe; - } - - @Override - public InfusionRecipe read(Identifier id, PacketByteBuf buffer) { - InfusionRecipe recipe = new InfusionRecipe(id); - recipe.input = Ingredient.fromPacket(buffer); - recipe.output = buffer.readItemStack(); - recipe.time = buffer.readVarInt(); - for (int i = 0; i < 9; i++) { - recipe.catalysts[i] = Ingredient.fromPacket(buffer); - } - return recipe; - } - - @Override - public void write(PacketByteBuf buffer, InfusionRecipe recipe) { - recipe.input.write(buffer); - buffer.writeItemStack(recipe.output); - buffer.writeVarInt(recipe.time); - for (int i = 0; i < 9; i++) { - recipe.catalysts[i].write(buffer); - } - } - - public InfusionRecipe fromTag(CompoundTag tag) { - Identifier id = new Identifier(tag.getString("id")); - InfusionRecipe recipe = new InfusionRecipe(id); - CompoundSerializer inputSerializer = this.toSerializer(recipe.input); - recipe.input = inputSerializer.fromTag(tag.getCompound("input")); - recipe.output = ItemStack.fromTag(tag.getCompound("output")); - recipe.time = tag.getInt("time"); - CompoundTag catalysts = tag.getCompound("catalysts"); - for(int i = 0; i < recipe.catalysts.length; i++) { - String key = Integer.toString(i); - CompoundSerializer cataSerializer = this.toSerializer(recipe.catalysts[i]); - recipe.catalysts[i] = cataSerializer.fromTag(catalysts.getCompound(key)); - } - return recipe; - } - - public CompoundTag toTag(InfusionRecipe recipe, CompoundTag tag) { - CompoundSerializer inputSerializer = this.toSerializer(recipe.input); - tag.put("input", inputSerializer.toTag(new CompoundTag())); - tag.put("output", recipe.output.toTag(new CompoundTag())); - tag.putInt("time", recipe.time); - CompoundTag catalysts = new CompoundTag(); - for(int i = 0; i < recipe.catalysts.length; i++) { - String key = Integer.toString(i); - CompoundSerializer cataSerializer = this.toSerializer(recipe.catalysts[i]); - catalysts.put(key, cataSerializer.toTag(new CompoundTag())); - } - tag.put("catalysts", catalysts); - return tag; - } - - @SuppressWarnings("unchecked") - private CompoundSerializer toSerializer(Ingredient ingredient) { - return CompoundSerializer.class.cast(ingredient); - } - } -} +package ru.betterend.recipe.builders; + +import java.util.Arrays; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.RecipeType; +import net.minecraft.util.Identifier; +import net.minecraft.util.JsonHelper; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.World; + +import ru.betterend.BetterEnd; +import ru.betterend.interfaces.CompoundSerializer; +import ru.betterend.recipe.EndRecipeManager; +import ru.betterend.rituals.InfusionRitual; + +public class InfusionRecipe implements Recipe { + + public final static String GROUP = "infusion"; + public final static RecipeType TYPE = EndRecipeManager.registerType(GROUP); + public final static Serializer SERIALIZER = EndRecipeManager.registerSerializer(GROUP, new Serializer()); + public final static Identifier ID = BetterEnd.makeID(GROUP); + + private final Identifier id; + private Ingredient input; + private ItemStack output; + private int time = 1; + private Ingredient[] catalysts = new Ingredient[8]; + + private InfusionRecipe(Identifier id) { + this(id, null, null); + } + + private InfusionRecipe(Identifier id, Ingredient input, ItemStack output) { + this.id = id; + this.input = input; + this.output = output; + Arrays.fill(catalysts, Ingredient.EMPTY); + } + + public int getInfusionTime() { + return this.time; + } + + @Override + public boolean matches(InfusionRitual inv, World world) { + boolean valid = this.input.test(inv.getStack(0)); + if (!valid) return false; + for (int i = 1; i < 9; i++) { + valid &= this.catalysts[i].test(inv.getStack(i)); + } + return valid; + } + + @Override + public ItemStack craft(InfusionRitual ritual) { + return this.output.copy(); + } + + @Override + public boolean fits(int width, int height) { + return true; + } + + @Override + public ItemStack getOutput() { + return this.output; + } + + @Override + public Identifier getId() { + return this.id; + } + + @Override + public RecipeSerializer getSerializer() { + return SERIALIZER; + } + + @Override + public RecipeType getType() { + return TYPE; + } + + public InfusionRecipe fromTag(CompoundTag tag) { + return SERIALIZER.fromTag(tag); + } + + public CompoundTag toTag(CompoundTag tag) { + return SERIALIZER.toTag(this, tag); + } + + public static class Builder { + private final static Builder INSTANCE = new Builder(); + + public static Builder create(String id) { + return create(BetterEnd.makeID(id)); + } + + public static Builder create(Identifier id) { + INSTANCE.id = id; + INSTANCE.input = null; + INSTANCE.output = null; + INSTANCE.time = 1; + + Arrays.fill(INSTANCE.catalysts, Ingredient.EMPTY); + + return INSTANCE; + } + + private Identifier id; + private Ingredient input; + private ItemStack output; + private int time = 1; + private Ingredient[] catalysts = new Ingredient[8]; + + private Builder() { + Arrays.fill(catalysts, Ingredient.EMPTY); + } + + public Builder setInput(ItemConvertible input) { + this.input = Ingredient.ofItems(input); + return this; + } + + public Builder setOutput(ItemStack output) { + this.output = output; + this.output.setCount(1); + return this; + } + + public Builder setTime(int time) { + this.time = time; + return this; + } + + public Builder addCatalyst(int slot, ItemConvertible item) { + if (slot > 7) return this; + this.catalysts[slot] = Ingredient.ofItems(item); + return this; + } + + public void build() { + if (input == null) { + BetterEnd.LOGGER.warning("Input for Infusion recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if (output == null) { + BetterEnd.LOGGER.warning("Output for Infusion recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + InfusionRecipe recipe = new InfusionRecipe(id, input, output); + recipe.time = time; + int empty = 0; + for (int i = 0; i < catalysts.length; i++) { + if (catalysts[i].isEmpty()) empty++; + else recipe.catalysts[i] = catalysts[i]; + } + if (empty == catalysts.length) { + BetterEnd.LOGGER.warning("At least one catalyst must be non empty, recipe {} will be ignored!", id); + return; + } + EndRecipeManager.addRecipe(TYPE, recipe); + } + } + + public static class Serializer implements RecipeSerializer { + @Override + public InfusionRecipe read(Identifier id, JsonObject json) { + InfusionRecipe recipe = new InfusionRecipe(id); + recipe.input = Ingredient.fromJson(json.get("input")); + Identifier outId = new Identifier(JsonHelper.getString(json, "output")); + recipe.output = new ItemStack(Registry.ITEM.getOrEmpty(outId).orElseThrow(() -> { + return new IllegalStateException("Item: " + outId + " does not exists!"); + })); + recipe.time = JsonHelper.getInt(json, "time", 1); + JsonArray catalysts = JsonHelper.asArray(json, "catalysts"); + for (int i = 0; i < catalysts.size(); i++) { + ItemStack stack = new ItemStack(Registry.ITEM.getOrEmpty(outId).orElse(null)); + recipe.catalysts[i] = Ingredient.ofStacks( + Arrays.stream(new ItemStack[] { stack })); + } + return recipe; + } + + @Override + public InfusionRecipe read(Identifier id, PacketByteBuf buffer) { + InfusionRecipe recipe = new InfusionRecipe(id); + recipe.input = Ingredient.fromPacket(buffer); + recipe.output = buffer.readItemStack(); + recipe.time = buffer.readVarInt(); + for (int i = 0; i < 9; i++) { + recipe.catalysts[i] = Ingredient.fromPacket(buffer); + } + return recipe; + } + + @Override + public void write(PacketByteBuf buffer, InfusionRecipe recipe) { + recipe.input.write(buffer); + buffer.writeItemStack(recipe.output); + buffer.writeVarInt(recipe.time); + for (int i = 0; i < 9; i++) { + recipe.catalysts[i].write(buffer); + } + } + + public InfusionRecipe fromTag(CompoundTag tag) { + Identifier id = new Identifier(tag.getString("id")); + InfusionRecipe recipe = new InfusionRecipe(id); + CompoundSerializer inputSerializer = this.toSerializer(recipe.input); + recipe.input = inputSerializer.fromTag(tag.getCompound("input")); + recipe.output = ItemStack.fromTag(tag.getCompound("output")); + recipe.time = tag.getInt("time"); + CompoundTag catalysts = tag.getCompound("catalysts"); + for(int i = 0; i < recipe.catalysts.length; i++) { + String key = Integer.toString(i); + CompoundSerializer cataSerializer = this.toSerializer(recipe.catalysts[i]); + recipe.catalysts[i] = cataSerializer.fromTag(catalysts.getCompound(key)); + } + return recipe; + } + + public CompoundTag toTag(InfusionRecipe recipe, CompoundTag tag) { + CompoundSerializer inputSerializer = this.toSerializer(recipe.input); + tag.put("input", inputSerializer.toTag(new CompoundTag())); + tag.put("output", recipe.output.toTag(new CompoundTag())); + tag.putInt("time", recipe.time); + CompoundTag catalysts = new CompoundTag(); + for(int i = 0; i < recipe.catalysts.length; i++) { + String key = Integer.toString(i); + CompoundSerializer cataSerializer = this.toSerializer(recipe.catalysts[i]); + catalysts.put(key, cataSerializer.toTag(new CompoundTag())); + } + tag.put("catalysts", catalysts); + return tag; + } + + @SuppressWarnings("unchecked") + private CompoundSerializer toSerializer(Ingredient ingredient) { + return CompoundSerializer.class.cast(ingredient); + } + } +} diff --git a/src/main/java/ru/betterend/rituals/EternalRitual.java b/src/main/java/ru/betterend/rituals/EternalRitual.java index 9d9f3bff..4f4dabd1 100644 --- a/src/main/java/ru/betterend/rituals/EternalRitual.java +++ b/src/main/java/ru/betterend/rituals/EternalRitual.java @@ -1,479 +1,479 @@ -package ru.betterend.rituals; - -import java.awt.Point; -import java.util.Random; -import java.util.Set; - -import com.google.common.collect.Sets; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtHelper; -import net.minecraft.particle.BlockStateParticleEffect; -import net.minecraft.particle.ParticleEffect; -import net.minecraft.particle.ParticleTypes; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.Heightmap; -import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.gen.feature.ConfiguredFeatures; -import ru.betterend.blocks.BlockProperties; -import ru.betterend.blocks.EndPortalBlock; -import ru.betterend.blocks.RunedFlavolite; -import ru.betterend.blocks.entities.EternalPedestalEntity; -import ru.betterend.registry.EndBlocks; -import ru.betterend.registry.EndTags; - -public class EternalRitual { - private final static Set STRUCTURE_MAP = Sets.newHashSet( - new Point(-4, -5), new Point(-4, 5), new Point(-6, 0), - new Point(4, -5), new Point(4, 5), new Point(6, 0)); - private final static Set FRAME_MAP = Sets.newHashSet( - new Point(0, 0), new Point(0, 6), new Point(1, 0), - new Point(1, 6), new Point(2, 1), new Point(2, 5), - new Point(3, 2), new Point(3, 3), new Point(3, 4)); - private final static Set PORTAL_MAP = Sets.newHashSet( - new Point(0, 0), new Point(0, 1), new Point(0, 2), - new Point(0, 3), new Point(0, 4), new Point(1, 0), - new Point(1, 1), new Point(1, 2), new Point(1, 3), - new Point(1, 4), new Point(2, 1), new Point(2, 2), - new Point(2, 3)); - private final static Set BASE_MAP = Sets.newHashSet( - new Point(3, 0), new Point(2, 0), new Point(2, 1), new Point(1, 1), - new Point(1, 2), new Point(0, 1), new Point(0, 2)); - - private final static Block BASE = EndBlocks.FLAVOLITE.tiles; - private final static Block PEDESTAL = EndBlocks.ETERNAL_PEDESTAL; - private final static Block FRAME = EndBlocks.FLAVOLITE_RUNED_ETERNAL; - private final static Block PORTAL = EndBlocks.END_PORTAL_BLOCK; - private final static BooleanProperty ACTIVE = BlockProperties.ACTIVATED; - - private World world; - private Direction.Axis axis; - private BlockPos center; - private BlockPos exit; - private boolean active = false; - - public EternalRitual(World world) { - this.world = world; - } - - public EternalRitual(World world, BlockPos initial) { - this(world); - this.configure(initial); - } - - public boolean hasWorld() { - return this.world != null; - } - - public void setWorld(World world) { - this.world = world; - } - - private boolean isValid() { - return world != null && !world.isClient() && - center != null && axis != null && - world.getRegistryKey() != World.NETHER; - } - - public void checkStructure() { - if (!isValid()) return; - Direction moveX, moveY; - if (Direction.Axis.X == axis) { - moveX = Direction.EAST; - moveY = Direction.NORTH; - } else { - moveX = Direction.SOUTH; - moveY = Direction.EAST; - } - boolean valid = this.checkFrame(); - for (Point pos : STRUCTURE_MAP) { - BlockPos.Mutable checkPos = center.mutableCopy(); - checkPos.move(moveX, pos.x).move(moveY, pos.y); - valid &= this.isActive(checkPos); - } - if (valid) { - this.activatePortal(); - } - } - - private boolean checkFrame() { - BlockPos framePos = center.down(); - Direction moveDir = Direction.Axis.X == axis ? Direction.NORTH: Direction.EAST; - boolean valid = true; - for (Point point : FRAME_MAP) { - BlockPos pos = framePos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); - BlockState state = world.getBlockState(pos); - valid &= state.getBlock() instanceof RunedFlavolite; - pos = framePos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); - state = world.getBlockState(pos); - valid &= state.getBlock() instanceof RunedFlavolite; - } - return valid; - } - - public boolean isActive() { - return this.active; - } - - private void activatePortal() { - if (active) return; - this.activatePortal(world, center); - this.doEffects((ServerWorld) world, center); - if (exit == null) { - this.exit = this.findPortalPos(); - } else { - World targetWorld = this.getTargetWorld(); - this.activatePortal(targetWorld, exit); - } - this.active = true; - } - - private void doEffects(ServerWorld serverWorld, BlockPos center) { - Direction moveX, moveY; - if (Direction.Axis.X == axis) { - moveX = Direction.EAST; - moveY = Direction.NORTH; - } else { - moveX = Direction.SOUTH; - moveY = Direction.EAST; - } - for (Point pos : STRUCTURE_MAP) { - BlockPos.Mutable p = center.mutableCopy(); - p.move(moveX, pos.x).move(moveY, pos.y); - serverWorld.spawnParticles(ParticleTypes.PORTAL, p.getX() + 0.5, p.getY() + 1.5, p.getZ() + 0.5, 20, 0, 0, 0, 1); - serverWorld.spawnParticles(ParticleTypes.REVERSE_PORTAL, p.getX() + 0.5, p.getY() + 1.5, p.getZ() + 0.5, 20, 0, 0, 0, 0.3); - } - serverWorld.playSound(null, center, SoundEvents.BLOCK_END_PORTAL_SPAWN, SoundCategory.NEUTRAL, 16, 1); - } - - private void activatePortal(World world, BlockPos center) { - BlockPos framePos = center.down(); - Direction moveDir = Direction.Axis.X == axis ? Direction.NORTH: Direction.EAST; - BlockState frame = FRAME.getDefaultState().with(ACTIVE, true); - FRAME_MAP.forEach(point -> { - BlockPos pos = framePos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); - BlockState state = world.getBlockState(pos); - if (state.contains(ACTIVE) && !state.get(ACTIVE)) { - world.setBlockState(pos, frame); - } - pos = framePos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); - state = world.getBlockState(pos); - if (state.contains(ACTIVE) && !state.get(ACTIVE)) { - world.setBlockState(pos, frame); - } - }); - Direction.Axis portalAxis = Direction.Axis.X == axis ? Direction.Axis.Z : Direction.Axis.X; - BlockState portal = PORTAL.getDefaultState().with(EndPortalBlock.AXIS, portalAxis); - ParticleEffect effect = new BlockStateParticleEffect(ParticleTypes.BLOCK, portal); - ServerWorld serverWorld = (ServerWorld) world; - - PORTAL_MAP.forEach(point -> { - BlockPos pos = center.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); - if (!world.getBlockState(pos).isOf(PORTAL)) { - world.setBlockState(pos, portal); - serverWorld.spawnParticles(effect, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 10, 0.5, 0.5, 0.5, 0.1); - serverWorld.spawnParticles(ParticleTypes.REVERSE_PORTAL, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 10, 0.5, 0.5, 0.5, 0.3); - } - pos = center.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); - if (!world.getBlockState(pos).isOf(PORTAL)) { - world.setBlockState(pos, portal); - serverWorld.spawnParticles(effect, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 10, 0.5, 0.5, 0.5, 0.1); - serverWorld.spawnParticles(ParticleTypes.REVERSE_PORTAL, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 10, 0.5, 0.5, 0.5, 0.3); - } - }); - } - - public void removePortal() { - if (!active || !isValid()) return; - World targetWorld = this.getTargetWorld(); - this.removePortal(world, center); - this.removePortal(targetWorld, exit); - } - - private void removePortal(World world, BlockPos center) { - BlockPos framePos = center.down(); - Direction moveDir = Direction.Axis.X == axis ? Direction.NORTH: Direction.EAST; - FRAME_MAP.forEach(point -> { - BlockPos pos = framePos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); - BlockState state = world.getBlockState(pos); - if (state.isOf(FRAME) && state.get(ACTIVE)) { - world.setBlockState(pos, state.with(ACTIVE, false)); - } - pos = framePos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); - state = world.getBlockState(pos); - if (state.isOf(FRAME) && state.get(ACTIVE)) { - world.setBlockState(pos, state.with(ACTIVE, false)); - } - }); - PORTAL_MAP.forEach(point -> { - BlockPos pos = center.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); - if (world.getBlockState(pos).isOf(PORTAL)) { - world.removeBlock(pos, false); - } - pos = center.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); - if (world.getBlockState(pos).isOf(PORTAL)) { - world.removeBlock(pos, false); - } - }); - this.active = false; - } - - private BlockPos findPortalPos() { - MinecraftServer server = world.getServer(); - ServerWorld targetWorld = (ServerWorld) this.getTargetWorld(); - Registry registry = server.getRegistryManager().getDimensionTypes(); - double mult = registry.get(DimensionType.THE_END_ID).getCoordinateScale(); - BlockPos.Mutable basePos = center.mutableCopy().set(center.getX() / mult, center.getY(), center.getZ() / mult); - Direction.Axis portalAxis = Direction.Axis.X == axis ? Direction.Axis.Z : Direction.Axis.X; - if (checkIsAreaValid(targetWorld, basePos, portalAxis)) { - EternalRitual.generatePortal(targetWorld, basePos, portalAxis); - if (portalAxis.equals(Direction.Axis.X)) { - return basePos.toImmutable(); - } else { - return basePos.toImmutable(); - } - } else { - Direction direction = Direction.EAST; - BlockPos.Mutable checkPos = basePos.mutableCopy(); - for (int step = 1; step < 64; step++) { - for (int i = 0; i < step; i++) { - checkPos.setY(5); - while(checkPos.getY() < world.getHeight()) { - if(checkIsAreaValid(targetWorld, checkPos, portalAxis)) { - EternalRitual.generatePortal(targetWorld, checkPos, portalAxis); - if (portalAxis.equals(Direction.Axis.X)) { - return checkPos.toImmutable(); - } else { - return checkPos.toImmutable(); - } - } - checkPos.move(Direction.UP); - } - checkPos.move(direction); - } - direction = direction.rotateYClockwise(); - } - } - if (targetWorld.getRegistryKey() == World.END) { - ConfiguredFeatures.END_ISLAND.generate(targetWorld, targetWorld.getChunkManager().getChunkGenerator(), new Random(basePos.asLong()), basePos.down()); - } else { - basePos.setY(targetWorld.getChunk(basePos).sampleHeightmap(Heightmap.Type.WORLD_SURFACE, basePos.getX(), basePos.getZ()) + 1); - } - EternalRitual.generatePortal(targetWorld, basePos, portalAxis); - if (portalAxis.equals(Direction.Axis.X)) { - return basePos.toImmutable(); - } else { - return basePos.toImmutable(); - } - } - - private World getTargetWorld() { - RegistryKey target = world.getRegistryKey() == World.END ? World.OVERWORLD : World.END; - return world.getServer().getWorld(target); - } - - private boolean checkIsAreaValid(World world, BlockPos pos, Direction.Axis axis) { - if (!isBaseValid(world, pos, axis)) return false; - return EternalRitual.checkArea(world, pos, axis); - } - - private boolean isBaseValid(World world, BlockPos pos, Direction.Axis axis) { - boolean solid = true; - if (axis.equals(Direction.Axis.X)) { - pos = pos.down().add(0, 0, -3); - for (int i = 0; i < 7; i++) { - BlockPos checkPos = pos.add(0, 0, i); - BlockState state = world.getBlockState(checkPos); - solid &= this.validBlock(world, checkPos, state); - } - } else { - pos = pos.down().add(-3, 0, 0); - for (int i = 0; i < 7; i++) { - BlockPos checkPos = pos.add(i, 0, 0); - BlockState state = world.getBlockState(checkPos); - solid &= this.validBlock(world, checkPos, state); - } - } - return solid; - } - - private boolean validBlock(World world, BlockPos pos, BlockState state) { - BlockState surfaceBlock = world.getBiome(pos).getGenerationSettings().getSurfaceConfig().getTopMaterial(); - return state.isSolidBlock(world, pos) && - (EndTags.validGenBlock(state) || - state.isOf(surfaceBlock.getBlock()) || - state.isOf(Blocks.STONE) || - state.isOf(Blocks.SAND) || - state.isOf(Blocks.GRAVEL)); - } - - public static void generatePortal(World world, BlockPos center, Direction.Axis axis) { - BlockPos framePos = center.down(); - Direction moveDir = Direction.Axis.X == axis ? Direction.EAST: Direction.NORTH; - BlockState frame = FRAME.getDefaultState().with(ACTIVE, true); - FRAME_MAP.forEach(point -> { - BlockPos pos = framePos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); - world.setBlockState(pos, frame); - pos = framePos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); - world.setBlockState(pos, frame); - }); - BlockState portal = PORTAL.getDefaultState().with(EndPortalBlock.AXIS, axis); - PORTAL_MAP.forEach(point -> { - BlockPos pos = center.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); - world.setBlockState(pos, portal); - pos = center.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); - world.setBlockState(pos, portal); - }); - generateBase(world, framePos, moveDir); - } - - private static void generateBase(World world, BlockPos center, Direction moveX) { - BlockState base = BASE.getDefaultState(); - Direction moveY = moveX.rotateYClockwise(); - BASE_MAP.forEach(point -> { - BlockPos pos = center.mutableCopy().move(moveX, point.x).move(moveY, point.y); - world.setBlockState(pos, base); - pos = center.mutableCopy().move(moveX, -point.x).move(moveY, point.y); - world.setBlockState(pos, base); - pos = center.mutableCopy().move(moveX, point.x).move(moveY, -point.y); - world.setBlockState(pos, base); - pos = center.mutableCopy().move(moveX, -point.x).move(moveY, -point.y); - world.setBlockState(pos, base); - }); - } - - public static boolean checkArea(World world, BlockPos center, Direction.Axis axis) { - Direction moveDir = Direction.Axis.X == axis ? Direction.NORTH: Direction.EAST; - for (BlockPos checkPos : BlockPos.iterate(center.offset(moveDir.rotateYClockwise()), center.offset(moveDir.rotateYCounterclockwise()))) { - for (Point point : PORTAL_MAP) { - BlockPos pos = checkPos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); - if (!world.getBlockState(pos).isAir()) return false; - pos = checkPos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); - if (!world.getBlockState(pos).isAir()) return false; - } - } - return true; - } - - public void configure(BlockPos initial) { - BlockPos checkPos = initial.east(12); - if (this.hasPedestal(checkPos)) { - this.axis = Direction.Axis.X; - this.center = initial.east(6); - return; - } - checkPos = initial.west(12); - if (this.hasPedestal(checkPos)) { - this.axis = Direction.Axis.X; - this.center = initial.west(6); - return; - } - checkPos = initial.south(12); - if (this.hasPedestal(checkPos)) { - this.axis = Direction.Axis.Z; - this.center = initial.south(6); - return; - } - checkPos = initial.north(12); - if (this.hasPedestal(checkPos)) { - this.axis = Direction.Axis.Z; - this.center = initial.north(6); - return; - } - checkPos = initial.north(10); - if (this.hasPedestal(checkPos)) { - this.axis = Direction.Axis.X; - checkPos = checkPos.east(8); - if (this.hasPedestal(checkPos)) { - this.center = initial.north(5).east(4); - return; - } else { - this.center = initial.north(5).west(4); - return; - } - } - checkPos = initial.south(10); - if (this.hasPedestal(checkPos)) { - this.axis = Direction.Axis.X; - checkPos = checkPos.east(8); - if (this.hasPedestal(checkPos)) { - this.center = initial.south(5).east(4); - return; - } else { - this.center = initial.south(5).west(4); - return; - } - } - checkPos = initial.east(10); - if (this.hasPedestal(checkPos)) { - this.axis = Direction.Axis.Z; - checkPos = checkPos.south(8); - if (this.hasPedestal(checkPos)) { - this.center = initial.east(5).south(4); - return; - } else { - this.center = initial.east(5).north(4); - return; - } - } - checkPos = initial.west(10); - if (this.hasPedestal(checkPos)) { - this.axis = Direction.Axis.Z; - checkPos = checkPos.south(8); - if (this.hasPedestal(checkPos)) { - this.center = initial.west(5).south(4); - return; - } else { - this.center = initial.west(5).north(4); - return; - } - } - } - - private boolean hasPedestal(BlockPos pos) { - return world.getBlockState(pos).isOf(PEDESTAL); - } - - private boolean isActive(BlockPos pos) { - BlockState state = world.getBlockState(pos); - if (state.isOf(PEDESTAL)) { - EternalPedestalEntity pedestal = (EternalPedestalEntity) world.getBlockEntity(pos); - if (!pedestal.hasRitual()) { - pedestal.linkRitual(this); - } - return state.get(ACTIVE); - } - return false; - } - - public CompoundTag toTag(CompoundTag tag) { - tag.put("center", NbtHelper.fromBlockPos(center)); - if (exit != null) { - tag.put("exit", NbtHelper.fromBlockPos(exit)); - } - tag.putString("axis", axis.getName()); - tag.putBoolean("active", active); - return tag; - } - - public void fromTag(CompoundTag tag) { - this.axis = Direction.Axis.fromName(tag.getString("axis")); - this.center = NbtHelper.toBlockPos(tag.getCompound("center")); - this.active = tag.getBoolean("active"); - if (tag.contains("exit")) { - this.exit = NbtHelper.toBlockPos(tag.getCompound("exit")); - } - } -} +package ru.betterend.rituals; + +import java.awt.Point; +import java.util.Random; +import java.util.Set; + +import com.google.common.collect.Sets; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtHelper; +import net.minecraft.particle.BlockStateParticleEffect; +import net.minecraft.particle.ParticleEffect; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.Heightmap; +import net.minecraft.world.World; +import net.minecraft.world.dimension.DimensionType; +import net.minecraft.world.gen.feature.ConfiguredFeatures; +import ru.betterend.blocks.BlockProperties; +import ru.betterend.blocks.EndPortalBlock; +import ru.betterend.blocks.RunedFlavolite; +import ru.betterend.blocks.entities.EternalPedestalEntity; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndTags; + +public class EternalRitual { + private final static Set STRUCTURE_MAP = Sets.newHashSet( + new Point(-4, -5), new Point(-4, 5), new Point(-6, 0), + new Point(4, -5), new Point(4, 5), new Point(6, 0)); + private final static Set FRAME_MAP = Sets.newHashSet( + new Point(0, 0), new Point(0, 6), new Point(1, 0), + new Point(1, 6), new Point(2, 1), new Point(2, 5), + new Point(3, 2), new Point(3, 3), new Point(3, 4)); + private final static Set PORTAL_MAP = Sets.newHashSet( + new Point(0, 0), new Point(0, 1), new Point(0, 2), + new Point(0, 3), new Point(0, 4), new Point(1, 0), + new Point(1, 1), new Point(1, 2), new Point(1, 3), + new Point(1, 4), new Point(2, 1), new Point(2, 2), + new Point(2, 3)); + private final static Set BASE_MAP = Sets.newHashSet( + new Point(3, 0), new Point(2, 0), new Point(2, 1), new Point(1, 1), + new Point(1, 2), new Point(0, 1), new Point(0, 2)); + + private final static Block BASE = EndBlocks.FLAVOLITE.tiles; + private final static Block PEDESTAL = EndBlocks.ETERNAL_PEDESTAL; + private final static Block FRAME = EndBlocks.FLAVOLITE_RUNED_ETERNAL; + private final static Block PORTAL = EndBlocks.END_PORTAL_BLOCK; + private final static BooleanProperty ACTIVE = BlockProperties.ACTIVATED; + + private World world; + private Direction.Axis axis; + private BlockPos center; + private BlockPos exit; + private boolean active = false; + + public EternalRitual(World world) { + this.world = world; + } + + public EternalRitual(World world, BlockPos initial) { + this(world); + this.configure(initial); + } + + public boolean hasWorld() { + return this.world != null; + } + + public void setWorld(World world) { + this.world = world; + } + + private boolean isValid() { + return world != null && !world.isClient() && + center != null && axis != null && + world.getRegistryKey() != World.NETHER; + } + + public void checkStructure() { + if (!isValid()) return; + Direction moveX, moveY; + if (Direction.Axis.X == axis) { + moveX = Direction.EAST; + moveY = Direction.NORTH; + } else { + moveX = Direction.SOUTH; + moveY = Direction.EAST; + } + boolean valid = this.checkFrame(); + for (Point pos : STRUCTURE_MAP) { + BlockPos.Mutable checkPos = center.mutableCopy(); + checkPos.move(moveX, pos.x).move(moveY, pos.y); + valid &= this.isActive(checkPos); + } + if (valid) { + this.activatePortal(); + } + } + + private boolean checkFrame() { + BlockPos framePos = center.down(); + Direction moveDir = Direction.Axis.X == axis ? Direction.NORTH: Direction.EAST; + boolean valid = true; + for (Point point : FRAME_MAP) { + BlockPos pos = framePos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); + BlockState state = world.getBlockState(pos); + valid &= state.getBlock() instanceof RunedFlavolite; + pos = framePos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); + state = world.getBlockState(pos); + valid &= state.getBlock() instanceof RunedFlavolite; + } + return valid; + } + + public boolean isActive() { + return this.active; + } + + private void activatePortal() { + if (active) return; + this.activatePortal(world, center); + this.doEffects((ServerWorld) world, center); + if (exit == null) { + this.exit = this.findPortalPos(); + } else { + World targetWorld = this.getTargetWorld(); + this.activatePortal(targetWorld, exit); + } + this.active = true; + } + + private void doEffects(ServerWorld serverWorld, BlockPos center) { + Direction moveX, moveY; + if (Direction.Axis.X == axis) { + moveX = Direction.EAST; + moveY = Direction.NORTH; + } else { + moveX = Direction.SOUTH; + moveY = Direction.EAST; + } + for (Point pos : STRUCTURE_MAP) { + BlockPos.Mutable p = center.mutableCopy(); + p.move(moveX, pos.x).move(moveY, pos.y); + serverWorld.spawnParticles(ParticleTypes.PORTAL, p.getX() + 0.5, p.getY() + 1.5, p.getZ() + 0.5, 20, 0, 0, 0, 1); + serverWorld.spawnParticles(ParticleTypes.REVERSE_PORTAL, p.getX() + 0.5, p.getY() + 1.5, p.getZ() + 0.5, 20, 0, 0, 0, 0.3); + } + serverWorld.playSound(null, center, SoundEvents.BLOCK_END_PORTAL_SPAWN, SoundCategory.NEUTRAL, 16, 1); + } + + private void activatePortal(World world, BlockPos center) { + BlockPos framePos = center.down(); + Direction moveDir = Direction.Axis.X == axis ? Direction.NORTH: Direction.EAST; + BlockState frame = FRAME.getDefaultState().with(ACTIVE, true); + FRAME_MAP.forEach(point -> { + BlockPos pos = framePos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); + BlockState state = world.getBlockState(pos); + if (state.contains(ACTIVE) && !state.get(ACTIVE)) { + world.setBlockState(pos, frame); + } + pos = framePos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); + state = world.getBlockState(pos); + if (state.contains(ACTIVE) && !state.get(ACTIVE)) { + world.setBlockState(pos, frame); + } + }); + Direction.Axis portalAxis = Direction.Axis.X == axis ? Direction.Axis.Z : Direction.Axis.X; + BlockState portal = PORTAL.getDefaultState().with(EndPortalBlock.AXIS, portalAxis); + ParticleEffect effect = new BlockStateParticleEffect(ParticleTypes.BLOCK, portal); + ServerWorld serverWorld = (ServerWorld) world; + + PORTAL_MAP.forEach(point -> { + BlockPos pos = center.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); + if (!world.getBlockState(pos).isOf(PORTAL)) { + world.setBlockState(pos, portal); + serverWorld.spawnParticles(effect, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 10, 0.5, 0.5, 0.5, 0.1); + serverWorld.spawnParticles(ParticleTypes.REVERSE_PORTAL, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 10, 0.5, 0.5, 0.5, 0.3); + } + pos = center.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); + if (!world.getBlockState(pos).isOf(PORTAL)) { + world.setBlockState(pos, portal); + serverWorld.spawnParticles(effect, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 10, 0.5, 0.5, 0.5, 0.1); + serverWorld.spawnParticles(ParticleTypes.REVERSE_PORTAL, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 10, 0.5, 0.5, 0.5, 0.3); + } + }); + } + + public void removePortal() { + if (!active || !isValid()) return; + World targetWorld = this.getTargetWorld(); + this.removePortal(world, center); + this.removePortal(targetWorld, exit); + } + + private void removePortal(World world, BlockPos center) { + BlockPos framePos = center.down(); + Direction moveDir = Direction.Axis.X == axis ? Direction.NORTH: Direction.EAST; + FRAME_MAP.forEach(point -> { + BlockPos pos = framePos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); + BlockState state = world.getBlockState(pos); + if (state.isOf(FRAME) && state.get(ACTIVE)) { + world.setBlockState(pos, state.with(ACTIVE, false)); + } + pos = framePos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); + state = world.getBlockState(pos); + if (state.isOf(FRAME) && state.get(ACTIVE)) { + world.setBlockState(pos, state.with(ACTIVE, false)); + } + }); + PORTAL_MAP.forEach(point -> { + BlockPos pos = center.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); + if (world.getBlockState(pos).isOf(PORTAL)) { + world.removeBlock(pos, false); + } + pos = center.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); + if (world.getBlockState(pos).isOf(PORTAL)) { + world.removeBlock(pos, false); + } + }); + this.active = false; + } + + private BlockPos findPortalPos() { + MinecraftServer server = world.getServer(); + ServerWorld targetWorld = (ServerWorld) this.getTargetWorld(); + Registry registry = server.getRegistryManager().getDimensionTypes(); + double mult = registry.get(DimensionType.THE_END_ID).getCoordinateScale(); + BlockPos.Mutable basePos = center.mutableCopy().set(center.getX() / mult, center.getY(), center.getZ() / mult); + Direction.Axis portalAxis = Direction.Axis.X == axis ? Direction.Axis.Z : Direction.Axis.X; + if (checkIsAreaValid(targetWorld, basePos, portalAxis)) { + EternalRitual.generatePortal(targetWorld, basePos, portalAxis); + if (portalAxis.equals(Direction.Axis.X)) { + return basePos.toImmutable(); + } else { + return basePos.toImmutable(); + } + } else { + Direction direction = Direction.EAST; + BlockPos.Mutable checkPos = basePos.mutableCopy(); + for (int step = 1; step < 64; step++) { + for (int i = 0; i < step; i++) { + checkPos.setY(5); + while(checkPos.getY() < world.getHeight()) { + if(checkIsAreaValid(targetWorld, checkPos, portalAxis)) { + EternalRitual.generatePortal(targetWorld, checkPos, portalAxis); + if (portalAxis.equals(Direction.Axis.X)) { + return checkPos.toImmutable(); + } else { + return checkPos.toImmutable(); + } + } + checkPos.move(Direction.UP); + } + checkPos.move(direction); + } + direction = direction.rotateYClockwise(); + } + } + if (targetWorld.getRegistryKey() == World.END) { + ConfiguredFeatures.END_ISLAND.generate(targetWorld, targetWorld.getChunkManager().getChunkGenerator(), new Random(basePos.asLong()), basePos.down()); + } else { + basePos.setY(targetWorld.getChunk(basePos).sampleHeightmap(Heightmap.Type.WORLD_SURFACE, basePos.getX(), basePos.getZ()) + 1); + } + EternalRitual.generatePortal(targetWorld, basePos, portalAxis); + if (portalAxis.equals(Direction.Axis.X)) { + return basePos.toImmutable(); + } else { + return basePos.toImmutable(); + } + } + + private World getTargetWorld() { + RegistryKey target = world.getRegistryKey() == World.END ? World.OVERWORLD : World.END; + return world.getServer().getWorld(target); + } + + private boolean checkIsAreaValid(World world, BlockPos pos, Direction.Axis axis) { + if (!isBaseValid(world, pos, axis)) return false; + return EternalRitual.checkArea(world, pos, axis); + } + + private boolean isBaseValid(World world, BlockPos pos, Direction.Axis axis) { + boolean solid = true; + if (axis.equals(Direction.Axis.X)) { + pos = pos.down().add(0, 0, -3); + for (int i = 0; i < 7; i++) { + BlockPos checkPos = pos.add(0, 0, i); + BlockState state = world.getBlockState(checkPos); + solid &= this.validBlock(world, checkPos, state); + } + } else { + pos = pos.down().add(-3, 0, 0); + for (int i = 0; i < 7; i++) { + BlockPos checkPos = pos.add(i, 0, 0); + BlockState state = world.getBlockState(checkPos); + solid &= this.validBlock(world, checkPos, state); + } + } + return solid; + } + + private boolean validBlock(World world, BlockPos pos, BlockState state) { + BlockState surfaceBlock = world.getBiome(pos).getGenerationSettings().getSurfaceConfig().getTopMaterial(); + return state.isSolidBlock(world, pos) && + (EndTags.validGenBlock(state) || + state.isOf(surfaceBlock.getBlock()) || + state.isOf(Blocks.STONE) || + state.isOf(Blocks.SAND) || + state.isOf(Blocks.GRAVEL)); + } + + public static void generatePortal(World world, BlockPos center, Direction.Axis axis) { + BlockPos framePos = center.down(); + Direction moveDir = Direction.Axis.X == axis ? Direction.EAST: Direction.NORTH; + BlockState frame = FRAME.getDefaultState().with(ACTIVE, true); + FRAME_MAP.forEach(point -> { + BlockPos pos = framePos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); + world.setBlockState(pos, frame); + pos = framePos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); + world.setBlockState(pos, frame); + }); + BlockState portal = PORTAL.getDefaultState().with(EndPortalBlock.AXIS, axis); + PORTAL_MAP.forEach(point -> { + BlockPos pos = center.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); + world.setBlockState(pos, portal); + pos = center.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); + world.setBlockState(pos, portal); + }); + generateBase(world, framePos, moveDir); + } + + private static void generateBase(World world, BlockPos center, Direction moveX) { + BlockState base = BASE.getDefaultState(); + Direction moveY = moveX.rotateYClockwise(); + BASE_MAP.forEach(point -> { + BlockPos pos = center.mutableCopy().move(moveX, point.x).move(moveY, point.y); + world.setBlockState(pos, base); + pos = center.mutableCopy().move(moveX, -point.x).move(moveY, point.y); + world.setBlockState(pos, base); + pos = center.mutableCopy().move(moveX, point.x).move(moveY, -point.y); + world.setBlockState(pos, base); + pos = center.mutableCopy().move(moveX, -point.x).move(moveY, -point.y); + world.setBlockState(pos, base); + }); + } + + public static boolean checkArea(World world, BlockPos center, Direction.Axis axis) { + Direction moveDir = Direction.Axis.X == axis ? Direction.NORTH: Direction.EAST; + for (BlockPos checkPos : BlockPos.iterate(center.offset(moveDir.rotateYClockwise()), center.offset(moveDir.rotateYCounterclockwise()))) { + for (Point point : PORTAL_MAP) { + BlockPos pos = checkPos.mutableCopy().move(moveDir, point.x).move(Direction.UP, point.y); + if (!world.getBlockState(pos).isAir()) return false; + pos = checkPos.mutableCopy().move(moveDir, -point.x).move(Direction.UP, point.y); + if (!world.getBlockState(pos).isAir()) return false; + } + } + return true; + } + + public void configure(BlockPos initial) { + BlockPos checkPos = initial.east(12); + if (this.hasPedestal(checkPos)) { + this.axis = Direction.Axis.X; + this.center = initial.east(6); + return; + } + checkPos = initial.west(12); + if (this.hasPedestal(checkPos)) { + this.axis = Direction.Axis.X; + this.center = initial.west(6); + return; + } + checkPos = initial.south(12); + if (this.hasPedestal(checkPos)) { + this.axis = Direction.Axis.Z; + this.center = initial.south(6); + return; + } + checkPos = initial.north(12); + if (this.hasPedestal(checkPos)) { + this.axis = Direction.Axis.Z; + this.center = initial.north(6); + return; + } + checkPos = initial.north(10); + if (this.hasPedestal(checkPos)) { + this.axis = Direction.Axis.X; + checkPos = checkPos.east(8); + if (this.hasPedestal(checkPos)) { + this.center = initial.north(5).east(4); + return; + } else { + this.center = initial.north(5).west(4); + return; + } + } + checkPos = initial.south(10); + if (this.hasPedestal(checkPos)) { + this.axis = Direction.Axis.X; + checkPos = checkPos.east(8); + if (this.hasPedestal(checkPos)) { + this.center = initial.south(5).east(4); + return; + } else { + this.center = initial.south(5).west(4); + return; + } + } + checkPos = initial.east(10); + if (this.hasPedestal(checkPos)) { + this.axis = Direction.Axis.Z; + checkPos = checkPos.south(8); + if (this.hasPedestal(checkPos)) { + this.center = initial.east(5).south(4); + return; + } else { + this.center = initial.east(5).north(4); + return; + } + } + checkPos = initial.west(10); + if (this.hasPedestal(checkPos)) { + this.axis = Direction.Axis.Z; + checkPos = checkPos.south(8); + if (this.hasPedestal(checkPos)) { + this.center = initial.west(5).south(4); + return; + } else { + this.center = initial.west(5).north(4); + return; + } + } + } + + private boolean hasPedestal(BlockPos pos) { + return world.getBlockState(pos).isOf(PEDESTAL); + } + + private boolean isActive(BlockPos pos) { + BlockState state = world.getBlockState(pos); + if (state.isOf(PEDESTAL)) { + EternalPedestalEntity pedestal = (EternalPedestalEntity) world.getBlockEntity(pos); + if (!pedestal.hasRitual()) { + pedestal.linkRitual(this); + } + return state.get(ACTIVE); + } + return false; + } + + public CompoundTag toTag(CompoundTag tag) { + tag.put("center", NbtHelper.fromBlockPos(center)); + if (exit != null) { + tag.put("exit", NbtHelper.fromBlockPos(exit)); + } + tag.putString("axis", axis.getName()); + tag.putBoolean("active", active); + return tag; + } + + public void fromTag(CompoundTag tag) { + this.axis = Direction.Axis.fromName(tag.getString("axis")); + this.center = NbtHelper.toBlockPos(tag.getCompound("center")); + this.active = tag.getBoolean("active"); + if (tag.contains("exit")) { + this.exit = NbtHelper.toBlockPos(tag.getCompound("exit")); + } + } +} diff --git a/src/main/java/ru/betterend/rituals/InfusionRitual.java b/src/main/java/ru/betterend/rituals/InfusionRitual.java index 03864391..af63af02 100644 --- a/src/main/java/ru/betterend/rituals/InfusionRitual.java +++ b/src/main/java/ru/betterend/rituals/InfusionRitual.java @@ -1,88 +1,88 @@ -package ru.betterend.rituals; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import ru.betterend.recipe.builders.InfusionRecipe; - -public class InfusionRitual implements Inventory { - - private final World world; - private final BlockPos worldPos; - private InfusionRecipe activeRecipe; - private int progress = 0; - private int time = 0; - - public InfusionRitual(World world, BlockPos pos) { - this.world = world; - this.worldPos = pos; - } - - public void tick() { - if (!hasRecipe()) return; - this.progress++; - if (progress == time) { - - } - } - - public boolean hasRecipe() { - return this.activeRecipe != null; - } - - @Override - public void clear() { - // TODO - } - - @Override - public int size() { - return 9; - } - - @Override - public boolean isEmpty() { - return false; - } - - @Override - public ItemStack getStack(int slot) { - return null; - } - - @Override - public ItemStack removeStack(int slot, int amount) { - return null; - } - - @Override - public ItemStack removeStack(int slot) { - return null; - } - - @Override - public void setStack(int slot, ItemStack stack) { - // TODO - } - - @Override - public void markDirty() { - // TODO - } - - @Override - public boolean canPlayerUse(PlayerEntity player) { - return true; - } - - public void fromTag(CompoundTag tag) { - } - - public CompoundTag toTag(CompoundTag tag) { - return tag; - } -} +package ru.betterend.rituals; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import ru.betterend.recipe.builders.InfusionRecipe; + +public class InfusionRitual implements Inventory { + + private final World world; + private final BlockPos worldPos; + private InfusionRecipe activeRecipe; + private int progress = 0; + private int time = 0; + + public InfusionRitual(World world, BlockPos pos) { + this.world = world; + this.worldPos = pos; + } + + public void tick() { + if (!hasRecipe()) return; + this.progress++; + if (progress == time) { + + } + } + + public boolean hasRecipe() { + return this.activeRecipe != null; + } + + @Override + public void clear() { + // TODO + } + + @Override + public int size() { + return 9; + } + + @Override + public boolean isEmpty() { + return false; + } + + @Override + public ItemStack getStack(int slot) { + return null; + } + + @Override + public ItemStack removeStack(int slot, int amount) { + return null; + } + + @Override + public ItemStack removeStack(int slot) { + return null; + } + + @Override + public void setStack(int slot, ItemStack stack) { + // TODO + } + + @Override + public void markDirty() { + // TODO + } + + @Override + public boolean canPlayerUse(PlayerEntity player) { + return true; + } + + public void fromTag(CompoundTag tag) { + } + + public CompoundTag toTag(CompoundTag tag) { + return tag; + } +} diff --git a/src/main/java/ru/betterend/util/LangUtil.java b/src/main/java/ru/betterend/util/LangUtil.java index cc7826a4..a5767bf2 100644 --- a/src/main/java/ru/betterend/util/LangUtil.java +++ b/src/main/java/ru/betterend/util/LangUtil.java @@ -1,38 +1,38 @@ -package ru.betterend.util; - -import net.minecraft.client.resource.language.I18n; -import net.minecraft.text.TranslatableText; - -public class LangUtil { - public final static String CONFIG_ELEMENT = "configuration"; - - private String element; - - public LangUtil(String element) { - this.element = element; - } - - public void setElement(String key) { - this.element = key; - } - - public String getString(String key) { - return getString(element, key); - } - - public TranslatableText getText(String key) { - return getText(element, key); - } - - public static String translate(String key) { - return I18n.translate(key); - } - - public static String getString(String element, String key) { - return translate(String.format("%s.%s", element, key)); - } - - public static TranslatableText getText(String element, String key) { - return new TranslatableText(getString(element, key)); - } -} +package ru.betterend.util; + +import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.TranslatableText; + +public class LangUtil { + public final static String CONFIG_ELEMENT = "configuration"; + + private String element; + + public LangUtil(String element) { + this.element = element; + } + + public void setElement(String key) { + this.element = key; + } + + public String getString(String key) { + return getString(element, key); + } + + public TranslatableText getText(String key) { + return getText(element, key); + } + + public static String translate(String key) { + return I18n.translate(key); + } + + public static String getString(String element, String key) { + return translate(String.format("%s.%s", element, key)); + } + + public static TranslatableText getText(String element, String key) { + return new TranslatableText(getString(element, key)); + } +} diff --git a/src/main/java/ru/betterend/util/Logger.java b/src/main/java/ru/betterend/util/Logger.java index a499f2e7..b3e850c3 100644 --- a/src/main/java/ru/betterend/util/Logger.java +++ b/src/main/java/ru/betterend/util/Logger.java @@ -1,68 +1,68 @@ -package ru.betterend.util; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; - -import ru.betterend.BetterEnd; - -public final class Logger { - - private static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger(); - - private String modPref = "[" + BetterEnd.MOD_ID + "] "; - - private Logger() {} - - public static Logger get() { - return new Logger(); - } - - public void log(Level level, String message) { - LOGGER.log(level, modPref + message); - } - - public void log(Level level, String message, Object... params) { - LOGGER.log(level, modPref + message, params); - } - - public void debug(Object message) { - this.log(Level.DEBUG, message.toString()); - } - - public void debug(Object message, Object... params) { - this.log(Level.DEBUG, message.toString(), params); - } - - public void catching(Throwable ex) { - this.error(ex.getLocalizedMessage()); - LOGGER.catching(ex); - } - - public void info(String message) { - this.log(Level.INFO, message); - } - - public void info(String message, Object... params) { - this.log(Level.INFO, message, params); - } - - public void warning(String message, Object... params) { - this.log(Level.WARN, message, params); - } - - public void warning(String message, Object obj, Exception ex) { - LOGGER.warn(modPref + message, obj, ex); - } - - public void error(String message) { - this.log(Level.ERROR, message); - } - - public void error(String message, Object obj, Exception ex) { - LOGGER.error(modPref + message, obj, ex); - } - - public void error(String message, Exception ex) { - LOGGER.error(modPref + message, ex); - } -} +package ru.betterend.util; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; + +import ru.betterend.BetterEnd; + +public final class Logger { + + private static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger(); + + private String modPref = "[" + BetterEnd.MOD_ID + "] "; + + private Logger() {} + + public static Logger get() { + return new Logger(); + } + + public void log(Level level, String message) { + LOGGER.log(level, modPref + message); + } + + public void log(Level level, String message, Object... params) { + LOGGER.log(level, modPref + message, params); + } + + public void debug(Object message) { + this.log(Level.DEBUG, message.toString()); + } + + public void debug(Object message, Object... params) { + this.log(Level.DEBUG, message.toString(), params); + } + + public void catching(Throwable ex) { + this.error(ex.getLocalizedMessage()); + LOGGER.catching(ex); + } + + public void info(String message) { + this.log(Level.INFO, message); + } + + public void info(String message, Object... params) { + this.log(Level.INFO, message, params); + } + + public void warning(String message, Object... params) { + this.log(Level.WARN, message, params); + } + + public void warning(String message, Object obj, Exception ex) { + LOGGER.warn(modPref + message, obj, ex); + } + + public void error(String message) { + this.log(Level.ERROR, message); + } + + public void error(String message, Object obj, Exception ex) { + LOGGER.error(modPref + message, obj, ex); + } + + public void error(String message, Exception ex) { + LOGGER.error(modPref + message, ex); + } +} diff --git a/src/main/resources/assets/betterend/blockstates/end_portal_block.json b/src/main/resources/assets/betterend/blockstates/end_portal_block.json index c6443f19..439c2b9d 100644 --- a/src/main/resources/assets/betterend/blockstates/end_portal_block.json +++ b/src/main/resources/assets/betterend/blockstates/end_portal_block.json @@ -1,10 +1,10 @@ -{ - "variants": { - "axis=x": { - "model": "betterend:block/end_portal_ax" - }, - "axis=z": { - "model": "betterend:block/end_portal_az" - } - } +{ + "variants": { + "axis=x": { + "model": "betterend:block/end_portal_ax" + }, + "axis=z": { + "model": "betterend:block/end_portal_az" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/blockstates/eternal_pedestal.json b/src/main/resources/assets/betterend/blockstates/eternal_pedestal.json index 017af6e2..7e98f449 100644 --- a/src/main/resources/assets/betterend/blockstates/eternal_pedestal.json +++ b/src/main/resources/assets/betterend/blockstates/eternal_pedestal.json @@ -1,108 +1,108 @@ -{ - "variants": { - "state=default,active=false": [ - { - "model": "betterend:block/eternal_pedestal_default_1" - }, - { - "model": "betterend:block/eternal_pedestal_default_2" - }, - { - "model": "betterend:block/eternal_pedestal_default_3" - }, - { - "model": "betterend:block/eternal_pedestal_default_4" - }, - { - "model": "betterend:block/eternal_pedestal_default_5" - }, - { - "model": "betterend:block/eternal_pedestal_default_6" - }, - { - "model": "betterend:block/eternal_pedestal_default_7" - } - ], - "state=default,active=true": [ - { - "model": "betterend:block/eternal_pedestal_default_active_1" - }, - { - "model": "betterend:block/eternal_pedestal_default_active_2" - }, - { - "model": "betterend:block/eternal_pedestal_default_active_3" - }, - { - "model": "betterend:block/eternal_pedestal_default_active_4" - }, - { - "model": "betterend:block/eternal_pedestal_default_active_5" - }, - { - "model": "betterend:block/eternal_pedestal_default_active_6" - }, - { - "model": "betterend:block/eternal_pedestal_default_active_7" - } - ], - "state=pedestal_top,active=false": [ - { - "model": "betterend:block/eternal_pedestal_top_1" - }, - { - "model": "betterend:block/eternal_pedestal_top_2" - }, - { - "model": "betterend:block/eternal_pedestal_top_3" - }, - { - "model": "betterend:block/eternal_pedestal_top_4" - }, - { - "model": "betterend:block/eternal_pedestal_top_5" - }, - { - "model": "betterend:block/eternal_pedestal_top_6" - }, - { - "model": "betterend:block/eternal_pedestal_top_7" - } - ], - "state=pedestal_top,active=true": [ - { - "model": "betterend:block/eternal_pedestal_top_active_1" - }, - { - "model": "betterend:block/eternal_pedestal_top_active_2" - }, - { - "model": "betterend:block/eternal_pedestal_top_active_3" - }, - { - "model": "betterend:block/eternal_pedestal_top_active_4" - }, - { - "model": "betterend:block/eternal_pedestal_top_active_5" - }, - { - "model": "betterend:block/eternal_pedestal_top_active_6" - }, - { - "model": "betterend:block/eternal_pedestal_top_active_7" - } - ], - "state=column": { - "model": "betterend:block/eternal_pedestal_column" - }, - "state=column_top": { - "model": "betterend:block/eternal_pedestal_column_top" - }, - "state=bottom": { - "model": "betterend:block/eternal_pedestal_bottom" - }, - "state=pillar": { - "model": "betterend:block/eternal_pedestal_pillar" - } - } +{ + "variants": { + "state=default,active=false": [ + { + "model": "betterend:block/eternal_pedestal_default_1" + }, + { + "model": "betterend:block/eternal_pedestal_default_2" + }, + { + "model": "betterend:block/eternal_pedestal_default_3" + }, + { + "model": "betterend:block/eternal_pedestal_default_4" + }, + { + "model": "betterend:block/eternal_pedestal_default_5" + }, + { + "model": "betterend:block/eternal_pedestal_default_6" + }, + { + "model": "betterend:block/eternal_pedestal_default_7" + } + ], + "state=default,active=true": [ + { + "model": "betterend:block/eternal_pedestal_default_active_1" + }, + { + "model": "betterend:block/eternal_pedestal_default_active_2" + }, + { + "model": "betterend:block/eternal_pedestal_default_active_3" + }, + { + "model": "betterend:block/eternal_pedestal_default_active_4" + }, + { + "model": "betterend:block/eternal_pedestal_default_active_5" + }, + { + "model": "betterend:block/eternal_pedestal_default_active_6" + }, + { + "model": "betterend:block/eternal_pedestal_default_active_7" + } + ], + "state=pedestal_top,active=false": [ + { + "model": "betterend:block/eternal_pedestal_top_1" + }, + { + "model": "betterend:block/eternal_pedestal_top_2" + }, + { + "model": "betterend:block/eternal_pedestal_top_3" + }, + { + "model": "betterend:block/eternal_pedestal_top_4" + }, + { + "model": "betterend:block/eternal_pedestal_top_5" + }, + { + "model": "betterend:block/eternal_pedestal_top_6" + }, + { + "model": "betterend:block/eternal_pedestal_top_7" + } + ], + "state=pedestal_top,active=true": [ + { + "model": "betterend:block/eternal_pedestal_top_active_1" + }, + { + "model": "betterend:block/eternal_pedestal_top_active_2" + }, + { + "model": "betterend:block/eternal_pedestal_top_active_3" + }, + { + "model": "betterend:block/eternal_pedestal_top_active_4" + }, + { + "model": "betterend:block/eternal_pedestal_top_active_5" + }, + { + "model": "betterend:block/eternal_pedestal_top_active_6" + }, + { + "model": "betterend:block/eternal_pedestal_top_active_7" + } + ], + "state=column": { + "model": "betterend:block/eternal_pedestal_column" + }, + "state=column_top": { + "model": "betterend:block/eternal_pedestal_column_top" + }, + "state=bottom": { + "model": "betterend:block/eternal_pedestal_bottom" + }, + "state=pillar": { + "model": "betterend:block/eternal_pedestal_pillar" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/blockstates/flavolite_runed.json b/src/main/resources/assets/betterend/blockstates/flavolite_runed.json index eb343bad..cb846fbb 100644 --- a/src/main/resources/assets/betterend/blockstates/flavolite_runed.json +++ b/src/main/resources/assets/betterend/blockstates/flavolite_runed.json @@ -1,446 +1,446 @@ -{ - "variants": { - "active=false": [ - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 270, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 270, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 270, - "y": 270 - } - ], - "active=true": [ - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 270, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 270, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 270, - "y": 270 - } - ] - } +{ + "variants": { + "active=false": [ + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 270, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 270, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 270, + "y": 270 + } + ], + "active=true": [ + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 270, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 270, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 270, + "y": 270 + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/blockstates/flavolite_runed_eternal.json b/src/main/resources/assets/betterend/blockstates/flavolite_runed_eternal.json index eb343bad..cb846fbb 100644 --- a/src/main/resources/assets/betterend/blockstates/flavolite_runed_eternal.json +++ b/src/main/resources/assets/betterend/blockstates/flavolite_runed_eternal.json @@ -1,446 +1,446 @@ -{ - "variants": { - "active=false": [ - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_1", - "uvlock": true, - "x": 270, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_2", - "uvlock": true, - "x": 270, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_3", - "uvlock": true, - "x": 270, - "y": 270 - } - ], - "active=true": [ - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_1", - "uvlock": true, - "x": 270, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_2", - "uvlock": true, - "x": 270, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 90, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 90, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 90, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 180, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 180, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 180, - "y": 270 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 270, - "y": 90 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 270, - "y": 180 - }, - { - "model": "betterend:block/flavolite_runed_active_3", - "uvlock": true, - "x": 270, - "y": 270 - } - ] - } +{ + "variants": { + "active=false": [ + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_1", + "uvlock": true, + "x": 270, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_2", + "uvlock": true, + "x": 270, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_3", + "uvlock": true, + "x": 270, + "y": 270 + } + ], + "active=true": [ + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_1", + "uvlock": true, + "x": 270, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_2", + "uvlock": true, + "x": 270, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 90, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 90, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 90, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 180, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 180, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 180, + "y": 270 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 270, + "y": 90 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 270, + "y": 180 + }, + { + "model": "betterend:block/flavolite_runed_active_3", + "uvlock": true, + "x": 270, + "y": 270 + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/blockstates/infusion_pedestal.json b/src/main/resources/assets/betterend/blockstates/infusion_pedestal.json index 361a4d38..65c3758c 100644 --- a/src/main/resources/assets/betterend/blockstates/infusion_pedestal.json +++ b/src/main/resources/assets/betterend/blockstates/infusion_pedestal.json @@ -1,22 +1,22 @@ -{ - "variants": { - "state=default": { - "model": "betterend:block/infusion_pedestal_default" - }, - "state=pedestal_top": { - "model": "betterend:block/infusion_pedestal_top" - }, - "state=column": { - "model": "betterend:block/infusion_pedestal_column" - }, - "state=column_top": { - "model": "betterend:block/infusion_pedestal_column_top" - }, - "state=bottom": { - "model": "betterend:block/infusion_pedestal_bottom" - }, - "state=pillar": { - "model": "betterend:block/infusion_pedestal_pillar" - } - } +{ + "variants": { + "state=default": { + "model": "betterend:block/infusion_pedestal_default" + }, + "state=pedestal_top": { + "model": "betterend:block/infusion_pedestal_top" + }, + "state=column": { + "model": "betterend:block/infusion_pedestal_column" + }, + "state=column_top": { + "model": "betterend:block/infusion_pedestal_column_top" + }, + "state=bottom": { + "model": "betterend:block/infusion_pedestal_bottom" + }, + "state=pillar": { + "model": "betterend:block/infusion_pedestal_pillar" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/blockstates/purpur_pedestal.json b/src/main/resources/assets/betterend/blockstates/purpur_pedestal.json index b66867fa..979fc1b9 100644 --- a/src/main/resources/assets/betterend/blockstates/purpur_pedestal.json +++ b/src/main/resources/assets/betterend/blockstates/purpur_pedestal.json @@ -1,22 +1,22 @@ -{ - "variants": { - "state=default": { - "model": "betterend:block/purpur_pedestal_default" - }, - "state=column": { - "model": "betterend:block/purpur_pedestal_column" - }, - "state=column_top": { - "model": "betterend:block/purpur_pedestal_column_top" - }, - "state=pedestal_top": { - "model": "betterend:block/purpur_pedestal_top" - }, - "state=bottom": { - "model": "betterend:block/purpur_pedestal_bottom" - }, - "state=pillar": { - "model": "betterend:block/purpur_pedestal_pillar" - } - } +{ + "variants": { + "state=default": { + "model": "betterend:block/purpur_pedestal_default" + }, + "state=column": { + "model": "betterend:block/purpur_pedestal_column" + }, + "state=column_top": { + "model": "betterend:block/purpur_pedestal_column_top" + }, + "state=pedestal_top": { + "model": "betterend:block/purpur_pedestal_top" + }, + "state=bottom": { + "model": "betterend:block/purpur_pedestal_bottom" + }, + "state=pillar": { + "model": "betterend:block/purpur_pedestal_pillar" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/blockstates/quartz_pedestal.json b/src/main/resources/assets/betterend/blockstates/quartz_pedestal.json index 9dce75da..9f6590ca 100644 --- a/src/main/resources/assets/betterend/blockstates/quartz_pedestal.json +++ b/src/main/resources/assets/betterend/blockstates/quartz_pedestal.json @@ -1,22 +1,22 @@ -{ - "variants": { - "state=default": { - "model": "betterend:block/quartz_pedestal_default" - }, - "state=column": { - "model": "betterend:block/quartz_pedestal_column" - }, - "state=column_top": { - "model": "betterend:block/quartz_pedestal_column_top" - }, - "state=pedestal_top": { - "model": "betterend:block/quartz_pedestal_top" - }, - "state=bottom": { - "model": "betterend:block/quartz_pedestal_bottom" - }, - "state=pillar": { - "model": "betterend:block/quartz_pedestal_pillar" - } - } +{ + "variants": { + "state=default": { + "model": "betterend:block/quartz_pedestal_default" + }, + "state=column": { + "model": "betterend:block/quartz_pedestal_column" + }, + "state=column_top": { + "model": "betterend:block/quartz_pedestal_column_top" + }, + "state=pedestal_top": { + "model": "betterend:block/quartz_pedestal_top" + }, + "state=bottom": { + "model": "betterend:block/quartz_pedestal_bottom" + }, + "state=pillar": { + "model": "betterend:block/quartz_pedestal_pillar" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/blockstates/violecite.json b/src/main/resources/assets/betterend/blockstates/violecite.json index e751d3fd..fd94b247 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite.json +++ b/src/main/resources/assets/betterend/blockstates/violecite.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/violecite" - } - } -} +{ + "variants": { + "": { + "model": "betterend:block/violecite" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_bricks.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks.json index 0d87306b..a9d9704f 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_bricks.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_bricks.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/violecite_bricks" - } - } -} +{ + "variants": { + "": { + "model": "betterend:block/violecite_bricks" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json index 6565493f..e677d7d4 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_bricks_slab.json @@ -1,15 +1,15 @@ -{ - "variants": { - "type=bottom": { - "model": "betterend:block/violecite_bricks_half_slab" - }, - "type=double": { - "model": "betterend:block/violecite_bricks" - }, - "type=top": { - "model": "betterend:block/violecite_bricks_half_slab", - "uvlock": true, - "x": 180 - } - } -} +{ + "variants": { + "type=bottom": { + "model": "betterend:block/violecite_bricks_half_slab" + }, + "type=double": { + "model": "betterend:block/violecite_bricks" + }, + "type=top": { + "model": "betterend:block/violecite_bricks_half_slab", + "uvlock": true, + "x": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json index 57f46dfe..b528feb8 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_bricks_stairs.json @@ -1,209 +1,209 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_bricks_inner_stairs" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_bricks_outer_stairs" - }, - "facing=east,half=bottom,shape=straight": { - "model": "betterend:block/violecite_bricks_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "betterend:block/violecite_bricks_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "betterend:block/violecite_bricks_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "betterend:block/violecite_bricks_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_bricks_inner_stairs" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_bricks_outer_stairs" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "betterend:block/violecite_bricks_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "betterend:block/violecite_bricks_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "betterend:block/violecite_bricks_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "betterend:block/violecite_bricks_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "betterend:block/violecite_bricks_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "betterend:block/violecite_bricks_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_bricks_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_bricks_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:block/violecite_bricks_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:block/violecite_bricks_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:block/violecite_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:block/violecite_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_bricks_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_bricks_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:block/violecite_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:block/violecite_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:block/violecite_bricks_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:block/violecite_bricks_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:block/violecite_bricks_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:block/violecite_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json b/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json index 26bc65d2..fb421cc9 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_bricks_wall.json @@ -1,90 +1,90 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_post" - } - }, - { - "when": { - "north": "low" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_side", - "uvlock": true - } - }, - { - "when": { - "east": "low" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "low" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "low" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "north": "tall" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_side_tall", - "uvlock": true - } - }, - { - "when": { - "east": "tall" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_side_tall", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "tall" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_side_tall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "tall" - }, - "apply": { - "model": "betterend:block/violecite_bricks_wall_side_tall", - "y": 270, - "uvlock": true - } - } - ] -} +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "betterend:block/violecite_bricks_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_button.json b/src/main/resources/assets/betterend/blockstates/violecite_button.json index 4671d482..e39bf88d 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_button.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_button.json @@ -1,118 +1,118 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "betterend:block/violecite_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=east,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=north,powered=false": { - "model": "betterend:block/violecite_button", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=south,powered=false": { - "model": "betterend:block/violecite_button", - "x": 180 - }, - "face=ceiling,facing=south,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "x": 180 - }, - "face=ceiling,facing=west,powered=false": { - "model": "betterend:block/violecite_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=west,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "x": 180, - "y": 90 - }, - "face=floor,facing=east,powered=false": { - "model": "betterend:block/violecite_button", - "y": 90 - }, - "face=floor,facing=east,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "y": 90 - }, - "face=floor,facing=north,powered=false": { - "model": "betterend:block/violecite_button" - }, - "face=floor,facing=north,powered=true": { - "model": "betterend:block/violecite_button_pressed" - }, - "face=floor,facing=south,powered=false": { - "model": "betterend:block/violecite_button", - "y": 180 - }, - "face=floor,facing=south,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "y": 180 - }, - "face=floor,facing=west,powered=false": { - "model": "betterend:block/violecite_button", - "y": 270 - }, - "face=floor,facing=west,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "y": 270 - }, - "face=wall,facing=east,powered=false": { - "model": "betterend:block/violecite_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=east,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=north,powered=false": { - "model": "betterend:block/violecite_button", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=north,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=south,powered=false": { - "model": "betterend:block/violecite_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=south,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=west,powered=false": { - "model": "betterend:block/violecite_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=west,powered=true": { - "model": "betterend:block/violecite_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - } - } -} +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "betterend:block/violecite_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "betterend:block/violecite_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "betterend:block/violecite_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "betterend:block/violecite_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "betterend:block/violecite_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "betterend:block/violecite_button" + }, + "face=floor,facing=north,powered=true": { + "model": "betterend:block/violecite_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "betterend:block/violecite_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "betterend:block/violecite_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "betterend:block/violecite_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "betterend:block/violecite_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "betterend:block/violecite_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "betterend:block/violecite_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "betterend:block/violecite_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_pillar.json b/src/main/resources/assets/betterend/blockstates/violecite_pillar.json index 122c20b5..90618711 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_pillar.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_pillar.json @@ -1,7 +1,7 @@ -{ - "variants": { - "axis=x": { "model": "betterend:block/violecite_pillar", "x": 90, "y": 270 }, - "axis=y": { "model": "betterend:block/violecite_pillar" }, - "axis=z": { "model": "betterend:block/violecite_pillar", "x": 90 } - } -} +{ + "variants": { + "axis=x": { "model": "betterend:block/violecite_pillar", "x": 90, "y": 270 }, + "axis=y": { "model": "betterend:block/violecite_pillar" }, + "axis=z": { "model": "betterend:block/violecite_pillar", "x": 90 } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_plate.json b/src/main/resources/assets/betterend/blockstates/violecite_plate.json index 7adc867f..83aba147 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_plate.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_plate.json @@ -1,10 +1,10 @@ -{ - "variants": { - "powered=false": { - "model": "betterend:block/violecite_pressure_plate_up" - }, - "powered=true": { - "model": "betterend:block/violecite_pressure_plate_down" - } - } -} +{ + "variants": { + "powered=false": { + "model": "betterend:block/violecite_pressure_plate_up" + }, + "powered=true": { + "model": "betterend:block/violecite_pressure_plate_down" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_slab.json b/src/main/resources/assets/betterend/blockstates/violecite_slab.json index 1e4a0b4c..d27cf448 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_slab.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_slab.json @@ -1,15 +1,15 @@ -{ - "variants": { - "type=bottom": { - "model": "betterend:block/violecite_half_slab" - }, - "type=double": { - "model": "betterend:block/violecite" - }, - "type=top": { - "model": "betterend:block/violecite_half_slab", - "uvlock": true, - "x": 180 - } - } -} +{ + "variants": { + "type=bottom": { + "model": "betterend:block/violecite_half_slab" + }, + "type=double": { + "model": "betterend:block/violecite" + }, + "type=top": { + "model": "betterend:block/violecite_half_slab", + "uvlock": true, + "x": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_small_tiles.json b/src/main/resources/assets/betterend/blockstates/violecite_small_tiles.json index 711b5b92..6f7d8561 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_small_tiles.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_small_tiles.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/violecite_small_tiles" - } - } -} +{ + "variants": { + "": { + "model": "betterend:block/violecite_small_tiles" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_stairs.json b/src/main/resources/assets/betterend/blockstates/violecite_stairs.json index 3231569f..bd76aa03 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_stairs.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_stairs.json @@ -1,209 +1,209 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_inner_stairs" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_outer_stairs" - }, - "facing=east,half=bottom,shape=straight": { - "model": "betterend:block/violecite_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "betterend:block/violecite_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "betterend:block/violecite_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "betterend:block/violecite_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_inner_stairs" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_outer_stairs" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "betterend:block/violecite_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "betterend:block/violecite_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "betterend:block/violecite_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "betterend:block/violecite_inner_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "betterend:block/violecite_outer_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "betterend:block/violecite_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:block/violecite_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:block/violecite_inner_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:block/violecite_outer_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:block/violecite_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_tile.json b/src/main/resources/assets/betterend/blockstates/violecite_tile.json index 43157f62..f735990c 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_tile.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_tile.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:block/violecite_tile" - } - } -} +{ + "variants": { + "": { + "model": "betterend:block/violecite_tile" + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/violecite_wall.json b/src/main/resources/assets/betterend/blockstates/violecite_wall.json index fae6a469..afb41db1 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_wall.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_wall.json @@ -1,90 +1,90 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "betterend:block/violecite_wall_post" - } - }, - { - "when": { - "north": "low" - }, - "apply": { - "model": "betterend:block/violecite_wall_side", - "uvlock": true - } - }, - { - "when": { - "east": "low" - }, - "apply": { - "model": "betterend:block/violecite_wall_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "low" - }, - "apply": { - "model": "betterend:block/violecite_wall_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "low" - }, - "apply": { - "model": "betterend:block/violecite_wall_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "north": "tall" - }, - "apply": { - "model": "betterend:block/violecite_wall_side_tall", - "uvlock": true - } - }, - { - "when": { - "east": "tall" - }, - "apply": { - "model": "betterend:block/violecite_wall_side_tall", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "tall" - }, - "apply": { - "model": "betterend:block/violecite_wall_side_tall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "tall" - }, - "apply": { - "model": "betterend:block/violecite_wall_side_tall", - "y": 270, - "uvlock": true - } - } - ] -} +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "betterend:block/violecite_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "betterend:block/violecite_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "betterend:block/violecite_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "betterend:block/violecite_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "betterend:block/violecite_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "betterend:block/violecite_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "betterend:block/violecite_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "betterend:block/violecite_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "betterend:block/violecite_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} diff --git a/src/main/resources/assets/betterend/lang/zh_cn.json b/src/main/resources/assets/betterend/lang/zh_cn.json index 5fd313e0..9ca78189 100644 --- a/src/main/resources/assets/betterend/lang/zh_cn.json +++ b/src/main/resources/assets/betterend/lang/zh_cn.json @@ -1,160 +1,160 @@ -{ - "itemGroup.betterend.items": "更好的末地", - - "biome.betterend.foggy_mushroomland": "雾霭蘑è‡å²›", - "biome.betterend.dust_wastelands": "尘土飞扬的è’地", - "biome.betterend.chorus_forest": "å’唱森林", - "biome.betterend.megalake": "末际湖", - - "entity.betterend.dragonfly": "蜻蜓", - "item.betterend.spawn_egg_dragonfly": "蜻蜓刷怪蛋", - - "entity.betterend.end_slime": "末地å²èŽ±å§†", - "item.betterend.spawn_egg_end_slime": "末地å²èŽ±å§†åˆ·æ€ªè›‹", - - "block.betterend.end_mycelium": "末地èŒä¸", - "block.betterend.end_moss": "末地苔石", - "block.betterend.endstone_dust": "末地沙", - - "block.betterend.end_mycelium_path": "末地èŒä¸å¾„", - "block.betterend.end_moss_path": "末地苔藓径", - - "block.betterend.ender_ore": "末影矿", - "block.betterend.terminite_block": "终界é“å—", - "block.betterend.aeternium_block": "太å¤åˆé‡‘å—", - "block.betterend.ender_block": "末影å—", - "block.betterend.end_stone_smelter": "末地石冶炼炉", - - "item.betterend.ender_dust": "末影粉", - "item.betterend.terminite_ingot": "终界é“é”­", - "item.betterend.aeternium_ingot": "太å¤åˆé‡‘é”­", - "item.betterend.terminite_helmet": "终界é“头盔", - "item.betterend.terminite_chestplate": "终界é“胸甲", - "item.betterend.terminite_leggings": "终界é“护腿", - "item.betterend.terminite_boots": "终界é“é´å­", - "item.betterend.terminite_shovel": "终界é“锹", - "item.betterend.terminite_sword": "终界é“剑", - "item.betterend.terminite_pickaxe": "终界é“é•", - "item.betterend.terminite_axe": "终界é“æ–§", - "item.betterend.terminite_hoe": "终界é“锄", - "item.betterend.terminite_hammer": "终界é“匠锤", - "item.betterend.aeternium_helmet": "太å¤åˆé‡‘头盔", - "item.betterend.aeternium_chestplate": "太å¤åˆé‡‘胸甲", - "item.betterend.aeternium_leggings": "太å¤åˆé‡‘护腿", - "item.betterend.aeternium_boots": "太å¤åˆé‡‘é´å­", - "item.betterend.aeternium_shovel": "太å¤åˆé‡‘锹", - "item.betterend.aeternium_sword": "太å¤åˆé‡‘剑", - "item.betterend.aeternium_pickaxe": "太å¤åˆé‡‘é•", - "item.betterend.aeternium_axe": "太å¤åˆé‡‘æ–§", - "item.betterend.aeternium_hoe": "太å¤åˆé‡‘锄", - "item.betterend.aeternium_hammer": "太å¤åˆé‡‘匠锤", - "item.betterend.iron_hammer": "é“匠锤", - "item.betterend.golden_hammer": "金匠锤", - "item.betterend.diamond_hammer": "钻石匠锤", - "item.betterend.netherite_hammer": "下届åˆé‡‘匠锤", - - "effect.betterend.end_veil": "末地é¢å…·", - "enchantment.betterend.end_veil": "末地é¢å…·", - "item.minecraft.potion.effect.end_veil": "末地é¢å…·è¯æ°´", - "item.minecraft.potion.effect.long_end_veil": "末地é¢å…·è¯æ°´", - "item.minecraft.splash_potion.effect.end_veil": "喷溅型末地é¢å…·è¯æ°´", - "item.minecraft.splash_potion.effect.long_end_veil": "喷溅型末地é¢å…·è¯æ°´", - "item.minecraft.lingering_potion.effect.end_veil": "滞留型末地é¢å…·è¯æ°´", - "item.minecraft.lingering_potion.effect.long_end_veil": "滞留型末地é¢å…·è¯æ°´", - "item.minecraft.tipped_arrow.effect.end_veil": "末地é¢å…·ä¹‹ç®­", - "item.minecraft.tipped_arrow.effect.long_end_veil": "末地é¢å…·ä¹‹ç®­", - - "block.betterend.mossy_glowshroom_sapling": "苔光è‡ç§å­", - "block.betterend.mossy_glowshroom_cap": "苔光è‡èŒç›–", - "block.betterend.mossy_glowshroom_fur": "苔光è‡èŒç»’", - "block.betterend.mossy_glowshroom_hymenophore": "苔光è‡èŒè¤¶", - "block.betterend.mossy_glowshroom_bark": "苔光è‡èŒæœ¨", - "block.betterend.mossy_glowshroom_barrel": "苔光è‡æœ¨æ¡¶", - "block.betterend.mossy_glowshroom_button": "苔光è‡æŒ‰é’®", - "block.betterend.mossy_glowshroom_chest": "苔光è‡æœ¨ç®±", - "block.betterend.mossy_glowshroom_crafting_table": "苔光è‡å·¥ä½œå°", - "block.betterend.mossy_glowshroom_door": "苔光è‡æœ¨é—¨", - "block.betterend.mossy_glowshroom_fence": "苔光è‡æœ¨æ …æ ", - "block.betterend.mossy_glowshroom_gate": "苔光è‡æœ¨æ …æ é—¨", - "block.betterend.mossy_glowshroom_ladder": "苔光è‡æœ¨æ¢¯", - "block.betterend.mossy_glowshroom_log": "苔光è‡åŽŸæœ¨", - "block.betterend.mossy_glowshroom_planks": "苔光è‡æœ¨æ¿", - "block.betterend.mossy_glowshroom_plate": "苔光è‡åŽ‹åŠ›æ¿", - "block.betterend.mossy_glowshroom_sign": "苔光è‡å‘Šç¤ºç‰Œ", - "block.betterend.mossy_glowshroom_slab": "苔光è‡å°é˜¶", - "block.betterend.mossy_glowshroom_stairs": "苔光è‡æ¥¼æ¢¯", - "block.betterend.mossy_glowshroom_stripped_bark": "去皮苔光è‡èŒæœ¨", - "block.betterend.mossy_glowshroom_stripped_log": "去皮苔光è‡åŽŸæœ¨", - "block.betterend.mossy_glowshroom_trapdoor": "苔光è‡æ´»æ¿é—¨", - - "block.betterend.umbrella_moss": "伞状苔藓", - "block.betterend.umbrella_moss_tall": "高伞状苔藓", - "block.betterend.creeping_moss": "åŒåŒè‹”è—“", - - "block.betterend.blue_vine_seed": "è“è—¤ç§å­", - "block.betterend.blue_vine": "è“è—¤", - "block.betterend.blue_vine_lantern": "è“è—¤ç¯", - "block.betterend.blue_vine_fur": "è“è—¤èŒæ¯›", - - "block.betterend.dense_vine": "茂密藤蔓", - "block.betterend.bubble_coral": "气泡çŠç‘š", - "block.betterend.aurora_crystal": "æžå…‰æ°´æ™¶", - - "category.rei.damage.amount&dmg": "工具伤害：%s", - - "block.betterend.pythadendron_bark": "å’唱木树皮", - "block.betterend.pythadendron_barrel": "å’唱木桶", - "block.betterend.pythadendron_button": "å’唱木按钮", - "block.betterend.pythadendron_chest": "å’唱木箱å­", - "block.betterend.pythadendron_crafting_table": "å’唱木工作å°", - "block.betterend.pythadendron_door": "å’唱木门", - "block.betterend.pythadendron_fence": "å’唱木栅æ ", - "block.betterend.pythadendron_gate": "å’唱木栅æ é—¨", - "block.betterend.pythadendron_ladder": "å’唱木梯", - "block.betterend.pythadendron_log": "å’唱木原木", - "block.betterend.pythadendron_planks": "å’唱木æ¿", - "block.betterend.pythadendron_plate": "å’唱木压力æ¿", - "block.betterend.pythadendron_sign": "å’唱木告示牌", - "block.betterend.pythadendron_slab": "å’唱木å°é˜¶", - "block.betterend.pythadendron_stairs": "å’唱木楼梯", - "block.betterend.pythadendron_stripped_bark": "去皮å’唱木树皮", - "block.betterend.pythadendron_stripped_log": "去皮å’唱木原木", - "block.betterend.pythadendron_trapdoor": "å’唱木活æ¿é—¨", - - "block.betterend.chorus_nylium": "å’å”±èŒå²©", - "block.betterend.chorus_nylium_path": "å’å”±èŒå²©å¾„", - "block.betterend.chorus_grass": "å’å”±èŒè‰", - - "block.betterend.end_lily": "末地ç¡èŽ²", - "block.betterend.end_lily_seed": "末地ç¡èŽ²ç§å­", - "item.betterend.end_lily_leaf": "末地ç¡èŽ²å¶å­", - "item.betterend.end_lily_leaf_dried": "末地ç¡èŽ²æž¯å¶", - - "block.betterend.violecite": "紫罗兰石", - "block.betterend.violecite_bricks": "紫罗兰石砖", - "block.betterend.violecite_bricks_slab": "紫罗兰石砖å°é˜¶", - "block.betterend.violecite_bricks_stairs": "紫罗兰石砖楼梯", - "block.betterend.violecite_bricks_wall": "紫罗兰石砖墙", - "block.betterend.violecite_button": "紫罗兰石按钮", - "block.betterend.violecite_pillar": "紫罗兰石柱", - "block.betterend.violecite_plate": "紫罗兰石压力æ¿", - "block.betterend.violecite_slab": "紫罗兰石å°é˜¶", - "block.betterend.violecite_tiles": "紫罗兰石瓷砖", - "block.betterend.violecite_stairs": "紫罗兰石楼梯", - "block.betterend.violecite_polished": "磨制紫罗兰石", - "block.betterend.violecite_wall": "紫罗兰石墙", - - "block.betterend.flavolite": "香料石", - "block.betterend.flavolite_bricks": "香料石砖", - "block.betterend.flavolite_bricks_slab": "香料石砖å°é˜¶", - "block.betterend.flavolite_bricks_stairs": "香料石砖楼梯", - "block.betterend.flavolite_bricks_wall": "香料石砖墙", - "block.betterend.flavolite_button": "香料石按钮", - "block.betterend.flavolite_pillar": "香料石柱", - "block.betterend.flavolite_plate": "香料石压力æ¿", - "block.betterend.flavolite_slab": "香料石å°é˜¶", - "block.betterend.flavolite_tiles": "香料石瓷砖", - "block.betterend.flavolite_stairs": "香料石楼梯", - "block.betterend.flavolite_polished": "磨制香料石", - "block.betterend.flavolite_wall": "香料石墙" -} +{ + "itemGroup.betterend.items": "更好的末地", + + "biome.betterend.foggy_mushroomland": "雾霭蘑è‡å²›", + "biome.betterend.dust_wastelands": "尘土飞扬的è’地", + "biome.betterend.chorus_forest": "å’唱森林", + "biome.betterend.megalake": "末际湖", + + "entity.betterend.dragonfly": "蜻蜓", + "item.betterend.spawn_egg_dragonfly": "蜻蜓刷怪蛋", + + "entity.betterend.end_slime": "末地å²èŽ±å§†", + "item.betterend.spawn_egg_end_slime": "末地å²èŽ±å§†åˆ·æ€ªè›‹", + + "block.betterend.end_mycelium": "末地èŒä¸", + "block.betterend.end_moss": "末地苔石", + "block.betterend.endstone_dust": "末地沙", + + "block.betterend.end_mycelium_path": "末地èŒä¸å¾„", + "block.betterend.end_moss_path": "末地苔藓径", + + "block.betterend.ender_ore": "末影矿", + "block.betterend.terminite_block": "终界é“å—", + "block.betterend.aeternium_block": "太å¤åˆé‡‘å—", + "block.betterend.ender_block": "末影å—", + "block.betterend.end_stone_smelter": "末地石冶炼炉", + + "item.betterend.ender_dust": "末影粉", + "item.betterend.terminite_ingot": "终界é“é”­", + "item.betterend.aeternium_ingot": "太å¤åˆé‡‘é”­", + "item.betterend.terminite_helmet": "终界é“头盔", + "item.betterend.terminite_chestplate": "终界é“胸甲", + "item.betterend.terminite_leggings": "终界é“护腿", + "item.betterend.terminite_boots": "终界é“é´å­", + "item.betterend.terminite_shovel": "终界é“锹", + "item.betterend.terminite_sword": "终界é“剑", + "item.betterend.terminite_pickaxe": "终界é“é•", + "item.betterend.terminite_axe": "终界é“æ–§", + "item.betterend.terminite_hoe": "终界é“锄", + "item.betterend.terminite_hammer": "终界é“匠锤", + "item.betterend.aeternium_helmet": "太å¤åˆé‡‘头盔", + "item.betterend.aeternium_chestplate": "太å¤åˆé‡‘胸甲", + "item.betterend.aeternium_leggings": "太å¤åˆé‡‘护腿", + "item.betterend.aeternium_boots": "太å¤åˆé‡‘é´å­", + "item.betterend.aeternium_shovel": "太å¤åˆé‡‘锹", + "item.betterend.aeternium_sword": "太å¤åˆé‡‘剑", + "item.betterend.aeternium_pickaxe": "太å¤åˆé‡‘é•", + "item.betterend.aeternium_axe": "太å¤åˆé‡‘æ–§", + "item.betterend.aeternium_hoe": "太å¤åˆé‡‘锄", + "item.betterend.aeternium_hammer": "太å¤åˆé‡‘匠锤", + "item.betterend.iron_hammer": "é“匠锤", + "item.betterend.golden_hammer": "金匠锤", + "item.betterend.diamond_hammer": "钻石匠锤", + "item.betterend.netherite_hammer": "下届åˆé‡‘匠锤", + + "effect.betterend.end_veil": "末地é¢å…·", + "enchantment.betterend.end_veil": "末地é¢å…·", + "item.minecraft.potion.effect.end_veil": "末地é¢å…·è¯æ°´", + "item.minecraft.potion.effect.long_end_veil": "末地é¢å…·è¯æ°´", + "item.minecraft.splash_potion.effect.end_veil": "喷溅型末地é¢å…·è¯æ°´", + "item.minecraft.splash_potion.effect.long_end_veil": "喷溅型末地é¢å…·è¯æ°´", + "item.minecraft.lingering_potion.effect.end_veil": "滞留型末地é¢å…·è¯æ°´", + "item.minecraft.lingering_potion.effect.long_end_veil": "滞留型末地é¢å…·è¯æ°´", + "item.minecraft.tipped_arrow.effect.end_veil": "末地é¢å…·ä¹‹ç®­", + "item.minecraft.tipped_arrow.effect.long_end_veil": "末地é¢å…·ä¹‹ç®­", + + "block.betterend.mossy_glowshroom_sapling": "苔光è‡ç§å­", + "block.betterend.mossy_glowshroom_cap": "苔光è‡èŒç›–", + "block.betterend.mossy_glowshroom_fur": "苔光è‡èŒç»’", + "block.betterend.mossy_glowshroom_hymenophore": "苔光è‡èŒè¤¶", + "block.betterend.mossy_glowshroom_bark": "苔光è‡èŒæœ¨", + "block.betterend.mossy_glowshroom_barrel": "苔光è‡æœ¨æ¡¶", + "block.betterend.mossy_glowshroom_button": "苔光è‡æŒ‰é’®", + "block.betterend.mossy_glowshroom_chest": "苔光è‡æœ¨ç®±", + "block.betterend.mossy_glowshroom_crafting_table": "苔光è‡å·¥ä½œå°", + "block.betterend.mossy_glowshroom_door": "苔光è‡æœ¨é—¨", + "block.betterend.mossy_glowshroom_fence": "苔光è‡æœ¨æ …æ ", + "block.betterend.mossy_glowshroom_gate": "苔光è‡æœ¨æ …æ é—¨", + "block.betterend.mossy_glowshroom_ladder": "苔光è‡æœ¨æ¢¯", + "block.betterend.mossy_glowshroom_log": "苔光è‡åŽŸæœ¨", + "block.betterend.mossy_glowshroom_planks": "苔光è‡æœ¨æ¿", + "block.betterend.mossy_glowshroom_plate": "苔光è‡åŽ‹åŠ›æ¿", + "block.betterend.mossy_glowshroom_sign": "苔光è‡å‘Šç¤ºç‰Œ", + "block.betterend.mossy_glowshroom_slab": "苔光è‡å°é˜¶", + "block.betterend.mossy_glowshroom_stairs": "苔光è‡æ¥¼æ¢¯", + "block.betterend.mossy_glowshroom_stripped_bark": "去皮苔光è‡èŒæœ¨", + "block.betterend.mossy_glowshroom_stripped_log": "去皮苔光è‡åŽŸæœ¨", + "block.betterend.mossy_glowshroom_trapdoor": "苔光è‡æ´»æ¿é—¨", + + "block.betterend.umbrella_moss": "伞状苔藓", + "block.betterend.umbrella_moss_tall": "高伞状苔藓", + "block.betterend.creeping_moss": "åŒåŒè‹”è—“", + + "block.betterend.blue_vine_seed": "è“è—¤ç§å­", + "block.betterend.blue_vine": "è“è—¤", + "block.betterend.blue_vine_lantern": "è“è—¤ç¯", + "block.betterend.blue_vine_fur": "è“è—¤èŒæ¯›", + + "block.betterend.dense_vine": "茂密藤蔓", + "block.betterend.bubble_coral": "气泡çŠç‘š", + "block.betterend.aurora_crystal": "æžå…‰æ°´æ™¶", + + "category.rei.damage.amount&dmg": "工具伤害：%s", + + "block.betterend.pythadendron_bark": "å’唱木树皮", + "block.betterend.pythadendron_barrel": "å’唱木桶", + "block.betterend.pythadendron_button": "å’唱木按钮", + "block.betterend.pythadendron_chest": "å’唱木箱å­", + "block.betterend.pythadendron_crafting_table": "å’唱木工作å°", + "block.betterend.pythadendron_door": "å’唱木门", + "block.betterend.pythadendron_fence": "å’唱木栅æ ", + "block.betterend.pythadendron_gate": "å’唱木栅æ é—¨", + "block.betterend.pythadendron_ladder": "å’唱木梯", + "block.betterend.pythadendron_log": "å’唱木原木", + "block.betterend.pythadendron_planks": "å’唱木æ¿", + "block.betterend.pythadendron_plate": "å’唱木压力æ¿", + "block.betterend.pythadendron_sign": "å’唱木告示牌", + "block.betterend.pythadendron_slab": "å’唱木å°é˜¶", + "block.betterend.pythadendron_stairs": "å’唱木楼梯", + "block.betterend.pythadendron_stripped_bark": "去皮å’唱木树皮", + "block.betterend.pythadendron_stripped_log": "去皮å’唱木原木", + "block.betterend.pythadendron_trapdoor": "å’唱木活æ¿é—¨", + + "block.betterend.chorus_nylium": "å’å”±èŒå²©", + "block.betterend.chorus_nylium_path": "å’å”±èŒå²©å¾„", + "block.betterend.chorus_grass": "å’å”±èŒè‰", + + "block.betterend.end_lily": "末地ç¡èŽ²", + "block.betterend.end_lily_seed": "末地ç¡èŽ²ç§å­", + "item.betterend.end_lily_leaf": "末地ç¡èŽ²å¶å­", + "item.betterend.end_lily_leaf_dried": "末地ç¡èŽ²æž¯å¶", + + "block.betterend.violecite": "紫罗兰石", + "block.betterend.violecite_bricks": "紫罗兰石砖", + "block.betterend.violecite_bricks_slab": "紫罗兰石砖å°é˜¶", + "block.betterend.violecite_bricks_stairs": "紫罗兰石砖楼梯", + "block.betterend.violecite_bricks_wall": "紫罗兰石砖墙", + "block.betterend.violecite_button": "紫罗兰石按钮", + "block.betterend.violecite_pillar": "紫罗兰石柱", + "block.betterend.violecite_plate": "紫罗兰石压力æ¿", + "block.betterend.violecite_slab": "紫罗兰石å°é˜¶", + "block.betterend.violecite_tiles": "紫罗兰石瓷砖", + "block.betterend.violecite_stairs": "紫罗兰石楼梯", + "block.betterend.violecite_polished": "磨制紫罗兰石", + "block.betterend.violecite_wall": "紫罗兰石墙", + + "block.betterend.flavolite": "香料石", + "block.betterend.flavolite_bricks": "香料石砖", + "block.betterend.flavolite_bricks_slab": "香料石砖å°é˜¶", + "block.betterend.flavolite_bricks_stairs": "香料石砖楼梯", + "block.betterend.flavolite_bricks_wall": "香料石砖墙", + "block.betterend.flavolite_button": "香料石按钮", + "block.betterend.flavolite_pillar": "香料石柱", + "block.betterend.flavolite_plate": "香料石压力æ¿", + "block.betterend.flavolite_slab": "香料石å°é˜¶", + "block.betterend.flavolite_tiles": "香料石瓷砖", + "block.betterend.flavolite_stairs": "香料石楼梯", + "block.betterend.flavolite_polished": "磨制香料石", + "block.betterend.flavolite_wall": "香料石墙" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/aurora_crystal.json b/src/main/resources/assets/betterend/materialmaps/block/aurora_crystal.json index c2b812b6..a72e6e79 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/aurora_crystal.json +++ b/src/main/resources/assets/betterend/materialmaps/block/aurora_crystal.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:glow_all" -} +{ + "defaultMaterial": "betterend:glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/blue_vine_fur.json b/src/main/resources/assets/betterend/materialmaps/block/blue_vine_fur.json index 1bda5144..f50cc590 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/blue_vine_fur.json +++ b/src/main/resources/assets/betterend/materialmaps/block/blue_vine_fur.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:waving_wall_glow_all" -} +{ + "defaultMaterial": "betterend:waving_wall_glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/blue_vine_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/blue_vine_lantern.json index c2b812b6..a72e6e79 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/blue_vine_lantern.json +++ b/src/main/resources/assets/betterend/materialmaps/block/blue_vine_lantern.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:glow_all" -} +{ + "defaultMaterial": "betterend:glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json b/src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json index a016044a..3201413f 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json +++ b/src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:noao" -} +{ + "defaultMaterial": "betterend:noao" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/creeping_moss.json b/src/main/resources/assets/betterend/materialmaps/block/creeping_moss.json index 1701827c..3b73d687 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/creeping_moss.json +++ b/src/main/resources/assets/betterend/materialmaps/block/creeping_moss.json @@ -1,14 +1,14 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "betterend:block/creeping_moss_spores", - "material": "betterend:wave_glow_50_half" - }, - { - "sprite": "betterend:block/creeping_moss_leaves", - "material": "betterend:waving_floor" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/creeping_moss_spores", + "material": "betterend:wave_glow_50_half" + }, + { + "sprite": "betterend:block/creeping_moss_leaves", + "material": "betterend:waving_floor" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json b/src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json index 27167c02..1cc4c628 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json +++ b/src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:waving_wall_glow_inc" -} +{ + "defaultMaterial": "betterend:waving_wall_glow_inc" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/dense_vine.json b/src/main/resources/assets/betterend/materialmaps/block/dense_vine.json index 966e25dd..3b66a139 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/dense_vine.json +++ b/src/main/resources/assets/betterend/materialmaps/block/dense_vine.json @@ -1,14 +1,14 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "betterend:block/dense_vine_bottom", - "material": "betterend:wave_glow_50_half" - }, - { - "sprite": "betterend:block/dense_vine", - "material": "betterend:waving" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/dense_vine_bottom", + "material": "betterend:wave_glow_50_half" + }, + { + "sprite": "betterend:block/dense_vine", + "material": "betterend:waving" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/end_lily.json b/src/main/resources/assets/betterend/materialmaps/block/end_lily.json index a4fb010b..b3dc124f 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/end_lily.json +++ b/src/main/resources/assets/betterend/materialmaps/block/end_lily.json @@ -1,14 +1,14 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "betterend:block/end_lily_flower", - "material": "betterend:glow_inc" - }, - { - "sprite": "betterend:block/end_lily_flower_small", - "material": "betterend:glow_inc" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/end_lily_flower", + "material": "betterend:glow_inc" + }, + { + "sprite": "betterend:block/end_lily_flower_small", + "material": "betterend:glow_inc" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/flavolite_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/flavolite_lantern.json new file mode 100644 index 00000000..31a6585c --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/flavolite_lantern.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/aurora_crystal", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/lantern_end_stone.json b/src/main/resources/assets/betterend/materialmaps/block/lantern_end_stone.json new file mode 100644 index 00000000..31a6585c --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/lantern_end_stone.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/aurora_crystal", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_fur.json b/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_fur.json index 8fbc8eb6..5879aa38 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_fur.json +++ b/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_fur.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:waving_wall_inverted_glow_all" -} +{ + "defaultMaterial": "betterend:waving_wall_inverted_glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_hymenophore.json b/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_hymenophore.json index c2b812b6..a72e6e79 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_hymenophore.json +++ b/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_hymenophore.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:glow_all" -} +{ + "defaultMaterial": "betterend:glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_sapling.json b/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_sapling.json index 03b96547..83329294 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_sapling.json +++ b/src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_sapling.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:waving_floor_glow_50_blue" -} +{ + "defaultMaterial": "betterend:waving_floor_glow_50_blue" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/tail_moss.json b/src/main/resources/assets/betterend/materialmaps/block/tail_moss.json index 8161d329..45210670 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/tail_moss.json +++ b/src/main/resources/assets/betterend/materialmaps/block/tail_moss.json @@ -1,3 +1,3 @@ -{ - "defaultMaterial": "betterend:waving_wall" -} +{ + "defaultMaterial": "betterend:waving_wall" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/umbrella_moss.json b/src/main/resources/assets/betterend/materialmaps/block/umbrella_moss.json index d80e90a5..ce5ae008 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/umbrella_moss.json +++ b/src/main/resources/assets/betterend/materialmaps/block/umbrella_moss.json @@ -1,22 +1,22 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "betterend:block/umbrella_moss_sporophyte", - "material": "betterend:wave_glow_all" - }, - { - "sprite": "betterend:block/umbrella_moss_small", - "material": "betterend:waving_floor" - }, - { - "sprite": "betterend:block/umbrella_moss_up", - "material": "betterend:waving_floor" - }, - { - "sprite": "betterend:block/umbrella_moss_end", - "material": "betterend:waving_floor" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/umbrella_moss_sporophyte", + "material": "betterend:wave_glow_all" + }, + { + "sprite": "betterend:block/umbrella_moss_small", + "material": "betterend:waving_floor" + }, + { + "sprite": "betterend:block/umbrella_moss_up", + "material": "betterend:waving_floor" + }, + { + "sprite": "betterend:block/umbrella_moss_end", + "material": "betterend:waving_floor" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/umbrella_moss_tall.json b/src/main/resources/assets/betterend/materialmaps/block/umbrella_moss_tall.json index c729b4d8..60f98759 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/umbrella_moss_tall.json +++ b/src/main/resources/assets/betterend/materialmaps/block/umbrella_moss_tall.json @@ -1,22 +1,22 @@ -{ - "defaultMap": { - "spriteMap": [ - { - "sprite": "betterend:block/umbrella_moss_sporophyte", - "material": "betterend:wave_glow_all" - }, - { - "sprite": "betterend:block/umbrella_moss_up", - "material": "betterend:waving" - }, - { - "sprite": "betterend:block/umbrella_moss_end", - "material": "betterend:waving" - }, - { - "sprite": "betterend:block/umbrella_moss_bottom", - "material": "betterend:waving_floor" - } - ] - } +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/umbrella_moss_sporophyte", + "material": "betterend:wave_glow_all" + }, + { + "sprite": "betterend:block/umbrella_moss_up", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/umbrella_moss_end", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/umbrella_moss_bottom", + "material": "betterend:waving_floor" + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/violecite_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/violecite_lantern.json new file mode 100644 index 00000000..31a6585c --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/violecite_lantern.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/aurora_crystal", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/particle/glowing_sphere.json b/src/main/resources/assets/betterend/materialmaps/particle/glowing_sphere.json index 9ddcf936..ab909d8e 100644 --- a/src/main/resources/assets/betterend/materialmaps/particle/glowing_sphere.json +++ b/src/main/resources/assets/betterend/materialmaps/particle/glowing_sphere.json @@ -1,3 +1,3 @@ -{ - "material": "canvas:emissive_no_diffuse" +{ + "material": "canvas:emissive_no_diffuse" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/particle/portal_sphere.json b/src/main/resources/assets/betterend/materialmaps/particle/portal_sphere.json index 9ddcf936..ab909d8e 100644 --- a/src/main/resources/assets/betterend/materialmaps/particle/portal_sphere.json +++ b/src/main/resources/assets/betterend/materialmaps/particle/portal_sphere.json @@ -1,3 +1,3 @@ -{ - "material": "canvas:emissive_no_diffuse" +{ + "material": "canvas:emissive_no_diffuse" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materials/glow_10.json b/src/main/resources/assets/betterend/materials/glow_10.json index b7e484ad..c7c0f142 100644 --- a/src/main/resources/assets/betterend/materials/glow_10.json +++ b/src/main/resources/assets/betterend/materials/glow_10.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_10.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_10.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/glow_20_half.json b/src/main/resources/assets/betterend/materials/glow_20_half.json index 3ed9bf23..6de3bccb 100644 --- a/src/main/resources/assets/betterend/materials/glow_20_half.json +++ b/src/main/resources/assets/betterend/materials/glow_20_half.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_20_half.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_20_half.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/glow_33.json b/src/main/resources/assets/betterend/materials/glow_33.json index f46cadaa..c31eb737 100644 --- a/src/main/resources/assets/betterend/materials/glow_33.json +++ b/src/main/resources/assets/betterend/materials/glow_33.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_33.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_33.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/glow_50.json b/src/main/resources/assets/betterend/materials/glow_50.json index 51c1620a..93f884b2 100644 --- a/src/main/resources/assets/betterend/materials/glow_50.json +++ b/src/main/resources/assets/betterend/materials/glow_50.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_50.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_50.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/glow_50_half.json b/src/main/resources/assets/betterend/materials/glow_50_half.json index bbc2233f..880543c3 100644 --- a/src/main/resources/assets/betterend/materials/glow_50_half.json +++ b/src/main/resources/assets/betterend/materials/glow_50_half.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_50_half.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_50_half.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/glow_all.json b/src/main/resources/assets/betterend/materials/glow_all.json index 7bc59ca7..e4c41e04 100644 --- a/src/main/resources/assets/betterend/materials/glow_all.json +++ b/src/main/resources/assets/betterend/materials/glow_all.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_all.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_all.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/glow_all_half.json b/src/main/resources/assets/betterend/materials/glow_all_half.json index 24cbf346..791dc1ce 100644 --- a/src/main/resources/assets/betterend/materials/glow_all_half.json +++ b/src/main/resources/assets/betterend/materials/glow_all_half.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_all_half.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_all_half.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/glow_inc.json b/src/main/resources/assets/betterend/materials/glow_inc.json index bbb22a51..7862979c 100644 --- a/src/main/resources/assets/betterend/materials/glow_inc.json +++ b/src/main/resources/assets/betterend/materials/glow_inc.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_inc.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_inc.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/glow_transparent.json b/src/main/resources/assets/betterend/materials/glow_transparent.json index e2711368..220edc02 100644 --- a/src/main/resources/assets/betterend/materials/glow_transparent.json +++ b/src/main/resources/assets/betterend/materials/glow_transparent.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "betterend:shaders/material/glow_transparent.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "betterend:shaders/material/glow_transparent.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/large_wave_glow_50_half.json b/src/main/resources/assets/betterend/materials/large_wave_glow_50_half.json index df4d43d6..3e270dbf 100644 --- a/src/main/resources/assets/betterend/materials/large_wave_glow_50_half.json +++ b/src/main/resources/assets/betterend/materials/large_wave_glow_50_half.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave_large.vert", - "fragmentSource": "betterend:shaders/material/glow_50_half.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave_large.vert", + "fragmentSource": "betterend:shaders/material/glow_50_half.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/large_wave_glow_inc.json b/src/main/resources/assets/betterend/materials/large_wave_glow_inc.json index 1fd992b1..75324c11 100644 --- a/src/main/resources/assets/betterend/materials/large_wave_glow_inc.json +++ b/src/main/resources/assets/betterend/materials/large_wave_glow_inc.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave_large.vert", - "fragmentSource": "betterend:shaders/material/glow_inc.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave_large.vert", + "fragmentSource": "betterend:shaders/material/glow_inc.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/noao.json b/src/main/resources/assets/betterend/materials/noao.json index 7652d030..7681e741 100644 --- a/src/main/resources/assets/betterend/materials/noao.json +++ b/src/main/resources/assets/betterend/materials/noao.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "canvas:shaders/material/default.frag", - "disableAo": false, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "canvas:shaders/material/default.frag", + "disableAo": false, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/noshade.json b/src/main/resources/assets/betterend/materials/noshade.json index ffc32c09..258d1a61 100644 --- a/src/main/resources/assets/betterend/materials/noshade.json +++ b/src/main/resources/assets/betterend/materials/noshade.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "canvas:shaders/material/default.vert", - "fragmentSource": "canvas:shaders/material/default.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "canvas:shaders/material/default.vert", + "fragmentSource": "canvas:shaders/material/default.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/offset_floor.json b/src/main/resources/assets/betterend/materials/offset_floor.json index 4e6bf34e..bcd03f29 100644 --- a/src/main/resources/assets/betterend/materials/offset_floor.json +++ b/src/main/resources/assets/betterend/materials/offset_floor.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/offset_floor.vert", - "fragmentSource": "canvas:shaders/material/default.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/offset_floor.vert", + "fragmentSource": "canvas:shaders/material/default.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/small_wave_glow_50_half.json b/src/main/resources/assets/betterend/materials/small_wave_glow_50_half.json index ecf415e6..6bf358c7 100644 --- a/src/main/resources/assets/betterend/materials/small_wave_glow_50_half.json +++ b/src/main/resources/assets/betterend/materials/small_wave_glow_50_half.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/small_wave.vert", - "fragmentSource": "betterend:shaders/material/glow_50_half.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/small_wave.vert", + "fragmentSource": "betterend:shaders/material/glow_50_half.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/wave_glow_33.json b/src/main/resources/assets/betterend/materials/wave_glow_33.json index df18184f..18e471c0 100644 --- a/src/main/resources/assets/betterend/materials/wave_glow_33.json +++ b/src/main/resources/assets/betterend/materials/wave_glow_33.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave.vert", - "fragmentSource": "betterend:shaders/material/glow_33.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave.vert", + "fragmentSource": "betterend:shaders/material/glow_33.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/wave_glow_33_half.json b/src/main/resources/assets/betterend/materials/wave_glow_33_half.json index c40b5f6a..bb80fa5c 100644 --- a/src/main/resources/assets/betterend/materials/wave_glow_33_half.json +++ b/src/main/resources/assets/betterend/materials/wave_glow_33_half.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave.vert", - "fragmentSource": "betterend:shaders/material/glow_33_half.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave.vert", + "fragmentSource": "betterend:shaders/material/glow_33_half.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/wave_glow_50_half.json b/src/main/resources/assets/betterend/materials/wave_glow_50_half.json index ac6d5690..71c5ba12 100644 --- a/src/main/resources/assets/betterend/materials/wave_glow_50_half.json +++ b/src/main/resources/assets/betterend/materials/wave_glow_50_half.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave.vert", - "fragmentSource": "betterend:shaders/material/glow_50_half.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave.vert", + "fragmentSource": "betterend:shaders/material/glow_50_half.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/wave_glow_all.json b/src/main/resources/assets/betterend/materials/wave_glow_all.json index 819681c0..b5483e3c 100644 --- a/src/main/resources/assets/betterend/materials/wave_glow_all.json +++ b/src/main/resources/assets/betterend/materials/wave_glow_all.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave.vert", - "fragmentSource": "betterend:shaders/material/glow_all.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave.vert", + "fragmentSource": "betterend:shaders/material/glow_all.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/wave_glow_inc.json b/src/main/resources/assets/betterend/materials/wave_glow_inc.json index e3c2b735..27dea5e5 100644 --- a/src/main/resources/assets/betterend/materials/wave_glow_inc.json +++ b/src/main/resources/assets/betterend/materials/wave_glow_inc.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave.vert", - "fragmentSource": "betterend:shaders/material/glow_inc.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave.vert", + "fragmentSource": "betterend:shaders/material/glow_inc.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving.json b/src/main/resources/assets/betterend/materials/waving.json index 71f35bb3..f717541e 100644 --- a/src/main/resources/assets/betterend/materials/waving.json +++ b/src/main/resources/assets/betterend/materials/waving.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave.vert", - "fragmentSource": "canvas:shaders/material/default.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave.vert", + "fragmentSource": "canvas:shaders/material/default.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_floor.json b/src/main/resources/assets/betterend/materials/waving_floor.json index 5f325724..760ef3d7 100644 --- a/src/main/resources/assets/betterend/materials/waving_floor.json +++ b/src/main/resources/assets/betterend/materials/waving_floor.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave_floor.vert", - "fragmentSource": "canvas:shaders/material/default.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave_floor.vert", + "fragmentSource": "canvas:shaders/material/default.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_floor_glow_50.json b/src/main/resources/assets/betterend/materials/waving_floor_glow_50.json index b8328abe..d8dae14e 100644 --- a/src/main/resources/assets/betterend/materials/waving_floor_glow_50.json +++ b/src/main/resources/assets/betterend/materials/waving_floor_glow_50.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave_floor.vert", - "fragmentSource": "betterend:shaders/material/glow_50.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave_floor.vert", + "fragmentSource": "betterend:shaders/material/glow_50.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_floor_glow_50_blue.json b/src/main/resources/assets/betterend/materials/waving_floor_glow_50_blue.json index cc617620..1eeb1425 100644 --- a/src/main/resources/assets/betterend/materials/waving_floor_glow_50_blue.json +++ b/src/main/resources/assets/betterend/materials/waving_floor_glow_50_blue.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave_floor.vert", - "fragmentSource": "betterend:shaders/material/glow_50_blue.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave_floor.vert", + "fragmentSource": "betterend:shaders/material/glow_50_blue.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_large.json b/src/main/resources/assets/betterend/materials/waving_large.json index 3750a965..9188cd82 100644 --- a/src/main/resources/assets/betterend/materials/waving_large.json +++ b/src/main/resources/assets/betterend/materials/waving_large.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wave_large.vert", - "fragmentSource": "canvas:shaders/material/default.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave_large.vert", + "fragmentSource": "canvas:shaders/material/default.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_small.json b/src/main/resources/assets/betterend/materials/waving_small.json index 19a9696e..a87df6ab 100644 --- a/src/main/resources/assets/betterend/materials/waving_small.json +++ b/src/main/resources/assets/betterend/materials/waving_small.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/small_wave.vert", - "fragmentSource": "canvas:shaders/material/default.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/small_wave.vert", + "fragmentSource": "canvas:shaders/material/default.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_wall.json b/src/main/resources/assets/betterend/materials/waving_wall.json index 41d94a37..02cc16ab 100644 --- a/src/main/resources/assets/betterend/materials/waving_wall.json +++ b/src/main/resources/assets/betterend/materials/waving_wall.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wall_wave.vert", - "fragmentSource": "canvas:shaders/material/default.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wall_wave.vert", + "fragmentSource": "canvas:shaders/material/default.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_wall_glow_all.json b/src/main/resources/assets/betterend/materials/waving_wall_glow_all.json index 5133fbe8..d483600f 100644 --- a/src/main/resources/assets/betterend/materials/waving_wall_glow_all.json +++ b/src/main/resources/assets/betterend/materials/waving_wall_glow_all.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wall_wave.vert", - "fragmentSource": "betterend:shaders/material/glow_all.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wall_wave.vert", + "fragmentSource": "betterend:shaders/material/glow_all.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/materials/waving_wall_inverted_glow_all.json b/src/main/resources/assets/betterend/materials/waving_wall_inverted_glow_all.json index 1c7e9cbc..ce179e09 100644 --- a/src/main/resources/assets/betterend/materials/waving_wall_inverted_glow_all.json +++ b/src/main/resources/assets/betterend/materials/waving_wall_inverted_glow_all.json @@ -1,10 +1,10 @@ -{ - "layers": [ - { - "vertexSource": "betterend:shaders/material/wall_wave_inverted.vert", - "fragmentSource": "betterend:shaders/material/glow_all.frag", - "disableAo": true, - "disableDiffuse": true - } - ] -} +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wall_wave_inverted.vert", + "fragmentSource": "betterend:shaders/material/glow_all.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/aurora_crystal.json b/src/main/resources/assets/betterend/models/block/aurora_crystal.json index 120e8d23..5e6e8690 100644 --- a/src/main/resources/assets/betterend/models/block/aurora_crystal.json +++ b/src/main/resources/assets/betterend/models/block/aurora_crystal.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/tint_cube_noshade", - "textures": { - "texture": "betterend:block/aurora_crystal" - } +{ + "parent": "betterend:block/tint_cube_noshade", + "textures": { + "texture": "betterend:block/aurora_crystal" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/aurora_crystal_2.json b/src/main/resources/assets/betterend/models/block/aurora_crystal_2.json index c7b29818..e0a91b63 100644 --- a/src/main/resources/assets/betterend/models/block/aurora_crystal_2.json +++ b/src/main/resources/assets/betterend/models/block/aurora_crystal_2.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/tint_cube_noshade", - "textures": { - "texture": "betterend:block/aurora_crystal_2" - } +{ + "parent": "betterend:block/tint_cube_noshade", + "textures": { + "texture": "betterend:block/aurora_crystal_2" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine.json b/src/main/resources/assets/betterend/models/block/blue_vine.json index 4bdc7a03..915b1a4c 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/blue_vine" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/blue_vine" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine_fur.json b/src/main/resources/assets/betterend/models/block/blue_vine_fur.json index 086382f8..ca0adbd4 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine_fur.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine_fur.json @@ -1,120 +1,120 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/blue_vine_fur", - "texture": "betterend:block/blue_vine_fur", - "spore": "betterend:block/blue_vine_fur" - }, - "elements": [ - { - "__comment": "PlaneY1", - "from": [ 0, -0.001, -10 ], - "to": [ 16, 0, 6 ], - "rotation": { "origin": [ 0, 0, 6 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, 0, 10 ], - "to": [ 16, 0.001, 26 ], - "rotation": { "origin": [ 0, 0, 10 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY4", - "from": [ 10, -0.001, 0 ], - "to": [ 26, 0, 16 ], - "rotation": { "origin": [ 10, 0, 16 ], "axis": "z", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneY4", - "from": [ -10, 0, 2 ], - "to": [ 6, 0.001, 18 ], - "rotation": { "origin": [ 6, 0, 18 ], "axis": "z", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneX6", - "from": [ 0, 0, -6.5 ], - "to": [ 0.001, 16, 16 ], - "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX6", - "from": [ -6.5, 0, 15.999 ], - "to": [ 16, 16, 16 ], - "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, -0.001, -9 ], - "to": [ 16, 0, 7 ], - "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, 0, 9 ], - "to": [ 16, 0.001, 25 ], - "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY4", - "from": [ 9, -0.001, 0 ], - "to": [ 25, 0, 16 ], - "rotation": { "origin": [ 9, 0, 16 ], "axis": "z", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneY4", - "from": [ -9, 0, 2 ], - "to": [ 7, 0.001, 18 ], - "rotation": { "origin": [ 7, 0, 18 ], "axis": "z", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/blue_vine_fur", + "texture": "betterend:block/blue_vine_fur", + "spore": "betterend:block/blue_vine_fur" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -10 ], + "to": [ 16, 0, 6 ], + "rotation": { "origin": [ 0, 0, 6 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 10 ], + "to": [ 16, 0.001, 26 ], + "rotation": { "origin": [ 0, 0, 10 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 10, -0.001, 0 ], + "to": [ 26, 0, 16 ], + "rotation": { "origin": [ 10, 0, 16 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -10, 0, 2 ], + "to": [ 6, 0.001, 18 ], + "rotation": { "origin": [ 6, 0, 18 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneX6", + "from": [ 0, 0, -6.5 ], + "to": [ 0.001, 16, 16 ], + "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX6", + "from": [ -6.5, 0, 15.999 ], + "to": [ 16, 16, 16 ], + "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -9 ], + "to": [ 16, 0, 7 ], + "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 9 ], + "to": [ 16, 0.001, 25 ], + "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 9, -0.001, 0 ], + "to": [ 25, 0, 16 ], + "rotation": { "origin": [ 9, 0, 16 ], "axis": "z", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -9, 0, 2 ], + "to": [ 7, 0.001, 18 ], + "rotation": { "origin": [ 7, 0, 18 ], "axis": "z", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine_fur_wall.json b/src/main/resources/assets/betterend/models/block/blue_vine_fur_wall.json index cf9d222f..8fdadbfe 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine_fur_wall.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine_fur_wall.json @@ -1,64 +1,64 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/blue_vine_fur", - "texture": "betterend:block/blue_vine_fur" - }, - "elements": [ - { - "__comment": "PlaneY1", - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 0.001 ], - "rotation": { "origin": [ 0, 16, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, -3, 0 ], - "to": [ 16, 13, 0.001 ], - "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture" }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, -8, 0 ], - "to": [ 16, 8, 0.001 ], - "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ -2, -12, 0 ], - "to": [ 14, 4, 0.001 ], - "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture" }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 3, -15, 0 ], - "to": [ 19, 1, 0.001 ], - "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/blue_vine_fur", + "texture": "betterend:block/blue_vine_fur" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 0.001 ], + "rotation": { "origin": [ 0, 16, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -3, 0 ], + "to": [ 16, 13, 0.001 ], + "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -8, 0 ], + "to": [ 16, 8, 0.001 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, -12, 0 ], + "to": [ 14, 4, 0.001 ], + "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 3, -15, 0 ], + "to": [ 19, 1, 0.001 ], + "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine_roots.json b/src/main/resources/assets/betterend/models/block/blue_vine_roots.json index 0df8affc..a2093fef 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine_roots.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine_roots.json @@ -1,76 +1,76 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/blue_vine", - "texture": "betterend:block/blue_vine", - "roots": "betterend:block/blue_vine_roots" - }, - "elements": [ - { - "__comment": "PlaneX1", - "from": [ 2.375, 0, 2.25 ], - "to": [ 2.376, 16, 18.25 ], - "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX1", - "from": [ 13.75, 0, 2.25 ], - "to": [ 13.751, 16, 18.25 ], - "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 5, 0, 0.5 ], - "to": [ 5.001, 16, 16.5 ], - "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 11 ], - "to": [ 16.5, 16, 11.001 ], - "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 11, 0, 0.5 ], - "to": [ 11.001, 16, 16.5 ], - "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 5 ], - "to": [ 16.5, 16, 5.001 ], - "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/blue_vine", + "texture": "betterend:block/blue_vine", + "roots": "betterend:block/blue_vine_roots" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 0.5 ], + "to": [ 5.001, 16, 16.5 ], + "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 11 ], + "to": [ 16.5, 16, 11.001 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 16, 16.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 5 ], + "to": [ 16.5, 16, 5.001 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine_seed_0.json b/src/main/resources/assets/betterend/models/block/blue_vine_seed_0.json index 19c0e477..4d8135e6 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine_seed_0.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine_seed_0.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/blue_vine_0" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/blue_vine_0" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine_seed_1.json b/src/main/resources/assets/betterend/models/block/blue_vine_seed_1.json index d702300d..a23c592d 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine_seed_1.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine_seed_1.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/blue_vine_1" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/blue_vine_1" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine_seed_2.json b/src/main/resources/assets/betterend/models/block/blue_vine_seed_2.json index 2c38fe55..e098b6be 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine_seed_2.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine_seed_2.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/blue_vine_2" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/blue_vine_2" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine_seed_3.json b/src/main/resources/assets/betterend/models/block/blue_vine_seed_3.json index 78a23f65..ea8ded1c 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine_seed_3.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine_seed_3.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/blue_vine_3" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/blue_vine_3" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/blue_vine_top.json b/src/main/resources/assets/betterend/models/block/blue_vine_top.json index be895b06..64eec639 100644 --- a/src/main/resources/assets/betterend/models/block/blue_vine_top.json +++ b/src/main/resources/assets/betterend/models/block/blue_vine_top.json @@ -1,76 +1,76 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/blue_vine", - "texture": "betterend:block/blue_vine", - "roots": "betterend:block/blue_vine_roots" - }, - "elements": [ - { - "__comment": "PlaneX1", - "from": [ 2.375, 0, 2.25 ], - "to": [ 2.376, 16, 18.25 ], - "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX1", - "from": [ 13.75, 0, 2.25 ], - "to": [ 13.751, 16, 18.25 ], - "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 5, 0, 0.5 ], - "to": [ 5.001, 16, 16.5 ], - "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, - "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 11 ], - "to": [ 16.5, 16, 11.001 ], - "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, - "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 11, 0, 0.5 ], - "to": [ 11.001, 16, 16.5 ], - "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, - "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 5 ], - "to": [ 16.5, 16, 5.001 ], - "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, - "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/blue_vine", + "texture": "betterend:block/blue_vine", + "roots": "betterend:block/blue_vine_roots" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 0.5 ], + "to": [ 5.001, 16, 16.5 ], + "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 11 ], + "to": [ 16.5, 16, 11.001 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 16, 16.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 5 ], + "to": [ 16.5, 16, 5.001 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bubble_coral_1.json b/src/main/resources/assets/betterend/models/block/bubble_coral_1.json index 2ba9ef71..53ab03d0 100644 --- a/src/main/resources/assets/betterend/models/block/bubble_coral_1.json +++ b/src/main/resources/assets/betterend/models/block/bubble_coral_1.json @@ -1,127 +1,127 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/bubble_coral", - "texture": "betterend:block/bubble_coral" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 4, 0, 2 ], - "to": [ 9, 10, 7 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10, 0, 5 ], - "to": [ 14, 7, 9 ], - "faces": { - "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, - "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 4, 0, 8 ], - "to": [ 9, 8, 13 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 0, 0, 5 ], - "to": [ 3, 5, 8 ], - "faces": { - "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "north": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 0, 0, 12 ], - "to": [ 3, 5, 15 ], - "faces": { - "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 12, 0, 10 ], - "to": [ 15, 5, 13 ], - "faces": { - "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 12, 0, 1 ], - "to": [ 14, 4, 3 ], - "faces": { - "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 0, 1 ], - "to": [ 3, 4, 3 ], - "faces": { - "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, - "south": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, - "west": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 9, 0, 14 ], - "to": [ 11, 4, 16 ], - "faces": { - "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/bubble_coral", + "texture": "betterend:block/bubble_coral" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 0, 2 ], + "to": [ 9, 10, 7 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 5 ], + "to": [ 14, 7, 9 ], + "faces": { + "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 0, 8 ], + "to": [ 9, 8, 13 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 0, 5 ], + "to": [ 3, 5, 8 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, + "west": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 0, 12 ], + "to": [ 3, 5, 15 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 12, 0, 10 ], + "to": [ 15, 5, 13 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 12, 0, 1 ], + "to": [ 14, 4, 3 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 0, 1 ], + "to": [ 3, 4, 3 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 0, 14 ], + "to": [ 11, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bubble_coral_2.json b/src/main/resources/assets/betterend/models/block/bubble_coral_2.json index e612d83e..eeb1e1fd 100644 --- a/src/main/resources/assets/betterend/models/block/bubble_coral_2.json +++ b/src/main/resources/assets/betterend/models/block/bubble_coral_2.json @@ -1,100 +1,100 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/bubble_coral", - "texture": "betterend:block/bubble_coral" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 2, 0, 1 ], - "to": [ 7, 10, 6 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10, 0, 2 ], - "to": [ 14, 7, 6 ], - "faces": { - "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, - "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 6, 0, 8 ], - "to": [ 11, 8, 13 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 0, 8 ], - "to": [ 5, 5, 11 ], - "faces": { - "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 12, 0, 12 ], - "to": [ 15, 5, 15 ], - "faces": { - "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 13, 0, 8 ], - "to": [ 15, 4, 10 ], - "faces": { - "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 3, 0, 13 ], - "to": [ 5, 4, 15 ], - "faces": { - "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/bubble_coral", + "texture": "betterend:block/bubble_coral" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, 0, 1 ], + "to": [ 7, 10, 6 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 2 ], + "to": [ 14, 7, 6 ], + "faces": { + "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6, 0, 8 ], + "to": [ 11, 8, 13 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 0, 8 ], + "to": [ 5, 5, 11 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 12, 0, 12 ], + "to": [ 15, 5, 15 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 13, 0, 8 ], + "to": [ 15, 4, 10 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 13 ], + "to": [ 5, 4, 15 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bubble_coral_3.json b/src/main/resources/assets/betterend/models/block/bubble_coral_3.json index ec33fe42..b023ca3d 100644 --- a/src/main/resources/assets/betterend/models/block/bubble_coral_3.json +++ b/src/main/resources/assets/betterend/models/block/bubble_coral_3.json @@ -1,100 +1,100 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/bubble_coral", - "texture": "betterend:block/bubble_coral" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 3, 0, 1 ], - "to": [ 8, 10, 6 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10, 0, 11 ], - "to": [ 14, 7, 15 ], - "faces": { - "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, - "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 3, 0, 8 ], - "to": [ 8, 8, 13 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 11, 0, 1 ], - "to": [ 14, 5, 4 ], - "faces": { - "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, - "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 0, 14 ], - "to": [ 3, 4, 16 ], - "faces": { - "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 0, 0, 4 ], - "to": [ 2, 4, 6 ], - "faces": { - "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, - "south": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, - "west": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 9, 0, 5 ], - "to": [ 14, 12, 10 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/bubble_coral", + "texture": "betterend:block/bubble_coral" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 0, 1 ], + "to": [ 8, 10, 6 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 11 ], + "to": [ 14, 7, 15 ], + "faces": { + "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 8 ], + "to": [ 8, 8, 13 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 0, 1 ], + "to": [ 14, 5, 4 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 0, 14 ], + "to": [ 3, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 0, 4 ], + "to": [ 2, 4, 6 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 0, 5 ], + "to": [ 14, 12, 10 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_nylium_path.json b/src/main/resources/assets/betterend/models/block/chorus_nylium_path.json index 8dcbf941..34fa8e53 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_nylium_path.json +++ b/src/main/resources/assets/betterend/models/block/chorus_nylium_path.json @@ -1,7 +1,7 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/chorus_nylium_path_top", - "side": "betterend:block/chorus_nylium_side", - "bottom": "block/end_stone" - } -} +{ "parent": "betterend:block/path", + "textures": { + "top": "betterend:block/chorus_nylium_path_top", + "side": "betterend:block/chorus_nylium_side", + "bottom": "block/end_stone" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_outer_stairs.json b/src/main/resources/assets/betterend/models/block/chorus_outer_stairs.json index 797a3dac..de2c9e18 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_outer_stairs.json +++ b/src/main/resources/assets/betterend/models/block/chorus_outer_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/chorus_planks", - "side": "betterend:block/chorus_planks", - "top": "betterend:block/chorus_planks" - } -} +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/chorus_planks", + "side": "betterend:block/chorus_planks", + "top": "betterend:block/chorus_planks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/chorus_plant_center.json b/src/main/resources/assets/betterend/models/block/chorus_plant_center.json index 9ec24155..c3a149cc 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_plant_center.json +++ b/src/main/resources/assets/betterend/models/block/chorus_plant_center.json @@ -1,23 +1,23 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/chorus_plant", - "texture": "betterend:block/chorus_plant" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 4, 4, 4 ], - "to": [ 12, 12, 12 ], - "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, - "north": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, - "south": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, - "west": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, - "east": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/chorus_plant", + "texture": "betterend:block/chorus_plant" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, + "north": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, + "south": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, + "west": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" }, + "east": { "uv": [ 4, 4, 12, 12 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_plant_flower.json b/src/main/resources/assets/betterend/models/block/chorus_plant_flower.json index f22c2f23..3ee74dc6 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_plant_flower.json +++ b/src/main/resources/assets/betterend/models/block/chorus_plant_flower.json @@ -1,51 +1,51 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/chorus_plant_flower_side", - "side": "betterend:block/chorus_plant_flower_side", - "top": "betterend:block/chorus_plant_flower_top", - "bottom": "betterend:block/chorus_plant_flower_bottom" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 0, 2, 2 ], - "to": [ 16, 14, 14 ], - "faces": { - "down": { "uv": [ 0, 2, 16, 14 ], "texture": "#bottom" }, - "up": { "uv": [ 0, 2, 16, 14 ], "texture": "#top" }, - "north": { "uv": [ 0, 2, 16, 14 ], "texture": "#side" }, - "south": { "uv": [ 0, 2, 16, 14 ], "texture": "#side" }, - "west": { "uv": [ 2, 2, 14, 14 ], "texture": "#side" }, - "east": { "uv": [ 2, 2, 14, 14 ], "texture": "#side" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 2, 0 ], - "to": [ 14, 14, 16 ], - "faces": { - "down": { "uv": [ 2, 0, 14, 16 ], "texture": "#bottom" }, - "up": { "uv": [ 2, 0, 14, 16 ], "texture": "#top" }, - "north": { "uv": [ 2, 2, 14, 14 ], "texture": "#side" }, - "south": { "uv": [ 2, 2, 14, 14 ], "texture": "#side" }, - "west": { "uv": [ 0, 2, 16, 14 ], "texture": "#side" }, - "east": { "uv": [ 0, 2, 16, 14 ], "texture": "#side" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 0, 2 ], - "to": [ 14, 16, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#top" }, - "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/chorus_plant_flower_side", + "side": "betterend:block/chorus_plant_flower_side", + "top": "betterend:block/chorus_plant_flower_top", + "bottom": "betterend:block/chorus_plant_flower_bottom" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 0, 2, 2 ], + "to": [ 16, 14, 14 ], + "faces": { + "down": { "uv": [ 0, 2, 16, 14 ], "texture": "#bottom" }, + "up": { "uv": [ 0, 2, 16, 14 ], "texture": "#top" }, + "north": { "uv": [ 0, 2, 16, 14 ], "texture": "#side" }, + "south": { "uv": [ 0, 2, 16, 14 ], "texture": "#side" }, + "west": { "uv": [ 2, 2, 14, 14 ], "texture": "#side" }, + "east": { "uv": [ 2, 2, 14, 14 ], "texture": "#side" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 2, 0 ], + "to": [ 14, 14, 16 ], + "faces": { + "down": { "uv": [ 2, 0, 14, 16 ], "texture": "#bottom" }, + "up": { "uv": [ 2, 0, 14, 16 ], "texture": "#top" }, + "north": { "uv": [ 2, 2, 14, 14 ], "texture": "#side" }, + "south": { "uv": [ 2, 2, 14, 14 ], "texture": "#side" }, + "west": { "uv": [ 0, 2, 16, 14 ], "texture": "#side" }, + "east": { "uv": [ 0, 2, 16, 14 ], "texture": "#side" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 0, 2 ], + "to": [ 14, 16, 14 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#top" }, + "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_plant_flower_open.json b/src/main/resources/assets/betterend/models/block/chorus_plant_flower_open.json index 83fdaf4f..58713358 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_plant_flower_open.json +++ b/src/main/resources/assets/betterend/models/block/chorus_plant_flower_open.json @@ -1,175 +1,175 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/chorus_plant_flower_petal", - "texture": "betterend:block/chorus_plant_flower_petal", - "center": "betterend:block/chorus_plant_flower_center", - "texture1": "betterend:block/chorus_plant_flower_fur" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 4, 0, 4 ], - "to": [ 12, 2, 12 ], - "faces": { - "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#center" }, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#center" }, - "north": { "uv": [ 8, 14, 16, 16 ], "texture": "#center" }, - "south": { "uv": [ 8, 14, 16, 16 ], "texture": "#center" }, - "west": { "uv": [ 8, 14, 16, 16 ], "texture": "#center" }, - "east": { "uv": [ 8, 14, 16, 16 ], "texture": "#center" } - } - }, - { - "__comment": "PlaneY2", - "from": [ 4.5, 1.125, 16 ], - "to": [ 20.5, 1.126, 32 ], - "rotation": { "origin": [ 4.5, 1.125, 16 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY2", - "from": [ 0, 1.25, 4.5 ], - "to": [ 16, 1.251, 20.5 ], - "rotation": { "origin": [ 0, 1.25, 4.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY2", - "from": [ -4.5, 1.375, -16 ], - "to": [ 11.5, 1.376, 0 ], - "rotation": { "origin": [ 11.5, 1.375, 0 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY2", - "from": [ 0, 1, -4.5 ], - "to": [ 16, 1.001, 11.5 ], - "rotation": { "origin": [ 16, 1, 11.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX6", - "from": [ 11, 0.999, 0.5 ], - "to": [ 20, 0.9999999, 16.5 ], - "rotation": { "origin": [ 11, 1, 0.5 ], "axis": "z", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 16, 16, 0, 7 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneX6", - "from": [ 19.25, 4.374, 0.5 ], - "to": [ 28.25, 4.375, 16.5 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 9 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 16, 9, 0, 0 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneY11", - "from": [ -3, 0.999, 0 ], - "to": [ 5, 0.9999999, 16 ], - "rotation": { "origin": [ 5, 1, 0 ], "axis": "z", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "rotation": 270 }, - "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneY11", - "from": [ -10.375, 3.999, 0 ], - "to": [ -2.375, 4, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneY13", - "from": [ -0.5, 1, 11 ], - "to": [ 15.5, 1.001, 20 ], - "rotation": { "origin": [ -0.5, 1, 11 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY13", - "from": [ -0.5, 4.5, 19.25 ], - "to": [ 15.5, 4.501, 28.25 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 9 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 9 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY18", - "from": [ 1, 0.999, -4 ], - "to": [ 17, 0.9999999, 5 ], - "rotation": { "origin": [ 1, 1, 5 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY18", - "from": [ 1, 4.374, -12.25 ], - "to": [ 17, 4.375, -3.25 ], - "rotation": { "origin": [ 1, 4.375, -3.25 ], "axis": "x", "angle": 0 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX20", - "from": [ 2, 1, 2 ], - "to": [ 2.001, 8, 18 ], - "rotation": { "origin": [ 2, 1, 2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture1" } - } - }, - { - "__comment": "PlaneX20", - "from": [ 14, 1, 2 ], - "to": [ 14.001, 8, 18 ], - "rotation": { "origin": [ 14, 1, 2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture1" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/chorus_plant_flower_petal", + "texture": "betterend:block/chorus_plant_flower_petal", + "center": "betterend:block/chorus_plant_flower_center", + "texture1": "betterend:block/chorus_plant_flower_fur" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 0, 4 ], + "to": [ 12, 2, 12 ], + "faces": { + "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#center" }, + "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#center" }, + "north": { "uv": [ 8, 14, 16, 16 ], "texture": "#center" }, + "south": { "uv": [ 8, 14, 16, 16 ], "texture": "#center" }, + "west": { "uv": [ 8, 14, 16, 16 ], "texture": "#center" }, + "east": { "uv": [ 8, 14, 16, 16 ], "texture": "#center" } + } + }, + { + "__comment": "PlaneY2", + "from": [ 4.5, 1.125, 16 ], + "to": [ 20.5, 1.126, 32 ], + "rotation": { "origin": [ 4.5, 1.125, 16 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY2", + "from": [ 0, 1.25, 4.5 ], + "to": [ 16, 1.251, 20.5 ], + "rotation": { "origin": [ 0, 1.25, 4.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY2", + "from": [ -4.5, 1.375, -16 ], + "to": [ 11.5, 1.376, 0 ], + "rotation": { "origin": [ 11.5, 1.375, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY2", + "from": [ 0, 1, -4.5 ], + "to": [ 16, 1.001, 11.5 ], + "rotation": { "origin": [ 16, 1, 11.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX6", + "from": [ 11, 0.999, 0.5 ], + "to": [ 20, 0.9999999, 16.5 ], + "rotation": { "origin": [ 11, 1, 0.5 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 16, 16, 0, 7 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneX6", + "from": [ 19.25, 4.374, 0.5 ], + "to": [ 28.25, 4.375, 16.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 9 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 16, 9, 0, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY11", + "from": [ -3, 0.999, 0 ], + "to": [ 5, 0.9999999, 16 ], + "rotation": { "origin": [ 5, 1, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY11", + "from": [ -10.375, 3.999, 0 ], + "to": [ -2.375, 4, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY13", + "from": [ -0.5, 1, 11 ], + "to": [ 15.5, 1.001, 20 ], + "rotation": { "origin": [ -0.5, 1, 11 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY13", + "from": [ -0.5, 4.5, 19.25 ], + "to": [ 15.5, 4.501, 28.25 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 9 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 9 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY18", + "from": [ 1, 0.999, -4 ], + "to": [ 17, 0.9999999, 5 ], + "rotation": { "origin": [ 1, 1, 5 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY18", + "from": [ 1, 4.374, -12.25 ], + "to": [ 17, 4.375, -3.25 ], + "rotation": { "origin": [ 1, 4.375, -3.25 ], "axis": "x", "angle": 0 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX20", + "from": [ 2, 1, 2 ], + "to": [ 2.001, 8, 18 ], + "rotation": { "origin": [ 2, 1, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "PlaneX20", + "from": [ 14, 1, 2 ], + "to": [ 14.001, 8, 18 ], + "rotation": { "origin": [ 14, 1, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9, 16, 16 ], "texture": "#texture1" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_plant_roots.json b/src/main/resources/assets/betterend/models/block/chorus_plant_roots.json index f577c244..8690f2c9 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_plant_roots.json +++ b/src/main/resources/assets/betterend/models/block/chorus_plant_roots.json @@ -1,49 +1,49 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/chorus_plant_roots", - "texture": "betterend:block/chorus_plant_roots" - }, - "elements": [ - { - "__comment": "PlaneX4", - "from": [ 6, 0, 0 ], - "to": [ 6.001, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0, 0, 6 ], - "to": [ 16, 16, 6.001 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0, 0, 10 ], - "to": [ 16, 16, 10.001 ], - "shade": false, - "faces": { - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 10, 0, 0 ], - "to": [ 10.001, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/chorus_plant_roots", + "texture": "betterend:block/chorus_plant_roots" + }, + "elements": [ + { + "__comment": "PlaneX4", + "from": [ 6, 0, 0 ], + "to": [ 6.001, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0, 0, 6 ], + "to": [ 16, 16, 6.001 ], + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0, 0, 10 ], + "to": [ 16, 16, 10.001 ], + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 0 ], + "to": [ 10.001, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_plant_stem.json b/src/main/resources/assets/betterend/models/block/chorus_plant_stem.json index b3e6601f..af1adcdb 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_plant_stem.json +++ b/src/main/resources/assets/betterend/models/block/chorus_plant_stem.json @@ -1,45 +1,45 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/chorus_plant", - "texture": "betterend:block/chorus_plant", - "needles": "betterend:block/chorus_plant_needles" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 5, 0, 5 ], - "to": [ 11, 8, 11 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 0, 0, 0 ], - "to": [ 0.001, 8, 22.5 ], - "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 16, 0, 0 ], - "to": [ 16.001, 8, 22.5 ], - "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/chorus_plant", + "texture": "betterend:block/chorus_plant", + "needles": "betterend:block/chorus_plant_needles" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 5, 0, 5 ], + "to": [ 11, 8, 11 ], + "faces": { + "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "north": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0, 0, 0 ], + "to": [ 0.001, 8, 22.5 ], + "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, 0, 0 ], + "to": [ 16.001, 8, 22.5 ], + "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_plant_stem_2.json b/src/main/resources/assets/betterend/models/block/chorus_plant_stem_2.json index 893841a8..c2f85896 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_plant_stem_2.json +++ b/src/main/resources/assets/betterend/models/block/chorus_plant_stem_2.json @@ -1,45 +1,45 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/chorus_plant", - "texture": "betterend:block/chorus_plant", - "needles": "betterend:block/chorus_plant_needles_2" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 5, 0, 5 ], - "to": [ 11, 8, 11 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 0, 0, 0 ], - "to": [ 0.001, 8, 22.5 ], - "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 16, 0, 0 ], - "to": [ 16.001, 8, 22.5 ], - "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/chorus_plant", + "texture": "betterend:block/chorus_plant", + "needles": "betterend:block/chorus_plant_needles_2" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 5, 0, 5 ], + "to": [ 11, 8, 11 ], + "faces": { + "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "north": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0, 0, 0 ], + "to": [ 0.001, 8, 22.5 ], + "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, 0, 0 ], + "to": [ 16.001, 8, 22.5 ], + "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_plant_stem_3.json b/src/main/resources/assets/betterend/models/block/chorus_plant_stem_3.json index aaae8628..36c94c3f 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_plant_stem_3.json +++ b/src/main/resources/assets/betterend/models/block/chorus_plant_stem_3.json @@ -1,45 +1,45 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/chorus_plant", - "texture": "betterend:block/chorus_plant", - "needles": "betterend:block/chorus_plant_needles_3" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 5, 0, 5 ], - "to": [ 11, 8, 11 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 0, 0, 0 ], - "to": [ 0.001, 8, 22.5 ], - "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 16, 0, 0 ], - "to": [ 16.001, 8, 22.5 ], - "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/chorus_plant", + "texture": "betterend:block/chorus_plant", + "needles": "betterend:block/chorus_plant_needles_3" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 5, 0, 5 ], + "to": [ 11, 8, 11 ], + "faces": { + "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "north": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0, 0, 0 ], + "to": [ 0.001, 8, 22.5 ], + "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, 0, 0 ], + "to": [ 16.001, 8, 22.5 ], + "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/chorus_plant_stem_4.json b/src/main/resources/assets/betterend/models/block/chorus_plant_stem_4.json index 3659621a..227edb67 100644 --- a/src/main/resources/assets/betterend/models/block/chorus_plant_stem_4.json +++ b/src/main/resources/assets/betterend/models/block/chorus_plant_stem_4.json @@ -1,45 +1,45 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/chorus_plant", - "texture": "betterend:block/chorus_plant", - "needles": "betterend:block/chorus_plant_needles_4" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 5, 0, 5 ], - "to": [ 11, 8, 11 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 0, 0, 0 ], - "to": [ 0.001, 8, 22.5 ], - "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 16, 0, 0 ], - "to": [ 16.001, 8, 22.5 ], - "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/chorus_plant", + "texture": "betterend:block/chorus_plant", + "needles": "betterend:block/chorus_plant_needles_4" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 5, 0, 5 ], + "to": [ 11, 8, 11 ], + "faces": { + "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "north": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 8, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0, 0, 0 ], + "to": [ 0.001, 8, 22.5 ], + "rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, 0, 0 ], + "to": [ 16.001, 8, 22.5 ], + "rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#needles" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/creeping_moss.json b/src/main/resources/assets/betterend/models/block/creeping_moss.json index 01a9b37f..7b302528 100644 --- a/src/main/resources/assets/betterend/models/block/creeping_moss.json +++ b/src/main/resources/assets/betterend/models/block/creeping_moss.json @@ -1,120 +1,120 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/creeping_moss_leaves", - "texture": "betterend:block/creeping_moss_leaves", - "spore": "betterend:block/creeping_moss_spores" - }, - "elements": [ - { - "__comment": "PlaneY1", - "from": [ 0, -0.001, -10 ], - "to": [ 16, 0, 6 ], - "rotation": { "origin": [ 0, 0, 6 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, 0, 10 ], - "to": [ 16, 0.001, 26 ], - "rotation": { "origin": [ 0, 0, 10 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY4", - "from": [ 10, -0.001, 0 ], - "to": [ 26, 0, 16 ], - "rotation": { "origin": [ 10, 0, 16 ], "axis": "z", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneY4", - "from": [ -10, 0, 2 ], - "to": [ 6, 0.001, 18 ], - "rotation": { "origin": [ 6, 0, 18 ], "axis": "z", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneX6", - "from": [ 0, 0, -6.5 ], - "to": [ 0.001, 16, 16 ], - "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX6", - "from": [ -6.5, 0, 15.999 ], - "to": [ 16, 16, 16 ], - "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, -0.001, -9 ], - "to": [ 16, 0, 7 ], - "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, 0, 9 ], - "to": [ 16, 0.001, 25 ], - "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY4", - "from": [ 9, -0.001, 0 ], - "to": [ 25, 0, 16 ], - "rotation": { "origin": [ 9, 0, 16 ], "axis": "z", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneY4", - "from": [ -9, 0, 2 ], - "to": [ 7, 0.001, 18 ], - "rotation": { "origin": [ 7, 0, 18 ], "axis": "z", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/creeping_moss_leaves", + "texture": "betterend:block/creeping_moss_leaves", + "spore": "betterend:block/creeping_moss_spores" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -10 ], + "to": [ 16, 0, 6 ], + "rotation": { "origin": [ 0, 0, 6 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 10 ], + "to": [ 16, 0.001, 26 ], + "rotation": { "origin": [ 0, 0, 10 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 10, -0.001, 0 ], + "to": [ 26, 0, 16 ], + "rotation": { "origin": [ 10, 0, 16 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -10, 0, 2 ], + "to": [ 6, 0.001, 18 ], + "rotation": { "origin": [ 6, 0, 18 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneX6", + "from": [ 0, 0, -6.5 ], + "to": [ 0.001, 16, 16 ], + "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX6", + "from": [ -6.5, 0, 15.999 ], + "to": [ 16, 16, 16 ], + "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -9 ], + "to": [ 16, 0, 7 ], + "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 9 ], + "to": [ 16, 0.001, 25 ], + "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY4", + "from": [ 9, -0.001, 0 ], + "to": [ 25, 0, 16 ], + "rotation": { "origin": [ 9, 0, 16 ], "axis": "z", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -9, 0, 2 ], + "to": [ 7, 0.001, 18 ], + "rotation": { "origin": [ 7, 0, 18 ], "axis": "z", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/crop_block_inverted.json b/src/main/resources/assets/betterend/models/block/crop_block_inverted.json index 8d5c9a19..b7794ac1 100644 --- a/src/main/resources/assets/betterend/models/block/crop_block_inverted.json +++ b/src/main/resources/assets/betterend/models/block/crop_block_inverted.json @@ -1,40 +1,40 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#texture" - }, - "elements": [ - { "from": [ 4, 0, 0 ], - "to": [ 4, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - }, - { "from": [ 12, 0, 0 ], - "to": [ 12, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - }, - { "from": [ 0, 0, 4 ], - "to": [ 16, 16, 4 ], - "shade": false, - "faces": { - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - }, - { "from": [ 0, 0, 12 ], - "to": [ 16, 16, 12 ], - "shade": false, - "faces": { - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - } - ] -} +{ + "ambientocclusion": false, + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 4, 0, 0 ], + "to": [ 4, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { "from": [ 12, 0, 0 ], + "to": [ 12, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { "from": [ 0, 0, 4 ], + "to": [ 16, 16, 4 ], + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { "from": [ 0, 0, 12 ], + "to": [ 16, 16, 12 ], + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/cross_inverted.json b/src/main/resources/assets/betterend/models/block/cross_inverted.json index 5f4f8f7a..f9318db3 100644 --- a/src/main/resources/assets/betterend/models/block/cross_inverted.json +++ b/src/main/resources/assets/betterend/models/block/cross_inverted.json @@ -1,26 +1,26 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#cross" - }, - "elements": [ - { "from": [ 0.8, 0, 8 ], - "to": [ 15.2, 16, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" } - } - }, - { "from": [ 8, 0, 0.8 ], - "to": [ 8, 16, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" } - } - } - ] -} +{ + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" } + } + }, + { "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/cross_no_distortion.json b/src/main/resources/assets/betterend/models/block/cross_no_distortion.json index dc78e239..b49ed6ac 100644 --- a/src/main/resources/assets/betterend/models/block/cross_no_distortion.json +++ b/src/main/resources/assets/betterend/models/block/cross_no_distortion.json @@ -1,29 +1,29 @@ -{ - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "PlaneX1", - "from": [ 2.375, 0, 2.25 ], - "to": [ 2.376, 16, 18.25 ], - "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX1", - "from": [ 13.75, 0, 2.25 ], - "to": [ 13.751, 16, 18.25 ], - "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - } - ] +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/cross_no_distortion_inverted.json b/src/main/resources/assets/betterend/models/block/cross_no_distortion_inverted.json index 429eb5ea..74f12df2 100644 --- a/src/main/resources/assets/betterend/models/block/cross_no_distortion_inverted.json +++ b/src/main/resources/assets/betterend/models/block/cross_no_distortion_inverted.json @@ -1,29 +1,29 @@ -{ - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "PlaneX1", - "from": [ 2.375, 0, 2.25 ], - "to": [ 2.376, 16, 18.25 ], - "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX1", - "from": [ 13.75, 0, 2.25 ], - "to": [ 13.751, 16, 18.25 ], - "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } - } - } - ] +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/crystal_grass_1.json b/src/main/resources/assets/betterend/models/block/crystal_grass_1.json index 02f092b4..730eca21 100644 --- a/src/main/resources/assets/betterend/models/block/crystal_grass_1.json +++ b/src/main/resources/assets/betterend/models/block/crystal_grass_1.json @@ -1,126 +1,126 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/crystal_grass_2", - "texture": "betterend:block/crystal_grass_2" - }, - "elements": [ - { - "__comment": "PlaneX3", - "from": [ 2, 0, 2 ], - "to": [ 2.001, 9, 18 ], - "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 14, 0, 2 ], - "to": [ 14.001, 9, 18 ], - "rotation": { "origin": [ 14, 0, 2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 5.5, 8.5, 5.5 ], - "to": [ 10.5, 8.501, 10.5 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 4.5, 8, 8 ], - "to": [ 9.5, 8.001, 13 ], - "rotation": { "origin": [ 4.5, 8, 8 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 1.125, 3.5, 1 ], - "to": [ 6.125, 3.501, 6 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 0.125, 3, 3.5 ], - "to": [ 5.125, 3.001, 8.5 ], - "rotation": { "origin": [ 0.125, 3, 3.5 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 9.75, 3.5, 1.25 ], - "to": [ 14.75, 3.501, 6.25 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 8.75, 3, 3.75 ], - "to": [ 13.75, 3.001, 8.75 ], - "rotation": { "origin": [ 8.75, 3, 3.75 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 9, 4.5, 9.125 ], - "to": [ 14, 4.501, 14.125 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 8, 4, 11.625 ], - "to": [ 13, 4.001, 16.625 ], - "rotation": { "origin": [ 8, 4, 11.625 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 2, 4.5, 9 ], - "to": [ 7, 4.501, 14 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 1, 4, 11.5 ], - "to": [ 6, 4.001, 16.5 ], - "rotation": { "origin": [ 1, 4, 11.5 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/crystal_grass_2", + "texture": "betterend:block/crystal_grass_2" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ 2, 0, 2 ], + "to": [ 2.001, 9, 18 ], + "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 14, 0, 2 ], + "to": [ 14.001, 9, 18 ], + "rotation": { "origin": [ 14, 0, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 5.5, 8.5, 5.5 ], + "to": [ 10.5, 8.501, 10.5 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 4.5, 8, 8 ], + "to": [ 9.5, 8.001, 13 ], + "rotation": { "origin": [ 4.5, 8, 8 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 1.125, 3.5, 1 ], + "to": [ 6.125, 3.501, 6 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 0.125, 3, 3.5 ], + "to": [ 5.125, 3.001, 8.5 ], + "rotation": { "origin": [ 0.125, 3, 3.5 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 9.75, 3.5, 1.25 ], + "to": [ 14.75, 3.501, 6.25 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8.75, 3, 3.75 ], + "to": [ 13.75, 3.001, 8.75 ], + "rotation": { "origin": [ 8.75, 3, 3.75 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 9, 4.5, 9.125 ], + "to": [ 14, 4.501, 14.125 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8, 4, 11.625 ], + "to": [ 13, 4.001, 16.625 ], + "rotation": { "origin": [ 8, 4, 11.625 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 2, 4.5, 9 ], + "to": [ 7, 4.501, 14 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 1, 4, 11.5 ], + "to": [ 6, 4.001, 16.5 ], + "rotation": { "origin": [ 1, 4, 11.5 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/crystal_grass_2.json b/src/main/resources/assets/betterend/models/block/crystal_grass_2.json index efecc979..0a306ec7 100644 --- a/src/main/resources/assets/betterend/models/block/crystal_grass_2.json +++ b/src/main/resources/assets/betterend/models/block/crystal_grass_2.json @@ -1,107 +1,107 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/crystal_grass_3", - "texture": "betterend:block/crystal_grass_3" - }, - "elements": [ - { - "__comment": "PlaneX3", - "from": [ 2, 0, 2 ], - "to": [ 2.001, 9, 18 ], - "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 14, 0, 2 ], - "to": [ 14.001, 9, 18 ], - "rotation": { "origin": [ 14, 0, 2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 3, 8.5, 3 ], - "to": [ 8, 8.501, 8 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 2, 8, 5.5 ], - "to": [ 7, 8.001, 10.5 ], - "rotation": { "origin": [ 2, 8, 5.5 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 8.375, 8.5, 2.625 ], - "to": [ 13.375, 8.501, 7.625 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 7.375, 8, 5.125 ], - "to": [ 12.375, 8.001, 10.125 ], - "rotation": { "origin": [ 7.375, 8, 5.125 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 3.5, 4.5, 7.5 ], - "to": [ 8.5, 4.501, 12.5 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 2.5, 4, 10 ], - "to": [ 7.5, 4.001, 15 ], - "rotation": { "origin": [ 2.5, 4, 10 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 8, 5, 7 ], - "to": [ 13, 5.001, 12 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 7, 4.5, 9.5 ], - "to": [ 12, 4.501, 14.5 ], - "rotation": { "origin": [ 7, 4.5, 9.5 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/crystal_grass_3", + "texture": "betterend:block/crystal_grass_3" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ 2, 0, 2 ], + "to": [ 2.001, 9, 18 ], + "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 14, 0, 2 ], + "to": [ 14.001, 9, 18 ], + "rotation": { "origin": [ 14, 0, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 3, 8.5, 3 ], + "to": [ 8, 8.501, 8 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 2, 8, 5.5 ], + "to": [ 7, 8.001, 10.5 ], + "rotation": { "origin": [ 2, 8, 5.5 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8.375, 8.5, 2.625 ], + "to": [ 13.375, 8.501, 7.625 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 7.375, 8, 5.125 ], + "to": [ 12.375, 8.001, 10.125 ], + "rotation": { "origin": [ 7.375, 8, 5.125 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 3.5, 4.5, 7.5 ], + "to": [ 8.5, 4.501, 12.5 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 2.5, 4, 10 ], + "to": [ 7.5, 4.001, 15 ], + "rotation": { "origin": [ 2.5, 4, 10 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8, 5, 7 ], + "to": [ 13, 5.001, 12 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 7, 4.5, 9.5 ], + "to": [ 12, 4.501, 14.5 ], + "rotation": { "origin": [ 7, 4.5, 9.5 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/crystal_grass_3.json b/src/main/resources/assets/betterend/models/block/crystal_grass_3.json index 496b9e74..7a36c9a1 100644 --- a/src/main/resources/assets/betterend/models/block/crystal_grass_3.json +++ b/src/main/resources/assets/betterend/models/block/crystal_grass_3.json @@ -1,50 +1,50 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/crystal_grass_4", - "texture": "betterend:block/crystal_grass_4" - }, - "elements": [ - { - "__comment": "PlaneX3", - "from": [ 2.5, 0, 2.5 ], - "to": [ 2.501, 9, 18.5 ], - "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 13.5, 0, 2.5 ], - "to": [ 13.501, 9, 18.5 ], - "rotation": { "origin": [ 13.5, 0, 2.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 5.5, 8.5, 5.5 ], - "to": [ 10.5, 8.501, 10.5 ], - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 4.5, 8, 8 ], - "to": [ 9.5, 8.001, 13 ], - "rotation": { "origin": [ 4.5, 8, 8 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/crystal_grass_4", + "texture": "betterend:block/crystal_grass_4" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ 2.5, 0, 2.5 ], + "to": [ 2.501, 9, 18.5 ], + "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 13.5, 0, 2.5 ], + "to": [ 13.501, 9, 18.5 ], + "rotation": { "origin": [ 13.5, 0, 2.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 5.5, 8.5, 5.5 ], + "to": [ 10.5, 8.501, 10.5 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 4.5, 8, 8 ], + "to": [ 9.5, 8.001, 13 ], + "rotation": { "origin": [ 4.5, 8, 8 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/crystal_grass_4.json b/src/main/resources/assets/betterend/models/block/crystal_grass_4.json index 7bc54778..deacfba0 100644 --- a/src/main/resources/assets/betterend/models/block/crystal_grass_4.json +++ b/src/main/resources/assets/betterend/models/block/crystal_grass_4.json @@ -1,31 +1,31 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/crystal_grass_5", - "texture": "betterend:block/crystal_grass_5" - }, - "elements": [ - { - "__comment": "PlaneX3", - "from": [ 2.5, 0, 2.5 ], - "to": [ 2.501, 10, 18.5 ], - "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 6, 0, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 13.5, 0, 2.5 ], - "to": [ 13.501, 10, 18.5 ], - "rotation": { "origin": [ 13.5, 0, 2.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 16, 6, 0, 16 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/crystal_grass_5", + "texture": "betterend:block/crystal_grass_5" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ 2.5, 0, 2.5 ], + "to": [ 2.501, 10, 18.5 ], + "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 6, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 13.5, 0, 2.5 ], + "to": [ 13.501, 10, 18.5 ], + "rotation": { "origin": [ 13.5, 0, 2.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 6, 0, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/cube_noshade.json b/src/main/resources/assets/betterend/models/block/cube_noshade.json index 2f64924d..41beca9c 100644 --- a/src/main/resources/assets/betterend/models/block/cube_noshade.json +++ b/src/main/resources/assets/betterend/models/block/cube_noshade.json @@ -1,22 +1,22 @@ -{ - "parent": "block/block", - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "east" } - } - } - ] +{ + "parent": "block/block", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "east" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/dense_vine_top.json b/src/main/resources/assets/betterend/models/block/dense_vine_top.json index bec20fbc..4260f1e4 100644 --- a/src/main/resources/assets/betterend/models/block/dense_vine_top.json +++ b/src/main/resources/assets/betterend/models/block/dense_vine_top.json @@ -1,76 +1,76 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/dense_vine", - "texture": "betterend:block/dense_vine", - "roots": "betterend:block/dense_vine_roots" - }, - "elements": [ - { - "__comment": "PlaneX1", - "from": [ 2.375, 0, 2.25 ], - "to": [ 2.376, 16, 18.25 ], - "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX1", - "from": [ 13.75, 0, 2.25 ], - "to": [ 13.751, 16, 18.25 ], - "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 5, 0, 0.5 ], - "to": [ 5.001, 16, 16.5 ], - "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, - "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 11 ], - "to": [ 16.5, 16, 11.001 ], - "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, - "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 11, 0, 0.5 ], - "to": [ 11.001, 16, 16.5 ], - "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, - "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 5 ], - "to": [ 16.5, 16, 5.001 ], - "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, - "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/dense_vine", + "texture": "betterend:block/dense_vine", + "roots": "betterend:block/dense_vine_roots" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 0.5 ], + "to": [ 5.001, 16, 16.5 ], + "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 11 ], + "to": [ 16.5, 16, 11.001 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 16, 16.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 5 ], + "to": [ 16.5, 16, 5.001 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_roots.json b/src/main/resources/assets/betterend/models/block/end_lily_roots.json index a5ceb46e..532b7701 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_roots.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_roots.json @@ -1,76 +1,76 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/end_lily_stem", - "texture": "betterend:block/end_lily_stem", - "roots": "betterend:block/end_lily_roots" - }, - "elements": [ - { - "__comment": "PlaneX1", - "from": [ 2.375, 0, 2.25 ], - "to": [ 2.376, 16, 18.25 ], - "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX1", - "from": [ 13.75, 0, 2.25 ], - "to": [ 13.751, 16, 18.25 ], - "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 5, 0, 0.5 ], - "to": [ 5.001, 16, 16.5 ], - "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 11 ], - "to": [ 16.5, 16, 11.001 ], - "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 11, 0, 0.5 ], - "to": [ 11.001, 16, 16.5 ], - "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 5 ], - "to": [ 16.5, 16, 5.001 ], - "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/end_lily_stem", + "texture": "betterend:block/end_lily_stem", + "roots": "betterend:block/end_lily_roots" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 0.5 ], + "to": [ 5.001, 16, 16.5 ], + "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 11 ], + "to": [ 16.5, 16, 11.001 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 16, 16.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 5 ], + "to": [ 16.5, 16, 5.001 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_seed_0.json b/src/main/resources/assets/betterend/models/block/end_lily_seed_0.json index 9dd4d3b8..260f4b64 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_seed_0.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_seed_0.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/end_lily_0" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/end_lily_0" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_seed_1.json b/src/main/resources/assets/betterend/models/block/end_lily_seed_1.json index 022cbad7..d047b4b5 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_seed_1.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_seed_1.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/end_lily_1" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/end_lily_1" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_seed_2.json b/src/main/resources/assets/betterend/models/block/end_lily_seed_2.json index 9b481f83..2590f5b6 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_seed_2.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_seed_2.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/end_lily_2" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/end_lily_2" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_seed_3.json b/src/main/resources/assets/betterend/models/block/end_lily_seed_3.json index b0eec9e2..6c4fb07e 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_seed_3.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_seed_3.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/end_lily_3" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/end_lily_3" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_stem.json b/src/main/resources/assets/betterend/models/block/end_lily_stem.json index 2edb1931..ec631ff9 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_stem.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_stem.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/cross_no_distortion", - "textures": { - "texture": "betterend:block/end_lily_stem" - } +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/end_lily_stem" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_top.json b/src/main/resources/assets/betterend/models/block/end_lily_top.json index fe478e7e..1f228fd1 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_top.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_top.json @@ -1,92 +1,92 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/end_lily_leaf", - "leaf": "betterend:block/end_lily_leaf", - "flower": "betterend:block/end_lily_flower" - }, - "elements": [ - { - "__comment": "PlaneX2", - "from": [ 8, 0, 0 ], - "to": [ 8.001, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } - } - }, - { - "__comment": "PlaneZ3", - "from": [ 0, 0, 8 ], - "to": [ 16, 16, 8.001 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 2.5, 0, 2.5 ], - "to": [ 2.501, 16, 18.5 ], - "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 2.5, 0, 16, 16 ], "texture": "#flower" }, - "east": { "uv": [ 0, 0, 13.5, 16 ], "texture": "#flower" } - } - }, - { - "__comment": "PlaneZ3", - "from": [ 2.5, 0, 13.5 ], - "to": [ 18.5, 16, 13.501 ], - "rotation": { "origin": [ 2.5, 0, 13.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 14.5, 16 ], "texture": "#flower" }, - "south": { "uv": [ 1.5, 0, 16, 16 ], "texture": "#flower" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 8, 0.029, 8 ], - "to": [ 24, 0.029, 24 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" } - } - }, - { - "__comment": "PlaneY6", - "from": [ -8, 0.026, 8 ], - "to": [ 8, 0.026, 24 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 90 } - } - }, - { - "__comment": "PlaneY6", - "from": [ -8, 0.023, -8 ], - "to": [ 8, 0.023, 8 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 90 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 180 } - } - }, - { - "__comment": "PlaneY6", - "from": [ 8, 0.02, -8 ], - "to": [ 24, 0.02, 8 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 270 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/end_lily_leaf", + "leaf": "betterend:block/end_lily_leaf", + "flower": "betterend:block/end_lily_flower" + }, + "elements": [ + { + "__comment": "PlaneX2", + "from": [ 8, 0, 0 ], + "to": [ 8.001, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "PlaneZ3", + "from": [ 0, 0, 8 ], + "to": [ 16, 16, 8.001 ], + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 2.5, 0, 2.5 ], + "to": [ 2.501, 16, 18.5 ], + "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 2.5, 0, 16, 16 ], "texture": "#flower" }, + "east": { "uv": [ 0, 0, 13.5, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "PlaneZ3", + "from": [ 2.5, 0, 13.5 ], + "to": [ 18.5, 16, 13.501 ], + "rotation": { "origin": [ 2.5, 0, 13.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 14.5, 16 ], "texture": "#flower" }, + "south": { "uv": [ 1.5, 0, 16, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8, 0.029, 8 ], + "to": [ 24, 0.029, 24 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" } + } + }, + { + "__comment": "PlaneY6", + "from": [ -8, 0.026, 8 ], + "to": [ 8, 0.026, 24 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 90 } + } + }, + { + "__comment": "PlaneY6", + "from": [ -8, 0.023, -8 ], + "to": [ 8, 0.023, 8 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 180 } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8, 0.02, -8 ], + "to": [ 24, 0.02, 8 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 270 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_top_small.json b/src/main/resources/assets/betterend/models/block/end_lily_top_small.json index 20a49449..d61f1b43 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_top_small.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_top_small.json @@ -1,62 +1,62 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/end_lily_leaf", - "leaf": "betterend:block/end_lily_leaf_small", - "flower": "betterend:block/end_lily_flower_small" - }, - "elements": [ - { - "__comment": "PlaneX2", - "from": [ 8, 0, 0 ], - "to": [ 8.001, 16, 16 ], - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } - } - }, - { - "__comment": "PlaneZ3", - "from": [ 0, 0, 8 ], - "to": [ 16, 16, 8.001 ], - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 2.5, 0, 2.5 ], - "to": [ 2.501, 16, 18.5 ], - "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 2.5, 0, 16, 16 ], "texture": "#flower" }, - "east": { "uv": [ 0, 0, 13.5, 16 ], "texture": "#flower" } - } - }, - { - "__comment": "PlaneZ3", - "from": [ 2.5, 0, 13.5 ], - "to": [ 18.5, 16, 13.501 ], - "rotation": { "origin": [ 2.5, 0, 13.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 14.5, 16 ], "texture": "#flower" }, - "south": { "uv": [ 1.5, 0, 16, 16 ], "texture": "#flower" } - } - }, - { - "__comment": "PlaneY6", - "from": [ 0, 0.02, 0 ], - "to": [ 16, 0.02, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/end_lily_leaf", + "leaf": "betterend:block/end_lily_leaf_small", + "flower": "betterend:block/end_lily_flower_small" + }, + "elements": [ + { + "__comment": "PlaneX2", + "from": [ 8, 0, 0 ], + "to": [ 8.001, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "PlaneZ3", + "from": [ 0, 0, 8 ], + "to": [ 16, 16, 8.001 ], + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 2.5, 0, 2.5 ], + "to": [ 2.501, 16, 18.5 ], + "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 2.5, 0, 16, 16 ], "texture": "#flower" }, + "east": { "uv": [ 0, 0, 13.5, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "PlaneZ3", + "from": [ 2.5, 0, 13.5 ], + "to": [ 18.5, 16, 13.501 ], + "rotation": { "origin": [ 2.5, 0, 13.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 14.5, 16 ], "texture": "#flower" }, + "south": { "uv": [ 1.5, 0, 16, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 0, 0.02, 0 ], + "to": [ 16, 0.02, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lily_top_small_2.json b/src/main/resources/assets/betterend/models/block/end_lily_top_small_2.json index 6aa8cbb0..a8f9089f 100644 --- a/src/main/resources/assets/betterend/models/block/end_lily_top_small_2.json +++ b/src/main/resources/assets/betterend/models/block/end_lily_top_small_2.json @@ -1,19 +1,19 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/end_lily_leaf", - "leaf": "betterend:block/end_lily_leaf_small" - }, - "elements": [ - { - "__comment": "PlaneY6", - "from": [ 0, 0.02, 0 ], - "to": [ 16, 0.02, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/end_lily_leaf", + "leaf": "betterend:block/end_lily_leaf_small" + }, + "elements": [ + { + "__comment": "PlaneY6", + "from": [ 0, 0.02, 0 ], + "to": [ 16, 0.02, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lotus_flower.json b/src/main/resources/assets/betterend/models/block/end_lotus_flower.json index 68312cdc..0fe2f669 100644 --- a/src/main/resources/assets/betterend/models/block/end_lotus_flower.json +++ b/src/main/resources/assets/betterend/models/block/end_lotus_flower.json @@ -1,163 +1,163 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/end_lotus_center", - "texture": "betterend:block/end_lotus_center", - "petal": "betterend:block/end_lotus_petal" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 4, 0, 4 ], - "to": [ 12, 11, 12 ], - "faces": { - "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0, 4, 8, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 5, 8, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 5, 8, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 8, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY2", - "from": [ -0.5, 2, 12 ], - "to": [ 15.5, 2.001, 20 ], - "rotation": { "origin": [ -0.5, 2, 12 ], "axis": "x", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#petal" }, - "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#petal", "rotation": 180 } - } - }, - { - "__comment": "PlaneY2", - "from": [ -0.5, 7.502, 17.5 ], - "to": [ 15.5, 7.502, 25.5 ], - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#petal" }, - "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#petal", "rotation": 180 } - } - }, - { - "__comment": "PlaneY2", - "from": [ 0.5, 1.999, -4 ], - "to": [ 16.5, 2, 4 ], - "rotation": { "origin": [ 0.5, 2, 4 ], "axis": "x", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#petal", "rotation": 180 }, - "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#petal" } - } - }, - { - "__comment": "PlaneY2", - "from": [ 0.5, 7.502, -9.5 ], - "to": [ 16.5, 7.502, -1.5 ], - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#petal", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#petal" } - } - }, - { - "__comment": "PlaneY12", - "from": [ 12, 2, 0.5 ], - "to": [ 20, 2.001, 16.5 ], - "rotation": { "origin": [ 12, 2, 0.5 ], "axis": "z", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#petal", "rotation": 90 }, - "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#petal", "rotation": 90 } - } - }, - { - "__comment": "PlaneY12", - "from": [ 17.5, 7.505, 0.5 ], - "to": [ 25.5, 7.505, 16.5 ], - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#petal", "rotation": 90 }, - "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#petal", "rotation": 90 } - } - }, - { - "__comment": "PlaneY12", - "from": [ -4, 1.999, -0.5 ], - "to": [ 4, 2, 15.5 ], - "rotation": { "origin": [ 4, 2, -0.5 ], "axis": "z", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#petal", "rotation": 270 }, - "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#petal", "rotation": 270 } - } - }, - { - "__comment": "PlaneY12", - "from": [ -9.5, 7.505, -0.5 ], - "to": [ -1.5, 7.505, 15.5 ], - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#petal", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#petal", "rotation": 270 } - } - }, - { - "__comment": "PlaneY10", - "from": [ 15.5, 2.02, -10.5 ], - "to": [ 31.5, 2.02, 5.5 ], - "rotation": { "origin": [ 15.5, 2, -10.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal" } - } - }, - { - "__comment": "PlaneY10", - "from": [ 10.5, 2.04, -0.5 ], - "to": [ 26.5, 2.04, 15.5 ], - "rotation": { "origin": [ 26.5, 2, 15.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 } - } - }, - { - "__comment": "PlaneY10", - "from": [ -15.5, 2.06, 10.5 ], - "to": [ 0.5, 2.06, 26.5 ], - "rotation": { "origin": [ 0.5, 2, 26.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 } - } - }, - { - "__comment": "PlaneY10", - "from": [ -10.4999, 2.08, 0.4999 ], - "to": [ 5.5001, 2.08, 16.4999 ], - "rotation": { "origin": [ -10.5, 2, 0.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal" } - } - }, - { - "__comment": "Box15", - "from": [ 5, 11, 5 ], - "to": [ 11, 12, 11 ], - "faces": { - "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, - "north": { "uv": [ 1, 4, 7, 5 ], "texture": "#texture" }, - "south": { "uv": [ 1, 4, 7, 5 ], "texture": "#texture" }, - "west": { "uv": [ 1, 4, 7, 5 ], "texture": "#texture" }, - "east": { "uv": [ 5, 4, 11, 5 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/end_lotus_center", + "texture": "betterend:block/end_lotus_center", + "petal": "betterend:block/end_lotus_petal" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 0, 4 ], + "to": [ 12, 11, 12 ], + "faces": { + "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "north": { "uv": [ 0, 4, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 5, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 5, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY2", + "from": [ -0.5, 2, 12 ], + "to": [ 15.5, 2.001, 20 ], + "rotation": { "origin": [ -0.5, 2, 12 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#petal" }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#petal", "rotation": 180 } + } + }, + { + "__comment": "PlaneY2", + "from": [ -0.5, 7.502, 17.5 ], + "to": [ 15.5, 7.502, 25.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#petal" }, + "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#petal", "rotation": 180 } + } + }, + { + "__comment": "PlaneY2", + "from": [ 0.5, 1.999, -4 ], + "to": [ 16.5, 2, 4 ], + "rotation": { "origin": [ 0.5, 2, 4 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#petal", "rotation": 180 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#petal" } + } + }, + { + "__comment": "PlaneY2", + "from": [ 0.5, 7.502, -9.5 ], + "to": [ 16.5, 7.502, -1.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#petal", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#petal" } + } + }, + { + "__comment": "PlaneY12", + "from": [ 12, 2, 0.5 ], + "to": [ 20, 2.001, 16.5 ], + "rotation": { "origin": [ 12, 2, 0.5 ], "axis": "z", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#petal", "rotation": 90 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#petal", "rotation": 90 } + } + }, + { + "__comment": "PlaneY12", + "from": [ 17.5, 7.505, 0.5 ], + "to": [ 25.5, 7.505, 16.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#petal", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#petal", "rotation": 90 } + } + }, + { + "__comment": "PlaneY12", + "from": [ -4, 1.999, -0.5 ], + "to": [ 4, 2, 15.5 ], + "rotation": { "origin": [ 4, 2, -0.5 ], "axis": "z", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#petal", "rotation": 270 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#petal", "rotation": 270 } + } + }, + { + "__comment": "PlaneY12", + "from": [ -9.5, 7.505, -0.5 ], + "to": [ -1.5, 7.505, 15.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#petal", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#petal", "rotation": 270 } + } + }, + { + "__comment": "PlaneY10", + "from": [ 15.5, 2.02, -10.5 ], + "to": [ 31.5, 2.02, 5.5 ], + "rotation": { "origin": [ 15.5, 2, -10.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal" } + } + }, + { + "__comment": "PlaneY10", + "from": [ 10.5, 2.04, -0.5 ], + "to": [ 26.5, 2.04, 15.5 ], + "rotation": { "origin": [ 26.5, 2, 15.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 } + } + }, + { + "__comment": "PlaneY10", + "from": [ -15.5, 2.06, 10.5 ], + "to": [ 0.5, 2.06, 26.5 ], + "rotation": { "origin": [ 0.5, 2, 26.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 180 } + } + }, + { + "__comment": "PlaneY10", + "from": [ -10.4999, 2.08, 0.4999 ], + "to": [ 5.5001, 2.08, 16.4999 ], + "rotation": { "origin": [ -10.5, 2, 0.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#petal", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal" } + } + }, + { + "__comment": "Box15", + "from": [ 5, 11, 5 ], + "to": [ 11, 12, 11 ], + "faces": { + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, + "north": { "uv": [ 1, 4, 7, 5 ], "texture": "#texture" }, + "south": { "uv": [ 1, 4, 7, 5 ], "texture": "#texture" }, + "west": { "uv": [ 1, 4, 7, 5 ], "texture": "#texture" }, + "east": { "uv": [ 5, 4, 11, 5 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lotus_flower_2.json b/src/main/resources/assets/betterend/models/block/end_lotus_flower_2.json index a6b97869..16fa56b4 100644 --- a/src/main/resources/assets/betterend/models/block/end_lotus_flower_2.json +++ b/src/main/resources/assets/betterend/models/block/end_lotus_flower_2.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/end_lotus_flower", - "textures": { - "particle": "betterend:block/end_lotus_center_2", - "texture": "betterend:block/end_lotus_center_2", - "petal": "betterend:block/end_lotus_petal_2" - } +{ + "parent": "betterend:block/end_lotus_flower", + "textures": { + "particle": "betterend:block/end_lotus_center_2", + "texture": "betterend:block/end_lotus_center_2", + "petal": "betterend:block/end_lotus_petal_2" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lotus_roots.json b/src/main/resources/assets/betterend/models/block/end_lotus_roots.json index 3e9ea343..828955f0 100644 --- a/src/main/resources/assets/betterend/models/block/end_lotus_roots.json +++ b/src/main/resources/assets/betterend/models/block/end_lotus_roots.json @@ -1,68 +1,68 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/end_lotus_stem", - "texture": "betterend:block/end_lotus_stem", - "roots": "betterend:block/end_lotus_roots" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 6, 0, 6 ], - "to": [ 10, 16, 10 ], - "faces": { - "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 5, 0, 1 ], - "to": [ 5.001, 16, 17 ], - "rotation": { "origin": [ 5, 0, 1 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 11, 0, 1 ], - "to": [ 11.001, 16, 17 ], - "rotation": { "origin": [ 11, 0, 1 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 0.5, 0, 4.999 ], - "to": [ 16.5, 16, 5 ], - "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 0.5, 0, 10.999 ], - "to": [ 16.5, 16, 11 ], - "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/end_lotus_stem", + "texture": "betterend:block/end_lotus_stem", + "roots": "betterend:block/end_lotus_roots" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 5, 0, 1 ], + "to": [ 5.001, 16, 17 ], + "rotation": { "origin": [ 5, 0, 1 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 11, 0, 1 ], + "to": [ 11.001, 16, 17 ], + "rotation": { "origin": [ 11, 0, 1 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0.5, 0, 4.999 ], + "to": [ 16.5, 16, 5 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0.5, 0, 10.999 ], + "to": [ 16.5, 16, 11 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lotus_stem.json b/src/main/resources/assets/betterend/models/block/end_lotus_stem.json index 0ff07e34..09384d68 100644 --- a/src/main/resources/assets/betterend/models/block/end_lotus_stem.json +++ b/src/main/resources/assets/betterend/models/block/end_lotus_stem.json @@ -1,23 +1,23 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/end_lotus_stem", - "texture": "betterend:block/end_lotus_stem" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 6, 0, 6 ], - "to": [ 10, 16, 10 ], - "faces": { - "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/end_lotus_stem", + "texture": "betterend:block/end_lotus_stem" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lotus_stem_leaf.json b/src/main/resources/assets/betterend/models/block/end_lotus_stem_leaf.json index bfee2fc4..3b2f7100 100644 --- a/src/main/resources/assets/betterend/models/block/end_lotus_stem_leaf.json +++ b/src/main/resources/assets/betterend/models/block/end_lotus_stem_leaf.json @@ -1,34 +1,34 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/end_lotus_stem", - "texture": "betterend:block/end_lotus_stem", - "texture1": "betterend:block/end_lotus_leaf_cutout" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 6, 0, 6 ], - "to": [ 10, 16, 10 ], - "faces": { - "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY2", - "from": [ 0, 0, 0 ], - "to": [ 16, 0.001, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/end_lotus_stem", + "texture": "betterend:block/end_lotus_stem", + "texture1": "betterend:block/end_lotus_leaf_cutout" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 0, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY2", + "from": [ 0, 0, 0 ], + "to": [ 16, 0.001, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lotus_stem_top.json b/src/main/resources/assets/betterend/models/block/end_lotus_stem_top.json index 6590a0ae..c27f3e88 100644 --- a/src/main/resources/assets/betterend/models/block/end_lotus_stem_top.json +++ b/src/main/resources/assets/betterend/models/block/end_lotus_stem_top.json @@ -1,35 +1,35 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/end_lotus_stem", - "texture": "betterend:block/end_lotus_stem" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 6, 0, 6 ], - "to": [ 10, 12, 10 ], - "faces": { - "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, - "north": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box2", - "from": [ 5, 12, 5 ], - "to": [ 11, 16, 11 ], - "faces": { - "down": { "uv": [ 4, 8, 10, 14 ], "texture": "#texture" }, - "up": { "uv": [ 4, 8, 10, 14 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, - "south": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, - "west": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, - "east": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/end_lotus_stem", + "texture": "betterend:block/end_lotus_stem" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 0, 6 ], + "to": [ 10, 12, 10 ], + "faces": { + "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, + "north": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box2", + "from": [ 5, 12, 5 ], + "to": [ 11, 16, 11 ], + "faces": { + "down": { "uv": [ 4, 8, 10, 14 ], "texture": "#texture" }, + "up": { "uv": [ 4, 8, 10, 14 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, + "south": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, + "west": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, + "east": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_lotus_stem_top_leaf.json b/src/main/resources/assets/betterend/models/block/end_lotus_stem_top_leaf.json index 3d1e9dc7..fe95b28d 100644 --- a/src/main/resources/assets/betterend/models/block/end_lotus_stem_top_leaf.json +++ b/src/main/resources/assets/betterend/models/block/end_lotus_stem_top_leaf.json @@ -1,46 +1,46 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/end_lotus_stem", - "texture": "betterend:block/end_lotus_stem", - "leaf": "betterend:block/end_lotus_leaf_cutout" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 6, 0, 6 ], - "to": [ 10, 12, 10 ], - "faces": { - "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, - "north": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box2", - "from": [ 5, 12, 5 ], - "to": [ 11, 16, 11 ], - "faces": { - "down": { "uv": [ 4, 8, 10, 14 ], "texture": "#texture" }, - "up": { "uv": [ 4, 8, 10, 14 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, - "south": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, - "west": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, - "east": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY3", - "from": [ 0, 0, 0 ], - "to": [ 16, 0.001, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#leaf" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/end_lotus_stem", + "texture": "betterend:block/end_lotus_stem", + "leaf": "betterend:block/end_lotus_leaf_cutout" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 0, 6 ], + "to": [ 10, 12, 10 ], + "faces": { + "down": { "uv": [ 4, 0, 8, 4 ], "texture": "#texture", "cullface": "down" }, + "north": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box2", + "from": [ 5, 12, 5 ], + "to": [ 11, 16, 11 ], + "faces": { + "down": { "uv": [ 4, 8, 10, 14 ], "texture": "#texture" }, + "up": { "uv": [ 4, 8, 10, 14 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, + "south": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, + "west": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" }, + "east": { "uv": [ 4, 4, 10, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY3", + "from": [ 0, 0, 0 ], + "to": [ 16, 0.001, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#leaf" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaf" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_moss_path.json b/src/main/resources/assets/betterend/models/block/end_moss_path.json index f449acb8..39a4c538 100644 --- a/src/main/resources/assets/betterend/models/block/end_moss_path.json +++ b/src/main/resources/assets/betterend/models/block/end_moss_path.json @@ -1,7 +1,7 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/end_moss_path_top", - "side": "betterend:block/end_moss_side", - "bottom": "block/end_stone" - } -} +{ "parent": "betterend:block/path", + "textures": { + "top": "betterend:block/end_moss_path_top", + "side": "betterend:block/end_moss_side", + "bottom": "block/end_stone" + } +} diff --git a/src/main/resources/assets/betterend/models/block/end_mycelium_path.json b/src/main/resources/assets/betterend/models/block/end_mycelium_path.json index 68bc5ea4..4fc48331 100644 --- a/src/main/resources/assets/betterend/models/block/end_mycelium_path.json +++ b/src/main/resources/assets/betterend/models/block/end_mycelium_path.json @@ -1,7 +1,7 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/end_mycelium_path_top", - "side": "betterend:block/end_mycelium_side", - "bottom": "block/end_stone" - } -} +{ "parent": "betterend:block/path", + "textures": { + "top": "betterend:block/end_mycelium_path_top", + "side": "betterend:block/end_mycelium_side", + "bottom": "block/end_stone" + } +} diff --git a/src/main/resources/assets/betterend/models/block/end_portal_ax.json b/src/main/resources/assets/betterend/models/block/end_portal_ax.json index 2d057060..8448f5c0 100644 --- a/src/main/resources/assets/betterend/models/block/end_portal_ax.json +++ b/src/main/resources/assets/betterend/models/block/end_portal_ax.json @@ -1,16 +1,16 @@ -{ - "textures": { - "particle": "betterend:block/end_portal", - "portal": "betterend:block/end_portal" - }, - "elements": [ - { - "from": [ 0, 0, 6 ], - "to": [ 16, 16, 10 ], - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } - } - } - ] +{ + "textures": { + "particle": "betterend:block/end_portal", + "portal": "betterend:block/end_portal" + }, + "elements": [ + { + "from": [ 0, 0, 6 ], + "to": [ 16, 16, 10 ], + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/end_portal_az.json b/src/main/resources/assets/betterend/models/block/end_portal_az.json index 93c3b6a8..35c5f76a 100644 --- a/src/main/resources/assets/betterend/models/block/end_portal_az.json +++ b/src/main/resources/assets/betterend/models/block/end_portal_az.json @@ -1,16 +1,16 @@ -{ - "textures": { - "particle": "betterend:block/end_portal", - "portal": "betterend:block/end_portal" - }, - "elements": [ - { - "from": [ 6, 0, 0 ], - "to": [ 10, 16, 16 ], - "faces": { - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } - } - } - ] +{ + "textures": { + "particle": "betterend:block/end_portal", + "portal": "betterend:block/end_portal" + }, + "elements": [ + { + "from": [ 6, 0, 0 ], + "to": [ 10, 16, 16 ], + "faces": { + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_bottom.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_bottom.json index 2dbf9150..9a70a5b4 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_bottom.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_bottom.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_bottom", - "textures": { - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_bottom", + "textures": { + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_column.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_column.json index f668cdd0..a5fe3af1 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_column.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_column.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_column", - "textures": { - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_column", + "textures": { + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_column_top.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_column_top.json index 3f15b9b8..d9f67d7e 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_column_top.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_column_top.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/pedestal_column_top", - "textures": { - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_column_top", + "textures": { + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_1.json index d399728b..67aee48a 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_1.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_1.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_1", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_1", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_2.json index 65ffdfba..308256d0 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_2.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_2.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_2", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_2", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_3.json index 7afab1b7..30400a31 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_3.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_3.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_3", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_3", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_4.json index be18bb5f..fc655454 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_4.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_4.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_4", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_4", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_5.json index e8395c7d..573e4abe 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_5.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_5.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_5", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_5", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_6.json index b26f8e22..5595eff0 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_6.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_6.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_6", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_6", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_7.json index fd28499f..92fb199e 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_7.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_7.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_7", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_7", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_1.json index 1f6a7b7c..fa5baa16 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_1.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_1.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_active_1", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_1", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_2.json index 22129058..72d91d94 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_2.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_2.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_active_2", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_2", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_3.json index c500f6d1..42ab5f87 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_3.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_3.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_active_3", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_3", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_4.json index 2ef01019..ecaba259 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_4.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_4.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_active_4", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_4", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_5.json index 890e3d9e..455201c5 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_5.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_5.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_active_5", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_5", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_6.json index 94547e59..925e0387 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_6.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_6.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_active_6", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_6", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_7.json index 47eaba09..7a27ab82 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_7.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_default_active_7.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "betterend:block/flavolite_runed_active_7", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side", - "bottom": "betterend:block/flavolite_polished" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "betterend:block/flavolite_runed_active_7", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side", + "bottom": "betterend:block/flavolite_polished" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_pillar.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_pillar.json index 3ae1661f..eb4f6282 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_pillar.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_pillar.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/pedestal_pillar", - "textures": { - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_pillar", + "textures": { + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_1.json index 909cb57b..c4875609 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_1.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_1.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_1", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_1", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_2.json index 0eed1d7f..aef33fb4 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_2.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_2.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_2", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_2", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_3.json index 85caab43..5a25dd29 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_3.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_3.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_3", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_3", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_4.json index 251de68a..6f08d9cb 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_4.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_4.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_4", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_4", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_5.json index 30f3b183..f4600aff 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_5.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_5.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_5", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_5", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_6.json index 18c3ce2d..14010ebe 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_6.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_6.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_6", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_6", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_7.json index 66bcc62c..08a764c8 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_7.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_7.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_7", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_7", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_1.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_1.json index ca28b3eb..915633be 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_1.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_1.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_active_1", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_1", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_2.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_2.json index 06657e93..2a94bdbf 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_2.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_2.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_active_2", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_2", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_3.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_3.json index 30363dce..3b819a94 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_3.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_3.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_active_3", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_3", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_4.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_4.json index 30be7c14..2e87dd6a 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_4.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_4.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_active_4", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_4", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_5.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_5.json index 5ac44a9b..190e2264 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_5.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_5.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_active_5", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_5", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_6.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_6.json index 92fb6770..cbb7d6c7 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_6.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_6.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_active_6", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_6", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_7.json b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_7.json index d0c9dfc2..e85cf6a3 100644 --- a/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_7.json +++ b/src/main/resources/assets/betterend/models/block/eternal_pedestal_top_active_7.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "betterend:block/flavolite_runed_active_7", - "base": "betterend:block/flavolite_polished", - "pillar": "betterend:block/flavolite_pillar_side" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "betterend:block/flavolite_runed_active_7", + "base": "betterend:block/flavolite_polished", + "pillar": "betterend:block/flavolite_pillar_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flavolite_runed_1.json b/src/main/resources/assets/betterend/models/block/flavolite_runed_1.json index 4a502958..79006e55 100644 --- a/src/main/resources/assets/betterend/models/block/flavolite_runed_1.json +++ b/src/main/resources/assets/betterend/models/block/flavolite_runed_1.json @@ -1,23 +1,23 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/flavolite_polished", - "rune_1": "betterend:block/flavolite_runed_1", - "rune_2": "betterend:block/flavolite_runed_2", - "rune_3": "betterend:block/flavolite_runed_3" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } - } - } - ] +{ + "parent": "block/cube", + "textures": { + "particle": "betterend:block/flavolite_polished", + "rune_1": "betterend:block/flavolite_runed_1", + "rune_2": "betterend:block/flavolite_runed_2", + "rune_3": "betterend:block/flavolite_runed_3" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flavolite_runed_2.json b/src/main/resources/assets/betterend/models/block/flavolite_runed_2.json index d3d89a3e..9ef15670 100644 --- a/src/main/resources/assets/betterend/models/block/flavolite_runed_2.json +++ b/src/main/resources/assets/betterend/models/block/flavolite_runed_2.json @@ -1,23 +1,23 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/flavolite_polished", - "rune_1": "betterend:block/flavolite_runed_4", - "rune_2": "betterend:block/flavolite_runed_5", - "rune_3": "betterend:block/flavolite_runed_6" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } - } - } - ] +{ + "parent": "block/cube", + "textures": { + "particle": "betterend:block/flavolite_polished", + "rune_1": "betterend:block/flavolite_runed_4", + "rune_2": "betterend:block/flavolite_runed_5", + "rune_3": "betterend:block/flavolite_runed_6" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flavolite_runed_3.json b/src/main/resources/assets/betterend/models/block/flavolite_runed_3.json index 61b24ad8..830d46d6 100644 --- a/src/main/resources/assets/betterend/models/block/flavolite_runed_3.json +++ b/src/main/resources/assets/betterend/models/block/flavolite_runed_3.json @@ -1,23 +1,23 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/flavolite_polished", - "rune_1": "betterend:block/flavolite_runed_7", - "rune_2": "betterend:block/flavolite_runed_8", - "rune_3": "betterend:block/flavolite_runed_9" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } - } - } - ] +{ + "parent": "block/cube", + "textures": { + "particle": "betterend:block/flavolite_polished", + "rune_1": "betterend:block/flavolite_runed_7", + "rune_2": "betterend:block/flavolite_runed_8", + "rune_3": "betterend:block/flavolite_runed_9" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flavolite_runed_active_1.json b/src/main/resources/assets/betterend/models/block/flavolite_runed_active_1.json index 9ce2251a..1cb2bb14 100644 --- a/src/main/resources/assets/betterend/models/block/flavolite_runed_active_1.json +++ b/src/main/resources/assets/betterend/models/block/flavolite_runed_active_1.json @@ -1,23 +1,23 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/flavolite_polished", - "rune_1": "betterend:block/flavolite_runed_active_1", - "rune_2": "betterend:block/flavolite_runed_active_2", - "rune_3": "betterend:block/flavolite_runed_active_3" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } - } - } - ] +{ + "parent": "block/cube", + "textures": { + "particle": "betterend:block/flavolite_polished", + "rune_1": "betterend:block/flavolite_runed_active_1", + "rune_2": "betterend:block/flavolite_runed_active_2", + "rune_3": "betterend:block/flavolite_runed_active_3" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flavolite_runed_active_2.json b/src/main/resources/assets/betterend/models/block/flavolite_runed_active_2.json index cd2da68f..8a91fc95 100644 --- a/src/main/resources/assets/betterend/models/block/flavolite_runed_active_2.json +++ b/src/main/resources/assets/betterend/models/block/flavolite_runed_active_2.json @@ -1,23 +1,23 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/flavolite_polished", - "rune_1": "betterend:block/flavolite_runed_active_4", - "rune_2": "betterend:block/flavolite_runed_active_5", - "rune_3": "betterend:block/flavolite_runed_active_6" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } - } - } - ] +{ + "parent": "block/cube", + "textures": { + "particle": "betterend:block/flavolite_polished", + "rune_1": "betterend:block/flavolite_runed_active_4", + "rune_2": "betterend:block/flavolite_runed_active_5", + "rune_3": "betterend:block/flavolite_runed_active_6" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/flavolite_runed_active_3.json b/src/main/resources/assets/betterend/models/block/flavolite_runed_active_3.json index f275976e..e61f3cb4 100644 --- a/src/main/resources/assets/betterend/models/block/flavolite_runed_active_3.json +++ b/src/main/resources/assets/betterend/models/block/flavolite_runed_active_3.json @@ -1,23 +1,23 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "betterend:block/flavolite_polished", - "rune_1": "betterend:block/flavolite_runed_active_7", - "rune_2": "betterend:block/flavolite_runed_active_8", - "rune_3": "betterend:block/flavolite_runed_active_9" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } - } - } - ] +{ + "parent": "block/cube", + "textures": { + "particle": "betterend:block/flavolite_polished", + "rune_1": "betterend:block/flavolite_runed_active_7", + "rune_2": "betterend:block/flavolite_runed_active_8", + "rune_3": "betterend:block/flavolite_runed_active_9" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_1", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_2", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#rune_3", "cullface": "east" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_bottom.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_bottom.json index 2cddb558..1f334b9f 100644 --- a/src/main/resources/assets/betterend/models/block/infusion_pedestal_bottom.json +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_bottom.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_bottom", - "textures": { - "base": "betterend:block/infusion_pedestal_base", - "pillar": "betterend:block/infusion_pedestal_pillar", - "bottom": "betterend:block/infusion_pedestal_base" - } +{ + "parent": "betterend:block/pedestal_bottom", + "textures": { + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar", + "bottom": "betterend:block/infusion_pedestal_base" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_column.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_column.json index a14800d7..4c80a603 100644 --- a/src/main/resources/assets/betterend/models/block/infusion_pedestal_column.json +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_column.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_column", - "textures": { - "base": "betterend:block/infusion_pedestal_base", - "pillar": "betterend:block/infusion_pedestal_pillar", - "bottom": "betterend:block/infusion_pedestal_base" - } +{ + "parent": "betterend:block/pedestal_column", + "textures": { + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar", + "bottom": "betterend:block/infusion_pedestal_base" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_column_top.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_column_top.json index f934033d..e6f2eb72 100644 --- a/src/main/resources/assets/betterend/models/block/infusion_pedestal_column_top.json +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_column_top.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/pedestal_column_top", - "textures": { - "base": "betterend:block/infusion_pedestal_base", - "pillar": "betterend:block/infusion_pedestal_pillar" - } +{ + "parent": "betterend:block/pedestal_column_top", + "textures": { + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_default.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_default.json index 7e9504a0..0f8e398b 100644 --- a/src/main/resources/assets/betterend/models/block/infusion_pedestal_default.json +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_default.json @@ -1,73 +1,73 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "top": "betterend:block/infusion_pedestal_top", - "base": "betterend:block/infusion_pedestal_base", - "pillar": "betterend:block/infusion_pedestal_pillar", - "bottom": "betterend:block/infusion_pedestal_base", - "particle": "#base" - }, - "elements": [ - { - "__comment": "eye", - "from": [ 4, 15, 4 ], - "to": [ 12, 16, 12 ], - "faces": { - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "north": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, - "south": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, - "west": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, - "east": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" } - } - }, - { - "__comment": "basin_1", - "from": [ 0, 0, 0 ], - "to": [ 16, 3, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, - "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } - } - }, - { - "__comment": "basin_2", - "from": [ 2, 3, 2 ], - "to": [ 14, 4, 14 ], - "faces": { - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, - "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } - } - }, - { - "__comment": "pillar", - "from": [ 3, 4, 3 ], - "to": [ 13, 13, 13 ], - "faces": { - "north": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" } - } - }, - { - "__comment": "top", - "from": [ 1, 13, 1 ], - "to": [ 15, 15, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, - "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, - "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, - "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, - "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, - "east": { "uv": [ 15, 16, 1, 14 ], "texture": "#top" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "top": "betterend:block/infusion_pedestal_top", + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar", + "bottom": "betterend:block/infusion_pedestal_base", + "particle": "#base" + }, + "elements": [ + { + "__comment": "eye", + "from": [ 4, 15, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "south": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "west": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "east": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" } + } + }, + { + "__comment": "basin_1", + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } + } + }, + { + "__comment": "basin_2", + "from": [ 2, 3, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, + "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 4, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "north": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 4, 13, 13 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 1, 13, 1 ], + "to": [ 15, 15, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "east": { "uv": [ 15, 16, 1, 14 ], "texture": "#top" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_pillar.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_pillar.json index 268ab428..72e9c206 100644 --- a/src/main/resources/assets/betterend/models/block/infusion_pedestal_pillar.json +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_pillar.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/pedestal_pillar", - "textures": { - "pillar": "betterend:block/infusion_pedestal_pillar" - } +{ + "parent": "betterend:block/pedestal_pillar", + "textures": { + "pillar": "betterend:block/infusion_pedestal_pillar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/infusion_pedestal_top.json b/src/main/resources/assets/betterend/models/block/infusion_pedestal_top.json index 2cf01bb9..e63d0fc7 100644 --- a/src/main/resources/assets/betterend/models/block/infusion_pedestal_top.json +++ b/src/main/resources/assets/betterend/models/block/infusion_pedestal_top.json @@ -1,47 +1,47 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "top": "betterend:block/infusion_pedestal_top", - "base": "betterend:block/infusion_pedestal_base", - "pillar": "betterend:block/infusion_pedestal_pillar", - "particle": "#base" - }, - "elements": [ - { - "__comment": "eye", - "from": [ 4, 11, 4 ], - "to": [ 12, 12, 12 ], - "faces": { - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "north": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, - "south": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, - "west": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, - "east": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" } - } - }, - { - "__comment": "pillar", - "from": [ 3, 0, 3 ], - "to": [ 13, 9, 13 ], - "faces": { - "north": { "uv": [ 3, 0, 13, 9 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 0, 13, 9 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 0, 13, 9 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 0, 13, 9 ], "texture": "#pillar" } - } - }, - { - "__comment": "top", - "from": [ 1, 9, 1 ], - "to": [ 15, 11, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, - "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, - "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, - "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, - "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, - "east": { "uv": [ 15, 16, 1, 14 ], "texture": "#top" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "top": "betterend:block/infusion_pedestal_top", + "base": "betterend:block/infusion_pedestal_base", + "pillar": "betterend:block/infusion_pedestal_pillar", + "particle": "#base" + }, + "elements": [ + { + "__comment": "eye", + "from": [ 4, 11, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "south": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "west": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" }, + "east": { "uv": [ 4, 4, 12, 5 ], "texture": "#top" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 0, 3 ], + "to": [ 13, 9, 13 ], + "faces": { + "north": { "uv": [ 3, 0, 13, 9 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 0, 13, 9 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 0, 13, 9 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 0, 13, 9 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 1, 9, 1 ], + "to": [ 15, 11, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#top" }, + "east": { "uv": [ 15, 16, 1, 14 ], "texture": "#top" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fur.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fur.json index 3eff83e4..0f0d81d0 100644 --- a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fur.json +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_fur.json @@ -1,75 +1,75 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/mossy_glowshroom_fur", - "texture": "betterend:block/mossy_glowshroom_fur" - }, - "elements": [ - { - "__comment": "PlaneY1", - "from": [ 0, -0.001, -8 ], - "to": [ 16, 0, 8 ], - "rotation": { "origin": [ 0, 0, 8 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, 0, 8 ], - "to": [ 16, 0.001, 24 ], - "rotation": { "origin": [ 0, 0.000000954, 8 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY4", - "from": [ 8, -0.001, 0 ], - "to": [ 24, 0, 16 ], - "rotation": { "origin": [ 8, 0, 16 ], "axis": "z", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } - } - }, - { - "__comment": "PlaneY4", - "from": [ -8, 0, 2 ], - "to": [ 8, 0.001, 18 ], - "rotation": { "origin": [ 8, 0, 18 ], "axis": "z", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 } - } - }, - { - "__comment": "PlaneX6", - "from": [ 0, 0, -6.5 ], - "to": [ 0.001, 16, 16 ], - "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneX6", - "from": [ -6.5, 0, 15.999 ], - "to": [ 16, 16, 16 ], - "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/mossy_glowshroom_fur", + "texture": "betterend:block/mossy_glowshroom_fur" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, -0.001, -8 ], + "to": [ 16, 0, 8 ], + "rotation": { "origin": [ 0, 0, 8 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, 0, 8 ], + "to": [ 16, 0.001, 24 ], + "rotation": { "origin": [ 0, 0.000000954, 8 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 8, -0.001, 0 ], + "to": [ 24, 0, 16 ], + "rotation": { "origin": [ 8, 0, 16 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "PlaneY4", + "from": [ -8, 0, 2 ], + "to": [ 8, 0.001, 18 ], + "rotation": { "origin": [ 8, 0, 18 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneX6", + "from": [ 0, 0, -6.5 ], + "to": [ 0.001, 16, 16 ], + "rotation": { "origin": [ 0, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneX6", + "from": [ -6.5, 0, 15.999 ], + "to": [ 16, 16, 16 ], + "rotation": { "origin": [ 16, 16, 16 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/murkweed_01.json b/src/main/resources/assets/betterend/models/block/murkweed_01.json index 3855ff83..b0aae2ef 100644 --- a/src/main/resources/assets/betterend/models/block/murkweed_01.json +++ b/src/main/resources/assets/betterend/models/block/murkweed_01.json @@ -1,257 +1,257 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/murkweed", - "texture": "betterend:block/murkweed" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 2, 11, 2.5 ], - "to": [ 6, 15, 6.5 ], - "faces": { - "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 3, 15, 3.5 ], - "to": [ 5, 15.5, 5.5 ], - "faces": { - "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 2.5, 15.5, 3 ], - "to": [ 5.5, 16, 6 ], - "faces": { - "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, - "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, - "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 2, 0, 2 ], - "to": [ 2.001, 11, 8 ], - "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 6, 0, 2 ], - "to": [ 6.001, 11, 8 ], - "rotation": { "origin": [ 6, 0, 2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 10, 0, 1 ], - "to": [ 10.001, 8, 7 ], - "rotation": { "origin": [ 10, 0, 1 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, - "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 14, 0, 1 ], - "to": [ 14.001, 8, 7 ], - "rotation": { "origin": [ 14, 0, 1 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, - "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 6, 0, 7 ], - "to": [ 6.001, 9, 13 ], - "rotation": { "origin": [ 6, 0, 7 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 10, 0, 7 ], - "to": [ 10.001, 9, 13 ], - "rotation": { "origin": [ 10, 0, 7 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 0, 0, 10 ], - "to": [ 0.001, 5, 16 ], - "rotation": { "origin": [ 0, 0, 10 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 4, 0, 10 ], - "to": [ 4.001, 5, 16 ], - "rotation": { "origin": [ 4, 0, 10 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 11, 0, 11 ], - "to": [ 11.001, 7, 17 ], - "rotation": { "origin": [ 11, 0, 11 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 15, 0, 11 ], - "to": [ 15.001, 7, 17 ], - "rotation": { "origin": [ 15, 0, 11 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 6, 9, 7.5 ], - "to": [ 10, 13, 11.5 ], - "faces": { - "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 13, 8.5 ], - "to": [ 9, 13.5, 10.5 ], - "faces": { - "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 6.5, 13.5, 8 ], - "to": [ 9.5, 14, 11 ], - "faces": { - "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, - "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, - "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10.5, 8, 1.5 ], - "to": [ 13.5, 12, 4.5 ], - "faces": { - "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 11, 7, 11 ], - "to": [ 15, 11, 15 ], - "faces": { - "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 12, 11, 12 ], - "to": [ 14, 11.5, 14 ], - "faces": { - "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 11.5, 11.5, 11.5 ], - "to": [ 14.5, 12, 14.5 ], - "faces": { - "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, - "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, - "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 0.5, 5, 10.5 ], - "to": [ 3.5, 9, 13.5 ], - "faces": { - "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/murkweed", + "texture": "betterend:block/murkweed" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, 11, 2.5 ], + "to": [ 6, 15, 6.5 ], + "faces": { + "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 15, 3.5 ], + "to": [ 5, 15.5, 5.5 ], + "faces": { + "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2.5, 15.5, 3 ], + "to": [ 5.5, 16, 6 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 2, 0, 2 ], + "to": [ 2.001, 11, 8 ], + "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 6, 0, 2 ], + "to": [ 6.001, 11, 8 ], + "rotation": { "origin": [ 6, 0, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 1 ], + "to": [ 10.001, 8, 7 ], + "rotation": { "origin": [ 10, 0, 1 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 14, 0, 1 ], + "to": [ 14.001, 8, 7 ], + "rotation": { "origin": [ 14, 0, 1 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 6, 0, 7 ], + "to": [ 6.001, 9, 13 ], + "rotation": { "origin": [ 6, 0, 7 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 7 ], + "to": [ 10.001, 9, 13 ], + "rotation": { "origin": [ 10, 0, 7 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 0, 0, 10 ], + "to": [ 0.001, 5, 16 ], + "rotation": { "origin": [ 0, 0, 10 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 4, 0, 10 ], + "to": [ 4.001, 5, 16 ], + "rotation": { "origin": [ 4, 0, 10 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 11 ], + "to": [ 11.001, 7, 17 ], + "rotation": { "origin": [ 11, 0, 11 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 15, 0, 11 ], + "to": [ 15.001, 7, 17 ], + "rotation": { "origin": [ 15, 0, 11 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6, 9, 7.5 ], + "to": [ 10, 13, 11.5 ], + "faces": { + "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 13, 8.5 ], + "to": [ 9, 13.5, 10.5 ], + "faces": { + "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6.5, 13.5, 8 ], + "to": [ 9.5, 14, 11 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10.5, 8, 1.5 ], + "to": [ 13.5, 12, 4.5 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 7, 11 ], + "to": [ 15, 11, 15 ], + "faces": { + "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 12, 11, 12 ], + "to": [ 14, 11.5, 14 ], + "faces": { + "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11.5, 11.5, 11.5 ], + "to": [ 14.5, 12, 14.5 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0.5, 5, 10.5 ], + "to": [ 3.5, 9, 13.5 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/murkweed_02.json b/src/main/resources/assets/betterend/models/block/murkweed_02.json index b4e66e5a..51f3eab3 100644 --- a/src/main/resources/assets/betterend/models/block/murkweed_02.json +++ b/src/main/resources/assets/betterend/models/block/murkweed_02.json @@ -1,174 +1,174 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/murkweed", - "texture": "betterend:block/murkweed" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 6, 11, 6 ], - "to": [ 10, 15, 10 ], - "faces": { - "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 15, 7 ], - "to": [ 9, 15.5, 9 ], - "faces": { - "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, - "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 6.5, 15.5, 6.5 ], - "to": [ 9.5, 16, 9.5 ], - "faces": { - "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, - "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, - "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, - "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 6, 0, 5.5 ], - "to": [ 6.001, 11, 11.5 ], - "rotation": { "origin": [ 6, 0, 5.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 10, 0, 5.5 ], - "to": [ 10.001, 11, 11.5 ], - "rotation": { "origin": [ 10, 0, 5.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 10, 0, 1 ], - "to": [ 10.001, 8, 7 ], - "rotation": { "origin": [ 10, 0, 1 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, - "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 14, 0, 1 ], - "to": [ 14.001, 8, 7 ], - "rotation": { "origin": [ 14, 0, 1 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, - "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 0.5, 0, 1.5 ], - "to": [ 0.501, 5, 7.5 ], - "rotation": { "origin": [ 0.5, 0, 1.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 4.5, 0, 1.5 ], - "to": [ 4.501, 5, 7.5 ], - "rotation": { "origin": [ 4.5, 0, 1.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10.5, 8, 1.5 ], - "to": [ 13.5, 12, 4.5 ], - "faces": { - "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 5, 2 ], - "to": [ 4, 9, 5 ], - "faces": { - "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 5.5, 5, 12 ], - "to": [ 8.5, 9, 15 ], - "faces": { - "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 9, 0, 11.5 ], - "to": [ 9.001, 5, 17.5 ], - "rotation": { "origin": [ 9, 0, 11.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 5, 0, 11.5 ], - "to": [ 5.001, 5, 17.5 ], - "rotation": { "origin": [ 5, 0, 11.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/murkweed", + "texture": "betterend:block/murkweed" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 11, 6 ], + "to": [ 10, 15, 10 ], + "faces": { + "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 15, 7 ], + "to": [ 9, 15.5, 9 ], + "faces": { + "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6.5, 15.5, 6.5 ], + "to": [ 9.5, 16, 9.5 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 6, 0, 5.5 ], + "to": [ 6.001, 11, 11.5 ], + "rotation": { "origin": [ 6, 0, 5.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 5.5 ], + "to": [ 10.001, 11, 11.5 ], + "rotation": { "origin": [ 10, 0, 5.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 1 ], + "to": [ 10.001, 8, 7 ], + "rotation": { "origin": [ 10, 0, 1 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 14, 0, 1 ], + "to": [ 14.001, 8, 7 ], + "rotation": { "origin": [ 14, 0, 1 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 0.5, 0, 1.5 ], + "to": [ 0.501, 5, 7.5 ], + "rotation": { "origin": [ 0.5, 0, 1.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 4.5, 0, 1.5 ], + "to": [ 4.501, 5, 7.5 ], + "rotation": { "origin": [ 4.5, 0, 1.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10.5, 8, 1.5 ], + "to": [ 13.5, 12, 4.5 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 5, 2 ], + "to": [ 4, 9, 5 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 5.5, 5, 12 ], + "to": [ 8.5, 9, 15 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 9, 0, 11.5 ], + "to": [ 9.001, 5, 17.5 ], + "rotation": { "origin": [ 9, 0, 11.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 11.5 ], + "to": [ 5.001, 5, 17.5 ], + "rotation": { "origin": [ 5, 0, 11.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/murkweed_03.json b/src/main/resources/assets/betterend/models/block/murkweed_03.json index a2209221..f022a369 100644 --- a/src/main/resources/assets/betterend/models/block/murkweed_03.json +++ b/src/main/resources/assets/betterend/models/block/murkweed_03.json @@ -1,181 +1,181 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/murkweed", - "texture": "betterend:block/murkweed" - }, - "elements": [ - { - "__comment": "PlaneX4", - "from": [ 8.5, 0, 4.5 ], - "to": [ 8.501, 8, 10.5 ], - "rotation": { "origin": [ 8.5, 0, 4.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, - "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 12.5, 0, 4.5 ], - "to": [ 12.501, 8, 10.5 ], - "rotation": { "origin": [ 12.5, 0, 4.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, - "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 1.5, 0, 2.5 ], - "to": [ 1.501, 5, 8.5 ], - "rotation": { "origin": [ 1.5, 0, 2.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 5.5, 0, 2.5 ], - "to": [ 5.501, 5, 8.5 ], - "rotation": { "origin": [ 5.5, 0, 2.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 9, 8, 5 ], - "to": [ 12, 12, 8 ], - "faces": { - "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 5, 3 ], - "to": [ 5, 9, 6 ], - "faces": { - "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 5, 5, 11 ], - "to": [ 8, 9, 14 ], - "faces": { - "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 8.5, 0, 10.5 ], - "to": [ 8.501, 5, 16.5 ], - "rotation": { "origin": [ 8.5, 0, 10.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 4.5, 0, 10.5 ], - "to": [ 4.501, 5, 16.5 ], - "rotation": { "origin": [ 4.5, 0, 10.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 15, 0, 10.5 ], - "to": [ 15.001, 5, 16.5 ], - "rotation": { "origin": [ 15, 0, 10.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 11, 0, 10.5 ], - "to": [ 11.001, 5, 16.5 ], - "rotation": { "origin": [ 11, 0, 10.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 0, 0, 8 ], - "to": [ 0.001, 5, 14 ], - "rotation": { "origin": [ 0, 0, 8 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 4, 0, 8 ], - "to": [ 4.001, 5, 14 ], - "rotation": { "origin": [ 4, 0, 8 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 7, 0, 0.5 ], - "to": [ 7.001, 5, 6.5 ], - "rotation": { "origin": [ 7, 0, 0.5 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 11, 0, 0.5 ], - "to": [ 11.001, 5, 6.5 ], - "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/murkweed", + "texture": "betterend:block/murkweed" + }, + "elements": [ + { + "__comment": "PlaneX4", + "from": [ 8.5, 0, 4.5 ], + "to": [ 8.501, 8, 10.5 ], + "rotation": { "origin": [ 8.5, 0, 4.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 12.5, 0, 4.5 ], + "to": [ 12.501, 8, 10.5 ], + "rotation": { "origin": [ 12.5, 0, 4.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 1.5, 0, 2.5 ], + "to": [ 1.501, 5, 8.5 ], + "rotation": { "origin": [ 1.5, 0, 2.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5.5, 0, 2.5 ], + "to": [ 5.501, 5, 8.5 ], + "rotation": { "origin": [ 5.5, 0, 2.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 8, 5 ], + "to": [ 12, 12, 8 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 5, 3 ], + "to": [ 5, 9, 6 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 5, 11 ], + "to": [ 8, 9, 14 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 8.5, 0, 10.5 ], + "to": [ 8.501, 5, 16.5 ], + "rotation": { "origin": [ 8.5, 0, 10.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 4.5, 0, 10.5 ], + "to": [ 4.501, 5, 16.5 ], + "rotation": { "origin": [ 4.5, 0, 10.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 15, 0, 10.5 ], + "to": [ 15.001, 5, 16.5 ], + "rotation": { "origin": [ 15, 0, 10.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 10.5 ], + "to": [ 11.001, 5, 16.5 ], + "rotation": { "origin": [ 11, 0, 10.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 0, 0, 8 ], + "to": [ 0.001, 5, 14 ], + "rotation": { "origin": [ 0, 0, 8 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 4, 0, 8 ], + "to": [ 4.001, 5, 14 ], + "rotation": { "origin": [ 4, 0, 8 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 7, 0, 0.5 ], + "to": [ 7.001, 5, 6.5 ], + "rotation": { "origin": [ 7, 0, 0.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 5, 6.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/path.json b/src/main/resources/assets/betterend/models/block/path.json index 54cbb2a5..ccea6b87 100644 --- a/src/main/resources/assets/betterend/models/block/path.json +++ b/src/main/resources/assets/betterend/models/block/path.json @@ -1,18 +1,18 @@ -{ "parent": "block/block", - "textures": { - "particle": "#side" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 15, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, - "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "east" } - } - } - ] -} +{ "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 15, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/pedestal_bottom.json b/src/main/resources/assets/betterend/models/block/pedestal_bottom.json index a24eaad7..fd2dfea9 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_bottom.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_bottom.json @@ -1,44 +1,44 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "particle": "#base" - }, - "elements": [ - { - "__comment": "basin_1", - "from": [ 0, 0, 0 ], - "to": [ 16, 3, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, - "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } - } - }, - { - "__comment": "basin_2", - "from": [ 2, 3, 2 ], - "to": [ 14, 4, 14 ], - "faces": { - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, - "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } - } - }, - { - "__comment": "pillar", - "from": [ 3, 4, 3 ], - "to": [ 13, 16, 13 ], - "faces": { - "north": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#base" + }, + "elements": [ + { + "__comment": "basin_1", + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } + } + }, + { + "__comment": "basin_2", + "from": [ 2, 3, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, + "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 4, 3 ], + "to": [ 13, 16, 13 ], + "faces": { + "north": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 4, 13, 16 ], "texture": "#pillar" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_column.json b/src/main/resources/assets/betterend/models/block/pedestal_column.json index 08a6dc5c..305a43a9 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_column.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_column.json @@ -1,69 +1,69 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "particle": "#base" - }, - "elements": [ - { - "__comment": "basin_1", - "from": [ 0, 0, 0 ], - "to": [ 16, 3, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, - "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } - } - }, - { - "__comment": "basin_2", - "from": [ 2, 3, 2 ], - "to": [ 14, 4, 14 ], - "faces": { - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, - "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } - } - }, - { - "__comment": "pillar", - "from": [ 3, 4, 3 ], - "to": [ 13, 13, 13 ], - "faces": { - "north": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" } - } - }, - { - "__comment": "top", - "from": [ 2, 13, 2 ], - "to": [ 14, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#base" }, - "north": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, - "south": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, - "west": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, - "east": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" } - } - }, - { - "__comment": "top", - "from": [ 1, 14, 1 ], - "to": [ 15, 16, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, - "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#base", "cullface": "up" }, - "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, - "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, - "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, - "east": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#base" + }, + "elements": [ + { + "__comment": "basin_1", + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } + } + }, + { + "__comment": "basin_2", + "from": [ 2, 3, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, + "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 4, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "north": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 4, 13, 14 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 2, 13, 2 ], + "to": [ 14, 14, 14 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#base" }, + "north": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, + "south": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, + "west": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, + "east": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" } + } + }, + { + "__comment": "top", + "from": [ 1, 14, 1 ], + "to": [ 15, 16, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#base", "cullface": "up" }, + "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, + "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, + "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, + "east": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_column_top.json b/src/main/resources/assets/betterend/models/block/pedestal_column_top.json index 16722d25..879546d4 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_column_top.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_column_top.json @@ -1,44 +1,44 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "particle": "#base" - }, - "elements": [ - { - "__comment": "pillar", - "from": [ 3, 0, 3 ], - "to": [ 13, 13, 13 ], - "faces": { - "north": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" } - } - }, - { - "__comment": "top", - "from": [ 2, 13, 2 ], - "to": [ 14, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#base" }, - "north": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, - "south": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, - "west": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, - "east": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" } - } - }, - { - "__comment": "top", - "from": [ 1, 14, 1 ], - "to": [ 15, 16, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, - "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#base", "cullface": "up" }, - "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, - "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, - "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, - "east": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#base" + }, + "elements": [ + { + "__comment": "pillar", + "from": [ 3, 0, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "north": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 0, 13, 14 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 2, 13, 2 ], + "to": [ 14, 14, 14 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#base" }, + "north": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, + "south": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, + "west": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" }, + "east": { "uv": [ 2, 13, 14, 14 ], "texture": "#base" } + } + }, + { + "__comment": "top", + "from": [ 1, 14, 1 ], + "to": [ 15, 16, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#base", "cullface": "up" }, + "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, + "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, + "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, + "east": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_default.json b/src/main/resources/assets/betterend/models/block/pedestal_default.json index 43fdecb9..9968af11 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_default.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_default.json @@ -1,57 +1,57 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "particle": "#base" - }, - "elements": [ - { - "__comment": "basin_1", - "from": [ 0, 0, 0 ], - "to": [ 16, 3, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, - "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, - "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } - } - }, - { - "__comment": "basin_2", - "from": [ 2, 3, 2 ], - "to": [ 14, 4, 14 ], - "faces": { - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, - "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, - "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } - } - }, - { - "__comment": "pillar", - "from": [ 3, 4, 3 ], - "to": [ 13, 12, 13 ], - "faces": { - "north": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" } - } - }, - { - "__comment": "top", - "from": [ 1, 12, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, - "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, - "north": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, - "south": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, - "west": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, - "east": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#base" + }, + "elements": [ + { + "__comment": "basin_1", + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, + "north": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "south": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "west": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" }, + "east": { "uv": [ 0, 0, 16, 3 ], "texture": "#bottom" } + } + }, + { + "__comment": "basin_2", + "from": [ 2, 3, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom" }, + "north": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "south": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "west": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" }, + "east": { "uv": [ 3, 3, 14, 4 ], "texture": "#bottom" } + } + }, + { + "__comment": "pillar", + "from": [ 3, 4, 3 ], + "to": [ 13, 12, 13 ], + "faces": { + "north": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 4, 13, 12 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 1, 12, 1 ], + "to": [ 15, 14, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "south": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "west": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, + "east": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_pillar.json b/src/main/resources/assets/betterend/models/block/pedestal_pillar.json index dea3004c..05629772 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_pillar.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_pillar.json @@ -1,19 +1,19 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "particle": "#pillar" - }, - "elements": [ - { - "__comment": "pillar", - "from": [ 3, 0, 3 ], - "to": [ 13, 16, 13 ], - "faces": { - "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#pillar" + }, + "elements": [ + { + "__comment": "pillar", + "from": [ 3, 0, 3 ], + "to": [ 13, 16, 13 ], + "faces": { + "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#pillar" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/pedestal_top.json b/src/main/resources/assets/betterend/models/block/pedestal_top.json index 5a5343aa..6345e685 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_top.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_top.json @@ -1,32 +1,32 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "particle": "#base" - }, - "elements": [ - { - "__comment": "pillar", - "from": [ 3, 0, 3 ], - "to": [ 13, 8, 13 ], - "faces": { - "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" } - } - }, - { - "__comment": "top", - "from": [ 1, 8, 1 ], - "to": [ 15, 10, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, - "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, - "north": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, - "south": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, - "west": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, - "east": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#base" + }, + "elements": [ + { + "__comment": "pillar", + "from": [ 3, 0, 3 ], + "to": [ 13, 8, 13 ], + "faces": { + "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" } + } + }, + { + "__comment": "top", + "from": [ 1, 8, 1 ], + "to": [ 15, 10, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, + "north": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, + "south": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, + "west": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, + "east": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/plane_bottom.json b/src/main/resources/assets/betterend/models/block/plane_bottom.json index daca44a4..2feac88b 100644 --- a/src/main/resources/assets/betterend/models/block/plane_bottom.json +++ b/src/main/resources/assets/betterend/models/block/plane_bottom.json @@ -1,17 +1,17 @@ -{ - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "PlaneY1", - "from": [ 0, 0, 0 ], - "to": [ 16, 0.001, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - } - ] +{ + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 0, 0, 0 ], + "to": [ 16, 0.001, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purple_polypore_01.json b/src/main/resources/assets/betterend/models/block/purple_polypore_01.json index a257f601..8bab03a1 100644 --- a/src/main/resources/assets/betterend/models/block/purple_polypore_01.json +++ b/src/main/resources/assets/betterend/models/block/purple_polypore_01.json @@ -1,100 +1,100 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/purple_polypore", - "texture": "betterend:block/purple_polypore" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 0, 4, 0 ], - "to": [ 8, 7, 6 ], - "shade": false, - "faces": { - "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, - "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, - "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 11, 0 ], - "to": [ 15, 14, 6 ], - "shade": false, - "faces": { - "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, - "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, - "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 9, 1, 0 ], - "to": [ 15, 3, 6 ], - "shade": false, - "faces": { - "down": { "uv": [ 9, 10, 15, 16 ], "texture": "#texture" }, - "up": { "uv": [ 1, 0, 7, 6 ], "texture": "#texture" }, - "south": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, - "west": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, - "east": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 3, 8, 0 ], - "to": [ 9, 10, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, - "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, - "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 11, 6, 0 ], - "to": [ 15, 8, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 13, 0 ], - "to": [ 5, 15, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 1, 0 ], - "to": [ 6, 3, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/purple_polypore", + "texture": "betterend:block/purple_polypore" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 0, 4, 0 ], + "to": [ 8, 7, 6 ], + "shade": false, + "faces": { + "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 11, 0 ], + "to": [ 15, 14, 6 ], + "shade": false, + "faces": { + "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 1, 0 ], + "to": [ 15, 3, 6 ], + "shade": false, + "faces": { + "down": { "uv": [ 9, 10, 15, 16 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 6 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 8, 0 ], + "to": [ 9, 10, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 6, 0 ], + "to": [ 15, 8, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 13, 0 ], + "to": [ 5, 15, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 1, 0 ], + "to": [ 6, 3, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purple_polypore_02.json b/src/main/resources/assets/betterend/models/block/purple_polypore_02.json index 51501f73..442fe441 100644 --- a/src/main/resources/assets/betterend/models/block/purple_polypore_02.json +++ b/src/main/resources/assets/betterend/models/block/purple_polypore_02.json @@ -1,87 +1,87 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/purple_polypore", - "texture": "betterend:block/purple_polypore" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 2, 4, 0 ], - "to": [ 10, 7, 6 ], - "shade": false, - "faces": { - "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, - "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, - "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 8, 11, 0 ], - "to": [ 14, 13, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, - "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, - "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 9, 0 ], - "to": [ 5, 11, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 3, 13, 0 ], - "to": [ 7, 15, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10, 1, 0 ], - "to": [ 14, 3, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 11, 7, 0 ], - "to": [ 15, 9, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/purple_polypore", + "texture": "betterend:block/purple_polypore" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, 4, 0 ], + "to": [ 10, 7, 6 ], + "shade": false, + "faces": { + "down": { "uv": [ 8, 10, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 6 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 11, 0 ], + "to": [ 14, 13, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 9, 0 ], + "to": [ 5, 11, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 13, 0 ], + "to": [ 7, 15, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 1, 0 ], + "to": [ 14, 3, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 7, 0 ], + "to": [ 15, 9, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purple_polypore_03.json b/src/main/resources/assets/betterend/models/block/purple_polypore_03.json index 015017e8..e65be061 100644 --- a/src/main/resources/assets/betterend/models/block/purple_polypore_03.json +++ b/src/main/resources/assets/betterend/models/block/purple_polypore_03.json @@ -1,74 +1,74 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/purple_polypore", - "texture": "betterend:block/purple_polypore" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 2, 4, 0 ], - "to": [ 8, 6, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, - "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, - "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10, 12, 0 ], - "to": [ 14, 14, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 11, 0 ], - "to": [ 5, 13, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10, 2, 0 ], - "to": [ 14, 4, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 8, 0 ], - "to": [ 11, 10, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, - "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/purple_polypore", + "texture": "betterend:block/purple_polypore" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, 4, 0 ], + "to": [ 8, 6, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 10, 5, 16, 8 ], "texture": "#texture" }, + "up": { "uv": [ 1, 0, 7, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 12, 0 ], + "to": [ 14, 14, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 11, 0 ], + "to": [ 5, 13, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 2, 0 ], + "to": [ 14, 4, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 8, 0 ], + "to": [ 11, 10, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 11, 6, 15, 8 ], "texture": "#texture" }, + "up": { "uv": [ 2, 0, 6, 2 ], "texture": "#texture" }, + "south": { "uv": [ 2, 8, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 3, 8, 5, 10 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purpur_pedestal_bottom.json b/src/main/resources/assets/betterend/models/block/purpur_pedestal_bottom.json index a312e254..1d6898b5 100644 --- a/src/main/resources/assets/betterend/models/block/purpur_pedestal_bottom.json +++ b/src/main/resources/assets/betterend/models/block/purpur_pedestal_bottom.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_bottom", - "textures": { - "base": "minecraft:block/purpur_block", - "pillar": "minecraft:block/purpur_pillar", - "bottom": "minecraft:block/purpur_block" - } +{ + "parent": "betterend:block/pedestal_bottom", + "textures": { + "base": "minecraft:block/purpur_block", + "pillar": "minecraft:block/purpur_pillar", + "bottom": "minecraft:block/purpur_block" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purpur_pedestal_column.json b/src/main/resources/assets/betterend/models/block/purpur_pedestal_column.json index 55b0e077..d351df01 100644 --- a/src/main/resources/assets/betterend/models/block/purpur_pedestal_column.json +++ b/src/main/resources/assets/betterend/models/block/purpur_pedestal_column.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_column", - "textures": { - "base": "minecraft:block/purpur_block", - "pillar": "minecraft:block/purpur_pillar", - "bottom": "minecraft:block/purpur_block" - } +{ + "parent": "betterend:block/pedestal_column", + "textures": { + "base": "minecraft:block/purpur_block", + "pillar": "minecraft:block/purpur_pillar", + "bottom": "minecraft:block/purpur_block" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purpur_pedestal_column_top.json b/src/main/resources/assets/betterend/models/block/purpur_pedestal_column_top.json index 4a16ceaa..571b5fcb 100644 --- a/src/main/resources/assets/betterend/models/block/purpur_pedestal_column_top.json +++ b/src/main/resources/assets/betterend/models/block/purpur_pedestal_column_top.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/pedestal_column_top", - "textures": { - "base": "minecraft:block/purpur_block", - "pillar": "minecraft:block/purpur_pillar" - } +{ + "parent": "betterend:block/pedestal_column_top", + "textures": { + "base": "minecraft:block/purpur_block", + "pillar": "minecraft:block/purpur_pillar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purpur_pedestal_default.json b/src/main/resources/assets/betterend/models/block/purpur_pedestal_default.json index c8834f74..935f27bf 100644 --- a/src/main/resources/assets/betterend/models/block/purpur_pedestal_default.json +++ b/src/main/resources/assets/betterend/models/block/purpur_pedestal_default.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "minecraft:block/purpur_pillar_top", - "base": "minecraft:block/purpur_block", - "pillar": "minecraft:block/purpur_pillar", - "bottom": "minecraft:block/purpur_block" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "minecraft:block/purpur_pillar_top", + "base": "minecraft:block/purpur_block", + "pillar": "minecraft:block/purpur_pillar", + "bottom": "minecraft:block/purpur_block" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purpur_pedestal_pillar.json b/src/main/resources/assets/betterend/models/block/purpur_pedestal_pillar.json index e769042c..f53c1710 100644 --- a/src/main/resources/assets/betterend/models/block/purpur_pedestal_pillar.json +++ b/src/main/resources/assets/betterend/models/block/purpur_pedestal_pillar.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/pedestal_pillar", - "textures": { - "pillar": "minecraft:block/purpur_pillar" - } +{ + "parent": "betterend:block/pedestal_pillar", + "textures": { + "pillar": "minecraft:block/purpur_pillar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/purpur_pedestal_top.json b/src/main/resources/assets/betterend/models/block/purpur_pedestal_top.json index bcfa3e59..2e4914fc 100644 --- a/src/main/resources/assets/betterend/models/block/purpur_pedestal_top.json +++ b/src/main/resources/assets/betterend/models/block/purpur_pedestal_top.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "minecraft:block/purpur_pillar_top", - "base": "minecraft:block/purpur_block", - "pillar": "minecraft:block/purpur_pillar" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "minecraft:block/purpur_pillar_top", + "base": "minecraft:block/purpur_block", + "pillar": "minecraft:block/purpur_pillar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/quartz_pedestal_bottom.json b/src/main/resources/assets/betterend/models/block/quartz_pedestal_bottom.json index 49fd5941..2b287638 100644 --- a/src/main/resources/assets/betterend/models/block/quartz_pedestal_bottom.json +++ b/src/main/resources/assets/betterend/models/block/quartz_pedestal_bottom.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_bottom", - "textures": { - "base": "minecraft:block/quartz_block_side", - "pillar": "minecraft:block/quartz_pillar", - "bottom": "minecraft:block/quartz_block_bottom" - } +{ + "parent": "betterend:block/pedestal_bottom", + "textures": { + "base": "minecraft:block/quartz_block_side", + "pillar": "minecraft:block/quartz_pillar", + "bottom": "minecraft:block/quartz_block_bottom" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/quartz_pedestal_column.json b/src/main/resources/assets/betterend/models/block/quartz_pedestal_column.json index 967bba09..0e94749c 100644 --- a/src/main/resources/assets/betterend/models/block/quartz_pedestal_column.json +++ b/src/main/resources/assets/betterend/models/block/quartz_pedestal_column.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_column", - "textures": { - "base": "minecraft:block/quartz_block_side", - "pillar": "minecraft:block/quartz_pillar", - "bottom": "minecraft:block/quartz_block_bottom" - } +{ + "parent": "betterend:block/pedestal_column", + "textures": { + "base": "minecraft:block/quartz_block_side", + "pillar": "minecraft:block/quartz_pillar", + "bottom": "minecraft:block/quartz_block_bottom" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/quartz_pedestal_column_top.json b/src/main/resources/assets/betterend/models/block/quartz_pedestal_column_top.json index 5617fdd5..8bb7d80a 100644 --- a/src/main/resources/assets/betterend/models/block/quartz_pedestal_column_top.json +++ b/src/main/resources/assets/betterend/models/block/quartz_pedestal_column_top.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/pedestal_column_top", - "textures": { - "base": "minecraft:block/quartz_block_side", - "pillar": "minecraft:block/quartz_pillar" - } +{ + "parent": "betterend:block/pedestal_column_top", + "textures": { + "base": "minecraft:block/quartz_block_side", + "pillar": "minecraft:block/quartz_pillar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/quartz_pedestal_default.json b/src/main/resources/assets/betterend/models/block/quartz_pedestal_default.json index 8bf589fb..5c21a246 100644 --- a/src/main/resources/assets/betterend/models/block/quartz_pedestal_default.json +++ b/src/main/resources/assets/betterend/models/block/quartz_pedestal_default.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "minecraft:block/quartz_pillar_top", - "base": "minecraft:block/quartz_block_side", - "pillar": "minecraft:block/quartz_pillar", - "bottom": "minecraft:block/quartz_block_bottom" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "minecraft:block/quartz_pillar_top", + "base": "minecraft:block/quartz_block_side", + "pillar": "minecraft:block/quartz_pillar", + "bottom": "minecraft:block/quartz_block_bottom" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/quartz_pedestal_pillar.json b/src/main/resources/assets/betterend/models/block/quartz_pedestal_pillar.json index b3437682..44479d29 100644 --- a/src/main/resources/assets/betterend/models/block/quartz_pedestal_pillar.json +++ b/src/main/resources/assets/betterend/models/block/quartz_pedestal_pillar.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/pedestal_pillar", - "textures": { - "pillar": "minecraft:block/quartz_pillar" - } +{ + "parent": "betterend:block/pedestal_pillar", + "textures": { + "pillar": "minecraft:block/quartz_pillar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/quartz_pedestal_top.json b/src/main/resources/assets/betterend/models/block/quartz_pedestal_top.json index 3866e7d7..c7e59c22 100644 --- a/src/main/resources/assets/betterend/models/block/quartz_pedestal_top.json +++ b/src/main/resources/assets/betterend/models/block/quartz_pedestal_top.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "minecraft:block/quartz_pillar_top", - "base": "minecraft:block/quartz_block_side", - "pillar": "minecraft:block/quartz_pillar" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "minecraft:block/quartz_pillar_top", + "base": "minecraft:block/quartz_block_side", + "pillar": "minecraft:block/quartz_pillar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/shadow_berry_01.json b/src/main/resources/assets/betterend/models/block/shadow_berry_01.json index d0c273d2..9a8ad052 100644 --- a/src/main/resources/assets/betterend/models/block/shadow_berry_01.json +++ b/src/main/resources/assets/betterend/models/block/shadow_berry_01.json @@ -1,19 +1,19 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/shadow_berry", - "texture": "betterend:block/shadow_berry", - "texture1": "betterend:block/shadow_berry_leaves" - }, - "elements": [ - { - "__comment": "PlaneY4", - "from": [ 0, 0.5, 0 ], - "to": [ 16, 0.501, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/shadow_berry", + "texture": "betterend:block/shadow_berry", + "texture1": "betterend:block/shadow_berry_leaves" + }, + "elements": [ + { + "__comment": "PlaneY4", + "from": [ 0, 0.5, 0 ], + "to": [ 16, 0.501, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/shadow_berry_02.json b/src/main/resources/assets/betterend/models/block/shadow_berry_02.json index 459394e2..ef6acf7f 100644 --- a/src/main/resources/assets/betterend/models/block/shadow_berry_02.json +++ b/src/main/resources/assets/betterend/models/block/shadow_berry_02.json @@ -1,45 +1,45 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/shadow_berry", - "texture": "betterend:block/shadow_berry", - "texture1": "betterend:block/shadow_berry_leaves" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 3, 0, 3 ], - "to": [ 7, 4, 7 ], - "faces": { - "down": { "uv": [ 10, 10, 14, 14 ], "texture": "#texture" }, - "up": { "uv": [ 8.5, 0.5, 12.5, 4.5 ], "texture": "#texture" }, - "north": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, - "south": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, - "west": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 11.5, 0, 6.5 ], - "to": [ 14.5, 3, 9.5 ], - "faces": { - "down": { "uv": [ 12, 12, 15, 15 ], "texture": "#texture" }, - "up": { "uv": [ 9, 1, 12, 4 ], "texture": "#texture" }, - "north": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, - "south": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, - "west": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, - "east": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY4", - "from": [ 0, 0.5, 0 ], - "to": [ 16, 0.501, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/shadow_berry", + "texture": "betterend:block/shadow_berry", + "texture1": "betterend:block/shadow_berry_leaves" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 0, 3 ], + "to": [ 7, 4, 7 ], + "faces": { + "down": { "uv": [ 10, 10, 14, 14 ], "texture": "#texture" }, + "up": { "uv": [ 8.5, 0.5, 12.5, 4.5 ], "texture": "#texture" }, + "north": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "south": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "east": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11.5, 0, 6.5 ], + "to": [ 14.5, 3, 9.5 ], + "faces": { + "down": { "uv": [ 12, 12, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 12, 4 ], "texture": "#texture" }, + "north": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "south": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "west": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "east": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 0, 0.5, 0 ], + "to": [ 16, 0.501, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/shadow_berry_03.json b/src/main/resources/assets/betterend/models/block/shadow_berry_03.json index c20ce75d..09a96af2 100644 --- a/src/main/resources/assets/betterend/models/block/shadow_berry_03.json +++ b/src/main/resources/assets/betterend/models/block/shadow_berry_03.json @@ -1,58 +1,58 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/shadow_berry", - "texture": "betterend:block/shadow_berry", - "texture1": "betterend:block/shadow_berry_leaves" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 2, 0, 2 ], - "to": [ 8, 6, 8 ], - "faces": { - "down": { "uv": [ 9, 9, 15, 15 ], "texture": "#texture" }, - "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, - "north": { "uv": [ 1, 10, 7, 16 ], "texture": "#texture" }, - "south": { "uv": [ 1, 10, 7, 16 ], "texture": "#texture" }, - "west": { "uv": [ 1, 10, 7, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 10, 7, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 11, 0, 6 ], - "to": [ 15, 4, 10 ], - "faces": { - "down": { "uv": [ 10, 10, 14, 14 ], "texture": "#texture" }, - "up": { "uv": [ 8.5, 0.5, 12.5, 4.5 ], "texture": "#texture" }, - "north": { "uv": [ 1, 11, 5, 15 ], "texture": "#texture" }, - "south": { "uv": [ 1, 11, 5, 15 ], "texture": "#texture" }, - "west": { "uv": [ 1, 11, 5, 15 ], "texture": "#texture" }, - "east": { "uv": [ 1, 11, 5, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 4, 0, 11 ], - "to": [ 7, 3, 14 ], - "faces": { - "down": { "uv": [ 12, 12, 15, 15 ], "texture": "#texture" }, - "up": { "uv": [ 9, 1, 12, 4 ], "texture": "#texture" }, - "north": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, - "south": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, - "west": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, - "east": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY4", - "from": [ 0, 0.5, 0 ], - "to": [ 16, 0.501, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/shadow_berry", + "texture": "betterend:block/shadow_berry", + "texture1": "betterend:block/shadow_berry_leaves" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, 0, 2 ], + "to": [ 8, 6, 8 ], + "faces": { + "down": { "uv": [ 9, 9, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, + "north": { "uv": [ 1, 10, 7, 16 ], "texture": "#texture" }, + "south": { "uv": [ 1, 10, 7, 16 ], "texture": "#texture" }, + "west": { "uv": [ 1, 10, 7, 16 ], "texture": "#texture" }, + "east": { "uv": [ 1, 10, 7, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 0, 6 ], + "to": [ 15, 4, 10 ], + "faces": { + "down": { "uv": [ 10, 10, 14, 14 ], "texture": "#texture" }, + "up": { "uv": [ 8.5, 0.5, 12.5, 4.5 ], "texture": "#texture" }, + "north": { "uv": [ 1, 11, 5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 1, 11, 5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 1, 11, 5, 15 ], "texture": "#texture" }, + "east": { "uv": [ 1, 11, 5, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 0, 11 ], + "to": [ 7, 3, 14 ], + "faces": { + "down": { "uv": [ 12, 12, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 12, 4 ], "texture": "#texture" }, + "north": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "south": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "west": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "east": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 0, 0.5, 0 ], + "to": [ 16, 0.501, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/shadow_berry_04.json b/src/main/resources/assets/betterend/models/block/shadow_berry_04.json index b25f9619..45dc8db5 100644 --- a/src/main/resources/assets/betterend/models/block/shadow_berry_04.json +++ b/src/main/resources/assets/betterend/models/block/shadow_berry_04.json @@ -1,58 +1,58 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/shadow_berry", - "texture": "betterend:block/shadow_berry", - "texture1": "betterend:block/shadow_berry_leaves" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 1, 0, 1 ], - "to": [ 9, 8, 9 ], - "faces": { - "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 10, 0, 5 ], - "to": [ 16, 6, 11 ], - "faces": { - "down": { "uv": [ 9, 9, 15, 15 ], "texture": "#texture" }, - "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, - "north": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 3, 0, 10 ], - "to": [ 8, 5, 15 ], - "faces": { - "down": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 8, 0, 13, 5 ], "texture": "#texture" }, - "north": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, - "south": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, - "east": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneY4", - "from": [ 0, 0.5, 0 ], - "to": [ 16, 0.501, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/shadow_berry", + "texture": "betterend:block/shadow_berry", + "texture1": "betterend:block/shadow_berry_leaves" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 0, 1 ], + "to": [ 9, 8, 9 ], + "faces": { + "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, + "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 5 ], + "to": [ 16, 6, 11 ], + "faces": { + "down": { "uv": [ 9, 9, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 10 ], + "to": [ 8, 5, 15 ], + "faces": { + "down": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 13, 5 ], "texture": "#texture" }, + "north": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 0, 0.5, 0 ], + "to": [ 16, 0.501, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/sided_door_bottom.json b/src/main/resources/assets/betterend/models/block/sided_door_bottom.json index 6fddf595..74a317b7 100644 --- a/src/main/resources/assets/betterend/models/block/sided_door_bottom.json +++ b/src/main/resources/assets/betterend/models/block/sided_door_bottom.json @@ -1,18 +1,18 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#facade" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 3, 16, 16 ], - "faces": { - "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#side", "cullface": "down" }, - "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#facade", "cullface": "west" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#facade" } - } - } - ] -} +{ + "ambientocclusion": false, + "textures": { + "particle": "#facade" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 3, 16, 16 ], + "faces": { + "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#side", "cullface": "down" }, + "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#facade", "cullface": "west" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#facade" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/sided_door_bottom_rh.json b/src/main/resources/assets/betterend/models/block/sided_door_bottom_rh.json index e6294d19..bb1b8e10 100644 --- a/src/main/resources/assets/betterend/models/block/sided_door_bottom_rh.json +++ b/src/main/resources/assets/betterend/models/block/sided_door_bottom_rh.json @@ -1,18 +1,18 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#facade" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 3, 16, 16 ], - "faces": { - "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#side", "cullface": "down" }, - "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#facade", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#facade" } - } - } - ] -} +{ + "ambientocclusion": false, + "textures": { + "particle": "#facade" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 3, 16, 16 ], + "faces": { + "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#side", "cullface": "down" }, + "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#facade", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#facade" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/sided_door_top.json b/src/main/resources/assets/betterend/models/block/sided_door_top.json index 4a646108..fc8a7feb 100644 --- a/src/main/resources/assets/betterend/models/block/sided_door_top.json +++ b/src/main/resources/assets/betterend/models/block/sided_door_top.json @@ -1,18 +1,18 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#facade" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 3, 16, 16 ], - "faces": { - "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#side", "cullface": "up" }, - "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#facade", "cullface": "west" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#facade" } - } - } - ] -} +{ + "ambientocclusion": false, + "textures": { + "particle": "#facade" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 3, 16, 16 ], + "faces": { + "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#side", "cullface": "up" }, + "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#facade", "cullface": "west" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#facade" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/sided_door_top_rh.json b/src/main/resources/assets/betterend/models/block/sided_door_top_rh.json index c706fe16..2d3ebea9 100644 --- a/src/main/resources/assets/betterend/models/block/sided_door_top_rh.json +++ b/src/main/resources/assets/betterend/models/block/sided_door_top_rh.json @@ -1,18 +1,18 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#facade" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 3, 16, 16 ], - "faces": { - "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#side", "cullface": "up" }, - "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#facade", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#facade" } - } - } - ] -} +{ + "ambientocclusion": false, + "textures": { + "particle": "#facade" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 3, 16, 16 ], + "faces": { + "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#side", "cullface": "up" }, + "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#facade", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#facade" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/sided_trapdoor.json b/src/main/resources/assets/betterend/models/block/sided_trapdoor.json index 9f776427..e1f09a7b 100644 --- a/src/main/resources/assets/betterend/models/block/sided_trapdoor.json +++ b/src/main/resources/assets/betterend/models/block/sided_trapdoor.json @@ -1,18 +1,18 @@ -{ "parent": "block/thin_block", - "textures": { - "particle": "#texture" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 3, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 16, 0, 13, 16 ], "texture": "#side", "cullface": "north", "rotation": 90 }, - "south": { "uv": [ 16, 0, 13, 16 ], "texture": "#side", "cullface": "south", "rotation": 90 }, - "west": { "uv": [ 16, 0, 13, 16 ], "texture": "#side", "cullface": "west", "rotation": 90 }, - "east": { "uv": [ 16, 0, 13, 16 ], "texture": "#side", "cullface": "east", "rotation": 90 } - } - } - ] -} +{ "parent": "block/thin_block", + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 16, 0, 13, 16 ], "texture": "#side", "cullface": "north", "rotation": 90 }, + "south": { "uv": [ 16, 0, 13, 16 ], "texture": "#side", "cullface": "south", "rotation": 90 }, + "west": { "uv": [ 16, 0, 13, 16 ], "texture": "#side", "cullface": "west", "rotation": 90 }, + "east": { "uv": [ 16, 0, 13, 16 ], "texture": "#side", "cullface": "east", "rotation": 90 } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/test_pillar_top.json b/src/main/resources/assets/betterend/models/block/test_pillar_top.json index 1d2c1780..4edca483 100644 --- a/src/main/resources/assets/betterend/models/block/test_pillar_top.json +++ b/src/main/resources/assets/betterend/models/block/test_pillar_top.json @@ -1,32 +1,32 @@ -{ - "parent": "minecraft:block/block", - "textures": { - "particle": "#side" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 1, 5, 1 ], - "to": [ 15, 8, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#texture" }, - "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#rune" }, - "north": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, - "south": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, - "west": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, - "east": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" } - } - }, - { - "__comment": "Box1", - "from": [ 3, 0, 3 ], - "to": [ 13, 5, 13 ], - "faces": { - "north": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" } - } - } - ] +{ + "parent": "minecraft:block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 5, 1 ], + "to": [ 15, 8, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#rune" }, + "north": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, + "south": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, + "west": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" }, + "east": { "uv": [ 1, 8, 15, 11 ], "texture": "#side" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 3 ], + "to": [ 13, 5, 13 ], + "faces": { + "north": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 11, 13, 16 ], "texture": "#pillar" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/tint_cube.json b/src/main/resources/assets/betterend/models/block/tint_cube.json index f65b5c05..f0334caf 100644 --- a/src/main/resources/assets/betterend/models/block/tint_cube.json +++ b/src/main/resources/assets/betterend/models/block/tint_cube.json @@ -1,21 +1,21 @@ -{ - "parent": "block/block", - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down", "tintindex": 0 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "up", "tintindex": 0 }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "north", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "south", "tintindex": 0 }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "west", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "east", "tintindex": 0 } - } - } - ] +{ + "parent": "block/block", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "up", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "north", "tintindex": 0 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "south", "tintindex": 0 }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "west", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "east", "tintindex": 0 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/tint_cube_noshade.json b/src/main/resources/assets/betterend/models/block/tint_cube_noshade.json index 2b600c49..8b832bb4 100644 --- a/src/main/resources/assets/betterend/models/block/tint_cube_noshade.json +++ b/src/main/resources/assets/betterend/models/block/tint_cube_noshade.json @@ -1,22 +1,22 @@ -{ - "parent": "block/block", - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down", "tintindex": 0 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "up", "tintindex": 0 }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "north", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "south", "tintindex": 0 }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "west", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "east", "tintindex": 0 } - } - } - ] +{ + "parent": "block/block", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "up", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "north", "tintindex": 0 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "south", "tintindex": 0 }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "west", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "east", "tintindex": 0 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/umbrella_moss_bottom.json b/src/main/resources/assets/betterend/models/block/umbrella_moss_bottom.json index f637005b..08a06bfa 100644 --- a/src/main/resources/assets/betterend/models/block/umbrella_moss_bottom.json +++ b/src/main/resources/assets/betterend/models/block/umbrella_moss_bottom.json @@ -1,75 +1,75 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/umbrella_moss_bottom", - "texture": "betterend:block/umbrella_moss_bottom" - }, - "elements": [ - { - "__comment": "PlaneX3", - "from": [ -2, 0, -2 ], - "to": [ -1.999, 16, 14 ], - "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 9.5, 0, -2 ], - "to": [ 9.501, 16, 14 ], - "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 6, 0, 3 ], - "to": [ 6.001, 16, 19 ], - "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 17.5, 0, 3 ], - "to": [ 17.501, 16, 19 ], - "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -1, 0, 6 ], - "to": [ -0.999, 16, 22 ], - "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 10.5, 0, 6 ], - "to": [ 10.501, 16, 22 ], - "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/umbrella_moss_bottom", + "texture": "betterend:block/umbrella_moss_bottom" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ -2, 0, -2 ], + "to": [ -1.999, 16, 14 ], + "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 9.5, 0, -2 ], + "to": [ 9.501, 16, 14 ], + "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 6, 0, 3 ], + "to": [ 6.001, 16, 19 ], + "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 17.5, 0, 3 ], + "to": [ 17.501, 16, 19 ], + "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -1, 0, 6 ], + "to": [ -0.999, 16, 22 ], + "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 10.5, 0, 6 ], + "to": [ 10.501, 16, 22 ], + "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/umbrella_moss_small.json b/src/main/resources/assets/betterend/models/block/umbrella_moss_small.json index 99c195c7..9d39b0b2 100644 --- a/src/main/resources/assets/betterend/models/block/umbrella_moss_small.json +++ b/src/main/resources/assets/betterend/models/block/umbrella_moss_small.json @@ -1,238 +1,238 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/umbrella_moss_up", - "texture": "betterend:block/umbrella_moss_up", - "spore": "betterend:block/umbrella_moss_sporophyte", - "small": "betterend:block/umbrella_moss_small" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 3, 13, 3 ], - "to": [ 5, 16, 5 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 11, 12, 8 ], - "to": [ 13, 15, 10 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 4, 11, 11 ], - "to": [ 6, 14, 13 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 12, 1 ], - "to": [ 7, 14, 7 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -2, 0, -2 ], - "to": [ -1.999, 13, 14 ], - "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 9.5, 0, -2 ], - "to": [ 9.501, 13, 14 ], - "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 14, 7 ], - "to": [ 1, 12, 1 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 9, 11, 6 ], - "to": [ 15, 13, 12 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 6, 0, 3 ], - "to": [ 6.001, 12, 19 ], - "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 17.5, 0, 3 ], - "to": [ 17.501, 12, 19 ], - "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 15, 13, 12 ], - "to": [ 9, 11, 6 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 10, 9 ], - "to": [ 8, 12, 15 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -1, 0, 6 ], - "to": [ -0.999, 11, 22 ], - "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 10.5, 0, 6 ], - "to": [ 10.501, 11, 22 ], - "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 8, 12, 15 ], - "to": [ 2, 10, 9 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneY16", - "from": [ 0, 0, 9 ], - "to": [ 16, 0.001, 25 ], - "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 } - } - }, - { - "__comment": "PlaneY16", - "from": [ 0, -0.001, -9 ], - "to": [ 16, 0, 7 ], - "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" } - } - }, - { - "__comment": "PlaneY18", - "from": [ 9, 0, 0 ], - "to": [ 25, 0.001, 16 ], - "rotation": { "origin": [ 9, 0, 0 ], "axis": "z", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 } - } - }, - { - "__comment": "PlaneY18", - "from": [ -9, -0.001, 0 ], - "to": [ 7, 0, 16 ], - "rotation": { "origin": [ 7, 0, 0 ], "axis": "z", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/umbrella_moss_up", + "texture": "betterend:block/umbrella_moss_up", + "spore": "betterend:block/umbrella_moss_sporophyte", + "small": "betterend:block/umbrella_moss_small" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 13, 3 ], + "to": [ 5, 16, 5 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 12, 8 ], + "to": [ 13, 15, 10 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 11, 11 ], + "to": [ 6, 14, 13 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 12, 1 ], + "to": [ 7, 14, 7 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -2, 0, -2 ], + "to": [ -1.999, 13, 14 ], + "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 9.5, 0, -2 ], + "to": [ 9.501, 13, 14 ], + "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 14, 7 ], + "to": [ 1, 12, 1 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 11, 6 ], + "to": [ 15, 13, 12 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 6, 0, 3 ], + "to": [ 6.001, 12, 19 ], + "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 17.5, 0, 3 ], + "to": [ 17.501, 12, 19 ], + "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 15, 13, 12 ], + "to": [ 9, 11, 6 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 10, 9 ], + "to": [ 8, 12, 15 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -1, 0, 6 ], + "to": [ -0.999, 11, 22 ], + "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 10.5, 0, 6 ], + "to": [ 10.501, 11, 22 ], + "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 12, 15 ], + "to": [ 2, 10, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY16", + "from": [ 0, 0, 9 ], + "to": [ 16, 0.001, 25 ], + "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 } + } + }, + { + "__comment": "PlaneY16", + "from": [ 0, -0.001, -9 ], + "to": [ 16, 0, 7 ], + "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" } + } + }, + { + "__comment": "PlaneY18", + "from": [ 9, 0, 0 ], + "to": [ 25, 0.001, 16 ], + "rotation": { "origin": [ 9, 0, 0 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 } + } + }, + { + "__comment": "PlaneY18", + "from": [ -9, -0.001, 0 ], + "to": [ 7, 0, 16 ], + "rotation": { "origin": [ 7, 0, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/umbrella_moss_small_2.json b/src/main/resources/assets/betterend/models/block/umbrella_moss_small_2.json index 65d40c42..b948e407 100644 --- a/src/main/resources/assets/betterend/models/block/umbrella_moss_small_2.json +++ b/src/main/resources/assets/betterend/models/block/umbrella_moss_small_2.json @@ -1,200 +1,200 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/umbrella_moss_up", - "texture": "betterend:block/umbrella_moss_up", - "spore": "betterend:block/umbrella_moss_sporophyte", - "small": "betterend:block/umbrella_moss_small", - "end": "betterend:block/umbrella_moss_end" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 3, 13, 3 ], - "to": [ 5, 16, 5 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 4, 11, 11 ], - "to": [ 6, 14, 13 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 12, 1 ], - "to": [ 7, 14, 7 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -2, 0, -2 ], - "to": [ -1.999, 13, 14 ], - "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 9.5, 0, -2 ], - "to": [ 9.501, 13, 14 ], - "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 14, 7 ], - "to": [ 1, 12, 1 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 6, 0, 3 ], - "to": [ 6.001, 13, 19 ], - "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 17.5, 0, 3 ], - "to": [ 17.501, 13, 19 ], - "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 10, 9 ], - "to": [ 8, 12, 15 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -1, 0, 6 ], - "to": [ -0.999, 11, 22 ], - "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 10.5, 0, 6 ], - "to": [ 10.501, 11, 22 ], - "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 8, 12, 15 ], - "to": [ 2, 10, 9 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneY16", - "from": [ 0, 0, 9 ], - "to": [ 16, 0.001, 25 ], - "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 } - } - }, - { - "__comment": "PlaneY16", - "from": [ 0, -0.001, -9 ], - "to": [ 16, 0, 7 ], - "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" } - } - }, - { - "__comment": "PlaneY18", - "from": [ 9, 0, 0 ], - "to": [ 25, 0.001, 16 ], - "rotation": { "origin": [ 9, 0, 0 ], "axis": "z", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 } - } - }, - { - "__comment": "PlaneY18", - "from": [ -9, -0.001, 0 ], - "to": [ 7, 0, 16 ], - "rotation": { "origin": [ 7, 0, 0 ], "axis": "z", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/umbrella_moss_up", + "texture": "betterend:block/umbrella_moss_up", + "spore": "betterend:block/umbrella_moss_sporophyte", + "small": "betterend:block/umbrella_moss_small", + "end": "betterend:block/umbrella_moss_end" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 13, 3 ], + "to": [ 5, 16, 5 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 11, 11 ], + "to": [ 6, 14, 13 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 12, 1 ], + "to": [ 7, 14, 7 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -2, 0, -2 ], + "to": [ -1.999, 13, 14 ], + "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 9.5, 0, -2 ], + "to": [ 9.501, 13, 14 ], + "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 14, 7 ], + "to": [ 1, 12, 1 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 6, 0, 3 ], + "to": [ 6.001, 13, 19 ], + "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 17.5, 0, 3 ], + "to": [ 17.501, 13, 19 ], + "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 10, 9 ], + "to": [ 8, 12, 15 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -1, 0, 6 ], + "to": [ -0.999, 11, 22 ], + "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 10.5, 0, 6 ], + "to": [ 10.501, 11, 22 ], + "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 12, 15 ], + "to": [ 2, 10, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY16", + "from": [ 0, 0, 9 ], + "to": [ 16, 0.001, 25 ], + "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 } + } + }, + { + "__comment": "PlaneY16", + "from": [ 0, -0.001, -9 ], + "to": [ 16, 0, 7 ], + "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" } + } + }, + { + "__comment": "PlaneY18", + "from": [ 9, 0, 0 ], + "to": [ 25, 0.001, 16 ], + "rotation": { "origin": [ 9, 0, 0 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 } + } + }, + { + "__comment": "PlaneY18", + "from": [ -9, -0.001, 0 ], + "to": [ 7, 0, 16 ], + "rotation": { "origin": [ 7, 0, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/umbrella_moss_small_3.json b/src/main/resources/assets/betterend/models/block/umbrella_moss_small_3.json index a4c8e769..43880341 100644 --- a/src/main/resources/assets/betterend/models/block/umbrella_moss_small_3.json +++ b/src/main/resources/assets/betterend/models/block/umbrella_moss_small_3.json @@ -1,161 +1,161 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/umbrella_moss_up", - "texture": "betterend:block/umbrella_moss_up", - "spore": "betterend:block/umbrella_moss_sporophyte", - "small": "betterend:block/umbrella_moss_small", - "end": "betterend:block/umbrella_moss_end" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 4, 11, 11 ], - "to": [ 6, 14, 13 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -2, 0, -2 ], - "to": [ -1.999, 13, 14 ], - "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 9.5, 0, -2 ], - "to": [ 9.501, 13, 14 ], - "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 6, 0, 3 ], - "to": [ 6.001, 13, 19 ], - "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 17.5, 0, 3 ], - "to": [ 17.501, 13, 19 ], - "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 10, 9 ], - "to": [ 8, 12, 15 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -1, 0, 6 ], - "to": [ -0.999, 11, 22 ], - "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 10.5, 0, 6 ], - "to": [ 10.501, 11, 22 ], - "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 8, 12, 15 ], - "to": [ 2, 10, 9 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneY16", - "from": [ 0, 0, 9 ], - "to": [ 16, 0.001, 25 ], - "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 } - } - }, - { - "__comment": "PlaneY16", - "from": [ 0, -0.001, -9 ], - "to": [ 16, 0, 7 ], - "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" } - } - }, - { - "__comment": "PlaneY18", - "from": [ 9, 0, 0 ], - "to": [ 25, 0.001, 16 ], - "rotation": { "origin": [ 9, 0, 0 ], "axis": "z", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 } - } - }, - { - "__comment": "PlaneY18", - "from": [ -9, -0.001, 0 ], - "to": [ 7, 0, 16 ], - "rotation": { "origin": [ 7, 0, 0 ], "axis": "z", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/umbrella_moss_up", + "texture": "betterend:block/umbrella_moss_up", + "spore": "betterend:block/umbrella_moss_sporophyte", + "small": "betterend:block/umbrella_moss_small", + "end": "betterend:block/umbrella_moss_end" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 11, 11 ], + "to": [ 6, 14, 13 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -2, 0, -2 ], + "to": [ -1.999, 13, 14 ], + "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 9.5, 0, -2 ], + "to": [ 9.501, 13, 14 ], + "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 6, 0, 3 ], + "to": [ 6.001, 13, 19 ], + "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 17.5, 0, 3 ], + "to": [ 17.501, 13, 19 ], + "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 10, 9 ], + "to": [ 8, 12, 15 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -1, 0, 6 ], + "to": [ -0.999, 11, 22 ], + "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 10.5, 0, 6 ], + "to": [ 10.501, 11, 22 ], + "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 12, 15 ], + "to": [ 2, 10, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY16", + "from": [ 0, 0, 9 ], + "to": [ 16, 0.001, 25 ], + "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 } + } + }, + { + "__comment": "PlaneY16", + "from": [ 0, -0.001, -9 ], + "to": [ 16, 0, 7 ], + "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" } + } + }, + { + "__comment": "PlaneY18", + "from": [ 9, 0, 0 ], + "to": [ 25, 0.001, 16 ], + "rotation": { "origin": [ 9, 0, 0 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 } + } + }, + { + "__comment": "PlaneY18", + "from": [ -9, -0.001, 0 ], + "to": [ 7, 0, 16 ], + "rotation": { "origin": [ 7, 0, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/umbrella_moss_small_4.json b/src/main/resources/assets/betterend/models/block/umbrella_moss_small_4.json index ea65959d..c9b15940 100644 --- a/src/main/resources/assets/betterend/models/block/umbrella_moss_small_4.json +++ b/src/main/resources/assets/betterend/models/block/umbrella_moss_small_4.json @@ -1,122 +1,122 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/umbrella_moss_up", - "texture": "betterend:block/umbrella_moss_up", - "spore": "betterend:block/umbrella_moss_sporophyte", - "small": "betterend:block/umbrella_moss_small", - "end": "betterend:block/umbrella_moss_end" - }, - "elements": [ - { - "__comment": "PlaneX3", - "from": [ -2, 0, -2 ], - "to": [ -1.999, 13, 14 ], - "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 9.5, 0, -2 ], - "to": [ 9.501, 13, 14 ], - "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 6, 0, 3 ], - "to": [ 6.001, 13, 19 ], - "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 17.5, 0, 3 ], - "to": [ 17.501, 13, 19 ], - "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -1, 0, 6 ], - "to": [ -0.999, 11, 22 ], - "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 10.5, 0, 6 ], - "to": [ 10.501, 11, 22 ], - "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneY16", - "from": [ 0, 0, 9 ], - "to": [ 16, 0.001, 25 ], - "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 } - } - }, - { - "__comment": "PlaneY16", - "from": [ 0, -0.001, -9 ], - "to": [ 16, 0, 7 ], - "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" } - } - }, - { - "__comment": "PlaneY18", - "from": [ 9, 0, 0 ], - "to": [ 25, 0.001, 16 ], - "rotation": { "origin": [ 9, 0, 0 ], "axis": "z", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 } - } - }, - { - "__comment": "PlaneY18", - "from": [ -9, -0.001, 0 ], - "to": [ 7, 0, 16 ], - "rotation": { "origin": [ 7, 0, 0 ], "axis": "z", "angle": -22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/umbrella_moss_up", + "texture": "betterend:block/umbrella_moss_up", + "spore": "betterend:block/umbrella_moss_sporophyte", + "small": "betterend:block/umbrella_moss_small", + "end": "betterend:block/umbrella_moss_end" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ -2, 0, -2 ], + "to": [ -1.999, 13, 14 ], + "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 9.5, 0, -2 ], + "to": [ 9.501, 13, 14 ], + "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 6, 0, 3 ], + "to": [ 6.001, 13, 19 ], + "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 17.5, 0, 3 ], + "to": [ 17.501, 13, 19 ], + "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -1, 0, 6 ], + "to": [ -0.999, 11, 22 ], + "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 10.5, 0, 6 ], + "to": [ 10.501, 11, 22 ], + "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneY16", + "from": [ 0, 0, 9 ], + "to": [ 16, 0.001, 25 ], + "rotation": { "origin": [ 0, 0, 9 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 } + } + }, + { + "__comment": "PlaneY16", + "from": [ 0, -0.001, -9 ], + "to": [ 16, 0, 7 ], + "rotation": { "origin": [ 0, 0, 7 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small" } + } + }, + { + "__comment": "PlaneY18", + "from": [ 9, 0, 0 ], + "to": [ 25, 0.001, 16 ], + "rotation": { "origin": [ 9, 0, 0 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 90 } + } + }, + { + "__comment": "PlaneY18", + "from": [ -9, -0.001, 0 ], + "to": [ 7, 0, 16 ], + "rotation": { "origin": [ 7, 0, 0 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#small", "rotation": 270 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/umbrella_moss_top.json b/src/main/resources/assets/betterend/models/block/umbrella_moss_top.json index 85c9ac76..c2435451 100644 --- a/src/main/resources/assets/betterend/models/block/umbrella_moss_top.json +++ b/src/main/resources/assets/betterend/models/block/umbrella_moss_top.json @@ -1,193 +1,193 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/umbrella_moss_up", - "texture": "betterend:block/umbrella_moss_up", - "spore": "betterend:block/umbrella_moss_sporophyte" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 3, 13, 3 ], - "to": [ 5, 16, 5 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 11, 12, 8 ], - "to": [ 13, 15, 10 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 4, 11, 11 ], - "to": [ 6, 14, 13 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 12, 1 ], - "to": [ 7, 14, 7 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -2, 0, -2 ], - "to": [ -1.999, 13, 14 ], - "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 9.5, 0, -2 ], - "to": [ 9.501, 13, 14 ], - "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 14, 7 ], - "to": [ 1, 12, 1 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 9, 11, 6 ], - "to": [ 15, 13, 12 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 6, 0, 3 ], - "to": [ 6.001, 12, 19 ], - "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 17.5, 0, 3 ], - "to": [ 17.501, 12, 19 ], - "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 15, 13, 12 ], - "to": [ 9, 11, 6 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 10, 9 ], - "to": [ 8, 12, 15 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -1, 0, 6 ], - "to": [ -0.999, 11, 22 ], - "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 10.5, 0, 6 ], - "to": [ 10.501, 11, 22 ], - "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 8, 12, 15 ], - "to": [ 2, 10, 9 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/umbrella_moss_up", + "texture": "betterend:block/umbrella_moss_up", + "spore": "betterend:block/umbrella_moss_sporophyte" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 13, 3 ], + "to": [ 5, 16, 5 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 12, 8 ], + "to": [ 13, 15, 10 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 11, 11 ], + "to": [ 6, 14, 13 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 12, 1 ], + "to": [ 7, 14, 7 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -2, 0, -2 ], + "to": [ -1.999, 13, 14 ], + "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 9.5, 0, -2 ], + "to": [ 9.501, 13, 14 ], + "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 14, 7 ], + "to": [ 1, 12, 1 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 11, 6 ], + "to": [ 15, 13, 12 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 6, 0, 3 ], + "to": [ 6.001, 12, 19 ], + "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 17.5, 0, 3 ], + "to": [ 17.501, 12, 19 ], + "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 15, 13, 12 ], + "to": [ 9, 11, 6 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 10, 9 ], + "to": [ 8, 12, 15 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -1, 0, 6 ], + "to": [ -0.999, 11, 22 ], + "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 10.5, 0, 6 ], + "to": [ 10.501, 11, 22 ], + "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 12, 15 ], + "to": [ 2, 10, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/umbrella_moss_top_2.json b/src/main/resources/assets/betterend/models/block/umbrella_moss_top_2.json index 55e1ac20..a781559a 100644 --- a/src/main/resources/assets/betterend/models/block/umbrella_moss_top_2.json +++ b/src/main/resources/assets/betterend/models/block/umbrella_moss_top_2.json @@ -1,155 +1,155 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/umbrella_moss_up", - "texture": "betterend:block/umbrella_moss_up", - "spore": "betterend:block/umbrella_moss_sporophyte", - "end": "betterend:block/umbrella_moss_end" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 3, 13, 3 ], - "to": [ 5, 16, 5 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 4, 11, 11 ], - "to": [ 6, 14, 13 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 12, 1 ], - "to": [ 7, 14, 7 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -2, 0, -2 ], - "to": [ -1.999, 13, 14 ], - "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 9.5, 0, -2 ], - "to": [ 9.501, 13, 14 ], - "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 14, 7 ], - "to": [ 1, 12, 1 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 6, 0, 3 ], - "to": [ 6.001, 13, 19 ], - "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 17.5, 0, 3 ], - "to": [ 17.501, 13, 19 ], - "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "Box1", - "from": [ 2, 10, 9 ], - "to": [ 8, 12, 15 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -1, 0, 6 ], - "to": [ -0.999, 11, 22 ], - "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 10.5, 0, 6 ], - "to": [ 10.501, 11, 22 ], - "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 8, 12, 15 ], - "to": [ 2, 10, 9 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/umbrella_moss_up", + "texture": "betterend:block/umbrella_moss_up", + "spore": "betterend:block/umbrella_moss_sporophyte", + "end": "betterend:block/umbrella_moss_end" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 13, 3 ], + "to": [ 5, 16, 5 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 11, 11 ], + "to": [ 6, 14, 13 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 12, 1 ], + "to": [ 7, 14, 7 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -2, 0, -2 ], + "to": [ -1.999, 13, 14 ], + "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 9.5, 0, -2 ], + "to": [ 9.501, 13, 14 ], + "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 14, 7 ], + "to": [ 1, 12, 1 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 6, 0, 3 ], + "to": [ 6.001, 13, 19 ], + "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 17.5, 0, 3 ], + "to": [ 17.501, 13, 19 ], + "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 10, 9 ], + "to": [ 8, 12, 15 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -1, 0, 6 ], + "to": [ -0.999, 11, 22 ], + "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 10.5, 0, 6 ], + "to": [ 10.501, 11, 22 ], + "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 12, 15 ], + "to": [ 2, 10, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/umbrella_moss_top_3.json b/src/main/resources/assets/betterend/models/block/umbrella_moss_top_3.json index 10f65f6e..39a4c399 100644 --- a/src/main/resources/assets/betterend/models/block/umbrella_moss_top_3.json +++ b/src/main/resources/assets/betterend/models/block/umbrella_moss_top_3.json @@ -1,116 +1,116 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/umbrella_moss_up", - "texture": "betterend:block/umbrella_moss_up", - "spore": "betterend:block/umbrella_moss_sporophyte", - "end": "betterend:block/umbrella_moss_end" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 3, 13, 3 ], - "to": [ 5, 16, 5 ], - "faces": { - "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, - "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, - "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, - "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } - } - }, - { - "__comment": "Box1", - "from": [ 1, 12, 1 ], - "to": [ 7, 14, 7 ], - "shade": false, - "faces": { - "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, - "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -2, 0, -2 ], - "to": [ -1.999, 13, 14 ], - "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 9.5, 0, -2 ], - "to": [ 9.501, 13, 14 ], - "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box1", - "from": [ 7, 14, 7 ], - "to": [ 1, 12, 1 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, - "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, - "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 6, 0, 3 ], - "to": [ 6.001, 13, 19 ], - "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 17.5, 0, 3 ], - "to": [ 17.501, 13, 19 ], - "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ -1, 0, 6 ], - "to": [ -0.999, 11, 22 ], - "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" } - } - }, - { - "__comment": "PlaneX3", - "from": [ 10.5, 0, 6 ], - "to": [ 10.501, 11, 22 ], - "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" }, - "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/umbrella_moss_up", + "texture": "betterend:block/umbrella_moss_up", + "spore": "betterend:block/umbrella_moss_sporophyte", + "end": "betterend:block/umbrella_moss_end" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 13, 3 ], + "to": [ 5, 16, 5 ], + "faces": { + "down": { "uv": [ 7, 5, 9, 7 ], "texture": "#spore" }, + "up": { "uv": [ 7, 0, 9, 2 ], "texture": "#spore" }, + "north": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "south": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "west": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" }, + "east": { "uv": [ 7, 2, 9, 5 ], "texture": "#spore" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 12, 1 ], + "to": [ 7, 14, 7 ], + "shade": false, + "faces": { + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "south": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "west": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" }, + "east": { "uv": [ 0, 6, 6, 8 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -2, 0, -2 ], + "to": [ -1.999, 13, 14 ], + "rotation": { "origin": [ -2, 0, -2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 9.5, 0, -2 ], + "to": [ 9.501, 13, 14 ], + "rotation": { "origin": [ 9.5, 0, -2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 14, 7 ], + "to": [ 1, 12, 1 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#spore" }, + "north": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "south": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "west": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" }, + "east": { "uv": [ 6, 8, 0, 6 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 6, 0, 3 ], + "to": [ 6.001, 13, 19 ], + "rotation": { "origin": [ 6, 0, 3 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 17.5, 0, 3 ], + "to": [ 17.501, 13, 19 ], + "rotation": { "origin": [ 17.5, 0, 3 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ -1, 0, 6 ], + "to": [ -0.999, 11, 22 ], + "rotation": { "origin": [ -1, 0, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 10.5, 0, 6 ], + "to": [ 10.501, 11, 22 ], + "rotation": { "origin": [ 10.5, 0, 6 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" }, + "east": { "uv": [ 0, 5, 16, 16 ], "texture": "#end" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/violecite.json b/src/main/resources/assets/betterend/models/block/violecite.json index 12104029..1ba3d23e 100644 --- a/src/main/resources/assets/betterend/models/block/violecite.json +++ b/src/main/resources/assets/betterend/models/block/violecite.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/violecite" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks.json b/src/main/resources/assets/betterend/models/block/violecite_bricks.json index 46b36cbc..a62dc365 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/violecite_bricks" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks_half_slab.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_half_slab.json index 6d52e930..05899619 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks_half_slab.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks_half_slab.json @@ -1,8 +1,8 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "betterend:block/violecite_bricks", - "side": "betterend:block/violecite_bricks", - "top": "betterend:block/violecite_bricks" - } -} +{ + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/violecite_bricks", + "side": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks_inner_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_inner_stairs.json index 312f60e7..09caacad 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks_inner_stairs.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks_inner_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/violecite_bricks", - "side": "betterend:block/violecite_bricks", - "top": "betterend:block/violecite_bricks" - } -} +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/violecite_bricks", + "side": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks_outer_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_outer_stairs.json index d9f36449..02928f43 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks_outer_stairs.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks_outer_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/violecite_bricks", - "side": "betterend:block/violecite_bricks", - "top": "betterend:block/violecite_bricks" - } -} +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/violecite_bricks", + "side": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_stairs.json index 60bf8b2a..38aa1ad7 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks_stairs.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "betterend:block/violecite_bricks", - "side": "betterend:block/violecite_bricks", - "top": "betterend:block/violecite_bricks" - } -} +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/violecite_bricks", + "side": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_inventory.json index 8955de3f..8f597f59 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_inventory.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "betterend:block/violecite_bricks" - } -} +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_post.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_post.json index 87799b7b..31041706 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_post.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_post.json @@ -1,22 +1,22 @@ -{ - "parent": "block/block", - "textures": { - "side": "betterend:block/violecite_post_side", - "top": "betterend:block/violecite_post_top", - "particle": "#side" - }, - "elements": [ - { - "from": [ 4, 0, 4 ], - "to": [ 12, 16, 12 ], - "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "down" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" }, - "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } - } - } - ] -} +{ + "parent": "block/block", + "textures": { + "side": "betterend:block/violecite_post_side", + "top": "betterend:block/violecite_post_top", + "particle": "#side" + }, + "elements": [ + { + "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "down" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side.json index 1ac148cb..4e6e95cc 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side.json @@ -1,20 +1,20 @@ -{ - "textures": { - "wall": "betterend:block/violecite_bricks", - "top": "betterend:block/violecite_bricks_wall_top", - "particle": "#wall" - }, - "elements": [ - { - "from": [ 5, 0, 0 ], - "to": [ 11, 14, 8 ], - "faces": { - "down": { "texture": "#top", "cullface": "down" }, - "up": { "texture": "#top" }, - "north": { "texture": "#wall", "cullface": "north" }, - "west": { "texture": "#wall" }, - "east": { "texture": "#wall" } - } - } - ] -} +{ + "textures": { + "wall": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks_wall_top", + "particle": "#wall" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 14, 8 ], + "faces": { + "down": { "texture": "#top", "cullface": "down" }, + "up": { "texture": "#top" }, + "north": { "texture": "#wall", "cullface": "north" }, + "west": { "texture": "#wall" }, + "east": { "texture": "#wall" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side_tall.json b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side_tall.json index df0eb919..42701ed1 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side_tall.json +++ b/src/main/resources/assets/betterend/models/block/violecite_bricks_wall_side_tall.json @@ -1,20 +1,20 @@ -{ - "textures": { - "wall": "betterend:block/violecite_bricks", - "top": "betterend:block/violecite_bricks_wall_top", - "particle": "#wall" - }, - "elements": [ - { - "from": [ 5, 0, 0 ], - "to": [ 11, 16, 8 ], - "faces": { - "down": { "texture": "#top", "cullface": "down" }, - "up": { "texture": "#top", "cullface": "up"}, - "north": { "texture": "#wall", "cullface": "north" }, - "west": { "texture": "#wall" }, - "east": { "texture": "#wall" } - } - } - ] -} +{ + "textures": { + "wall": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks_wall_top", + "particle": "#wall" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 16, 8 ], + "faces": { + "down": { "texture": "#top", "cullface": "down" }, + "up": { "texture": "#top", "cullface": "up"}, + "north": { "texture": "#wall", "cullface": "north" }, + "west": { "texture": "#wall" }, + "east": { "texture": "#wall" } + } + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_button.json b/src/main/resources/assets/betterend/models/block/violecite_button.json index 9b23ba46..5af846c9 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_button.json +++ b/src/main/resources/assets/betterend/models/block/violecite_button.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button", - "textures": { - "texture": "betterend:block/violecite" - } -} +{ + "parent": "block/button", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_button_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_button_inventory.json index 2e15a716..34e2c997 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_button_inventory.json +++ b/src/main/resources/assets/betterend/models/block/violecite_button_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "betterend:block/violecite" - } -} +{ + "parent": "block/button_inventory", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_button_pressed.json b/src/main/resources/assets/betterend/models/block/violecite_button_pressed.json index cec115fc..2c5dc88a 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_button_pressed.json +++ b/src/main/resources/assets/betterend/models/block/violecite_button_pressed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "betterend:block/violecite" - } -} +{ + "parent": "block/button_pressed", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_half_slab.json b/src/main/resources/assets/betterend/models/block/violecite_half_slab.json index 55194684..ed487bae 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_half_slab.json +++ b/src/main/resources/assets/betterend/models/block/violecite_half_slab.json @@ -1,8 +1,8 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "betterend:block/violecite", - "side": "betterend:block/violecite", - "top": "betterend:block/violecite" - } -} +{ + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/violecite", + "side": "betterend:block/violecite", + "top": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_inner_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_inner_stairs.json index 745d44b9..199e7654 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_inner_stairs.json +++ b/src/main/resources/assets/betterend/models/block/violecite_inner_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/violecite", - "side": "betterend:block/violecite", - "top": "betterend:block/violecite" - } -} +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/violecite", + "side": "betterend:block/violecite", + "top": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_outer_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_outer_stairs.json index 67d0261c..d6ba85b4 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_outer_stairs.json +++ b/src/main/resources/assets/betterend/models/block/violecite_outer_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/violecite", - "side": "betterend:block/violecite", - "top": "betterend:block/violecite" - } -} +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/violecite", + "side": "betterend:block/violecite", + "top": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_pillar.json b/src/main/resources/assets/betterend/models/block/violecite_pillar.json index 3b14644a..f5e4b854 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_pillar.json +++ b/src/main/resources/assets/betterend/models/block/violecite_pillar.json @@ -1,7 +1,7 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/violecite_pillar_top", - "side": "betterend:block/violecite_pillar_side" - } -} +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "betterend:block/violecite_pillar_top", + "side": "betterend:block/violecite_pillar_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_down.json b/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_down.json index e08999fd..36b648a7 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_down.json +++ b/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_down.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "betterend:block/violecite" - } -} +{ + "parent": "block/pressure_plate_down", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_up.json b/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_up.json index 54f744d6..7b85fef6 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_up.json +++ b/src/main/resources/assets/betterend/models/block/violecite_pressure_plate_up.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "betterend:block/violecite" - } -} +{ + "parent": "block/pressure_plate_up", + "textures": { + "texture": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_small_tiles.json b/src/main/resources/assets/betterend/models/block/violecite_small_tiles.json index 023bd3e8..a92dc366 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_small_tiles.json +++ b/src/main/resources/assets/betterend/models/block/violecite_small_tiles.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/violecite_small_tiles" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/violecite_small_tiles" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_stairs.json b/src/main/resources/assets/betterend/models/block/violecite_stairs.json index b48445aa..da47eb95 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_stairs.json +++ b/src/main/resources/assets/betterend/models/block/violecite_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "betterend:block/violecite", - "side": "betterend:block/violecite", - "top": "betterend:block/violecite" - } -} +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/violecite", + "side": "betterend:block/violecite", + "top": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_tile.json b/src/main/resources/assets/betterend/models/block/violecite_tile.json index 5b235309..148ec8d8 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_tile.json +++ b/src/main/resources/assets/betterend/models/block/violecite_tile.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/violecite_tile" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/violecite_tile" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json index 479a780d..94cd6db8 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "betterend:block/violecite" - } -} +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_post.json b/src/main/resources/assets/betterend/models/block/violecite_wall_post.json index ec0c961c..2f1ba471 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_wall_post.json +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_post.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "betterend:block/violecite" - } -} +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_side.json b/src/main/resources/assets/betterend/models/block/violecite_wall_side.json index 9ec704d3..60a7b1f9 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_wall_side.json +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_side.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "betterend:block/violecite" - } -} +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json b/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json index 4054b5fc..19069a9c 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "betterend:block/violecite" - } -} +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/wall_moss_01.json b/src/main/resources/assets/betterend/models/block/wall_moss_01.json index 7e918bb7..71a1e865 100644 --- a/src/main/resources/assets/betterend/models/block/wall_moss_01.json +++ b/src/main/resources/assets/betterend/models/block/wall_moss_01.json @@ -1,96 +1,96 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "PlaneY1", - "from": [ 3, 15, 0 ], - "to": [ 19, 15.001, 16 ], - "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 1, 11, 0 ], - "to": [ 17, 11.001, 16 ], - "rotation": { "origin": [ 1, 11, 0 ], "axis": "x", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 1, -10, 0 ], - "to": [ 17, 6, 0.001 ], - "rotation": { "origin": [ 1, 6, 0 ], "axis": "x", "angle": -45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ -3, 13.5, 0 ], - "to": [ 13, 13.501, 16 ], - "rotation": { "origin": [ -3, 13.5, 0 ], "axis": "x", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 1, 1, 0 ], - "to": [ 17, 1.001, 16 ], - "rotation": { "origin": [ 1, 1, 0 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ -1, -9, 0 ], - "to": [ 15, 7, 0.001 ], - "rotation": { "origin": [ -1, 7, 0 ], "axis": "x", "angle": -45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ -1.5, 16, 0 ], - "to": [ 14.5, 16.001, 16 ], - "rotation": { "origin": [ -1.5, 16, 0 ], "axis": "x", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ -2, 0.5, 0 ], - "to": [ 14, 0.501, 16 ], - "rotation": { "origin": [ -2, 0.5, 0 ], "axis": "x", "angle": 22.5 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 11, 0 ], + "to": [ 17, 11.001, 16 ], + "rotation": { "origin": [ 1, 11, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, -10, 0 ], + "to": [ 17, 6, 0.001 ], + "rotation": { "origin": [ 1, 6, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, 13.5, 0 ], + "to": [ 13, 13.501, 16 ], + "rotation": { "origin": [ -3, 13.5, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 1, 0 ], + "to": [ 17, 1.001, 16 ], + "rotation": { "origin": [ 1, 1, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1, -9, 0 ], + "to": [ 15, 7, 0.001 ], + "rotation": { "origin": [ -1, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1.5, 16, 0 ], + "to": [ 14.5, 16.001, 16 ], + "rotation": { "origin": [ -1.5, 16, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, 0.5, 0 ], + "to": [ 14, 0.501, 16 ], + "rotation": { "origin": [ -2, 0.5, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/wall_moss_02.json b/src/main/resources/assets/betterend/models/block/wall_moss_02.json index fbc6976f..bbac756c 100644 --- a/src/main/resources/assets/betterend/models/block/wall_moss_02.json +++ b/src/main/resources/assets/betterend/models/block/wall_moss_02.json @@ -1,63 +1,63 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "PlaneY1", - "from": [ 3, 15, 0 ], - "to": [ 19, 15.001, 16 ], - "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, -15, 0 ], - "to": [ 16, 1, 0.001 ], - "rotation": { "origin": [ 0, 1, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ -2, -12, 0 ], - "to": [ 14, 4, 0.001 ], - "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, -9, 0 ], - "to": [ 16, 7, 0.001 ], - "rotation": { "origin": [ 0, 7, 0 ], "axis": "x", "angle": -45 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, -3, 0 ], - "to": [ 16, 13, 0.001 ], - "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -15, 0 ], + "to": [ 16, 1, 0.001 ], + "rotation": { "origin": [ 0, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, -12, 0 ], + "to": [ 14, 4, 0.001 ], + "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -9, 0 ], + "to": [ 16, 7, 0.001 ], + "rotation": { "origin": [ 0, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -3, 0 ], + "to": [ 16, 13, 0.001 ], + "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/wall_moss_03.json b/src/main/resources/assets/betterend/models/block/wall_moss_03.json index bf779746..a76a8693 100644 --- a/src/main/resources/assets/betterend/models/block/wall_moss_03.json +++ b/src/main/resources/assets/betterend/models/block/wall_moss_03.json @@ -1,63 +1,63 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "#texture" - }, - "elements": [ - { - "__comment": "PlaneY1", - "from": [ -1, 0, 0 ], - "to": [ 15, 16, 0.001 ], - "rotation": { "origin": [ -1, 16, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 2, -3, 0 ], - "to": [ 18, 13, 0.001 ], - "rotation": { "origin": [ 2, 13, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 0, -8, 0 ], - "to": [ 16, 8, 0.001 ], - "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ -3, -12, 0 ], - "to": [ 13, 4, 0.001 ], - "rotation": { "origin": [ -3, 4, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - }, - { - "__comment": "PlaneY1", - "from": [ 3, -15, 0 ], - "to": [ 19, 1, 0.001 ], - "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ -1, 0, 0 ], + "to": [ 15, 16, 0.001 ], + "rotation": { "origin": [ -1, 16, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 2, -3, 0 ], + "to": [ 18, 13, 0.001 ], + "rotation": { "origin": [ 2, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -8, 0 ], + "to": [ 16, 8, 0.001 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, -12, 0 ], + "to": [ 13, 4, 0.001 ], + "rotation": { "origin": [ -3, 4, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 3, -15, 0 ], + "to": [ 19, 1, 0.001 ], + "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_axe.json b/src/main/resources/assets/betterend/models/item/aeternium_axe.json index a342fbc8..c167f8ce 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_axe.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_axe.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_axe" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_axe" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_boots.json b/src/main/resources/assets/betterend/models/item/aeternium_boots.json index 3b37ac91..f6caae83 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_boots.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_boots.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/aeternium_boots" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/aeternium_boots" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_chestplate.json b/src/main/resources/assets/betterend/models/item/aeternium_chestplate.json index f9935ff5..6f9a2c71 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_chestplate.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_chestplate.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/aeternium_chestplate" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/aeternium_chestplate" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_hammer.json b/src/main/resources/assets/betterend/models/item/aeternium_hammer.json index 3f1ce7d5..97f80b2e 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_hammer.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_hammer.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_hammer" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_hammer" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_helmet.json b/src/main/resources/assets/betterend/models/item/aeternium_helmet.json index fa02fa89..791cb597 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_helmet.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_helmet.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/aeternium_helmet" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/aeternium_helmet" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_hoe.json b/src/main/resources/assets/betterend/models/item/aeternium_hoe.json index 3e640fad..9cee4fcd 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_hoe.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_hoe.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_hoe" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_hoe" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_leggings.json b/src/main/resources/assets/betterend/models/item/aeternium_leggings.json index 697c0a8d..b21c3b7b 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_leggings.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_leggings.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/aeternium_leggings" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/aeternium_leggings" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json b/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json index b2ed173f..a9df5dc1 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_pickaxe" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_pickaxe" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_shovel.json b/src/main/resources/assets/betterend/models/item/aeternium_shovel.json index 858475de..8592a817 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_shovel.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_shovel.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_shovel" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_shovel" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_sword.json b/src/main/resources/assets/betterend/models/item/aeternium_sword.json index 978f4238..c526a1d1 100644 --- a/src/main/resources/assets/betterend/models/item/aeternium_sword.json +++ b/src/main/resources/assets/betterend/models/item/aeternium_sword.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_sword" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_sword" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/cave_bush.json b/src/main/resources/assets/betterend/models/item/cave_bush.json index 81e09eff..c0716a41 100644 --- a/src/main/resources/assets/betterend/models/item/cave_bush.json +++ b/src/main/resources/assets/betterend/models/item/cave_bush.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/cave_bush_01" -} +{ + "parent": "betterend:block/cave_bush_01" +} diff --git a/src/main/resources/assets/betterend/models/item/cave_moss.json b/src/main/resources/assets/betterend/models/item/cave_moss.json index caeaacbf..56fbfe9f 100644 --- a/src/main/resources/assets/betterend/models/item/cave_moss.json +++ b/src/main/resources/assets/betterend/models/item/cave_moss.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/cave_moss" -} +{ + "parent": "betterend:block/cave_moss" +} diff --git a/src/main/resources/assets/betterend/models/item/cave_moss_path.json b/src/main/resources/assets/betterend/models/item/cave_moss_path.json index 7915c469..8f2a130f 100644 --- a/src/main/resources/assets/betterend/models/item/cave_moss_path.json +++ b/src/main/resources/assets/betterend/models/item/cave_moss_path.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/cave_moss_path" -} +{ + "parent": "betterend:block/cave_moss_path" +} diff --git a/src/main/resources/assets/betterend/models/item/crystal_moss.json b/src/main/resources/assets/betterend/models/item/crystal_moss.json index d31083f2..187ee92c 100644 --- a/src/main/resources/assets/betterend/models/item/crystal_moss.json +++ b/src/main/resources/assets/betterend/models/item/crystal_moss.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/crystal_moss" -} +{ + "parent": "betterend:block/crystal_moss" +} diff --git a/src/main/resources/assets/betterend/models/item/crystal_moss_path.json b/src/main/resources/assets/betterend/models/item/crystal_moss_path.json index 801db548..fbfcbe61 100644 --- a/src/main/resources/assets/betterend/models/item/crystal_moss_path.json +++ b/src/main/resources/assets/betterend/models/item/crystal_moss_path.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/crystal_moss_path" -} +{ + "parent": "betterend:block/crystal_moss_path" +} diff --git a/src/main/resources/assets/betterend/models/item/diamond_hammer.json b/src/main/resources/assets/betterend/models/item/diamond_hammer.json index 77d71587..767d96df 100644 --- a/src/main/resources/assets/betterend/models/item/diamond_hammer.json +++ b/src/main/resources/assets/betterend/models/item/diamond_hammer.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/diamond_hammer" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/diamond_hammer" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/end_lotus_stem.json b/src/main/resources/assets/betterend/models/item/end_lotus_stem.json index 1e0cb5ea..f8ff339e 100644 --- a/src/main/resources/assets/betterend/models/item/end_lotus_stem.json +++ b/src/main/resources/assets/betterend/models/item/end_lotus_stem.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/end_lotus_stem" -} +{ + "parent": "betterend:block/end_lotus_stem" +} diff --git a/src/main/resources/assets/betterend/models/item/end_portal_block.json b/src/main/resources/assets/betterend/models/item/end_portal_block.json index 71e153ae..831a97db 100644 --- a/src/main/resources/assets/betterend/models/item/end_portal_block.json +++ b/src/main/resources/assets/betterend/models/item/end_portal_block.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:block/end_portal" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/end_portal" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/eternal_crystal.json b/src/main/resources/assets/betterend/models/item/eternal_crystal.json index 16830ca2..1cd311d7 100644 --- a/src/main/resources/assets/betterend/models/item/eternal_crystal.json +++ b/src/main/resources/assets/betterend/models/item/eternal_crystal.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/crystal_shards" - } +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/crystal_shards" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/eternal_pedestal.json b/src/main/resources/assets/betterend/models/item/eternal_pedestal.json index 0cb3c9d0..25048bc4 100644 --- a/src/main/resources/assets/betterend/models/item/eternal_pedestal.json +++ b/src/main/resources/assets/betterend/models/item/eternal_pedestal.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/eternal_pedestal_default_1" -} +{ + "parent": "betterend:block/eternal_pedestal_default_1" +} diff --git a/src/main/resources/assets/betterend/models/item/flavolite_runed.json b/src/main/resources/assets/betterend/models/item/flavolite_runed.json index 359977ad..b4291f21 100644 --- a/src/main/resources/assets/betterend/models/item/flavolite_runed.json +++ b/src/main/resources/assets/betterend/models/item/flavolite_runed.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/flavolite_runed_1" -} +{ + "parent": "betterend:block/flavolite_runed_1" +} diff --git a/src/main/resources/assets/betterend/models/item/flavolite_runed_eternal.json b/src/main/resources/assets/betterend/models/item/flavolite_runed_eternal.json index 359977ad..b4291f21 100644 --- a/src/main/resources/assets/betterend/models/item/flavolite_runed_eternal.json +++ b/src/main/resources/assets/betterend/models/item/flavolite_runed_eternal.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/flavolite_runed_1" -} +{ + "parent": "betterend:block/flavolite_runed_1" +} diff --git a/src/main/resources/assets/betterend/models/item/golden_hammer.json b/src/main/resources/assets/betterend/models/item/golden_hammer.json index 3928ba3a..91d0fbde 100644 --- a/src/main/resources/assets/betterend/models/item/golden_hammer.json +++ b/src/main/resources/assets/betterend/models/item/golden_hammer.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/golden_hammer" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/golden_hammer" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/infusion_pedestal.json b/src/main/resources/assets/betterend/models/item/infusion_pedestal.json index ad8068fc..62b1e562 100644 --- a/src/main/resources/assets/betterend/models/item/infusion_pedestal.json +++ b/src/main/resources/assets/betterend/models/item/infusion_pedestal.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/infusion_pedestal_default" -} +{ + "parent": "betterend:block/infusion_pedestal_default" +} diff --git a/src/main/resources/assets/betterend/models/item/iron_hammer.json b/src/main/resources/assets/betterend/models/item/iron_hammer.json index f738e323..37c4f957 100644 --- a/src/main/resources/assets/betterend/models/item/iron_hammer.json +++ b/src/main/resources/assets/betterend/models/item/iron_hammer.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/iron_hammer" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/iron_hammer" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/netherite_hammer.json b/src/main/resources/assets/betterend/models/item/netherite_hammer.json index bdf1b7e6..0040a0f7 100644 --- a/src/main/resources/assets/betterend/models/item/netherite_hammer.json +++ b/src/main/resources/assets/betterend/models/item/netherite_hammer.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/netherite_hammer" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/netherite_hammer" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/purpur_pedestal.json b/src/main/resources/assets/betterend/models/item/purpur_pedestal.json index 956941be..469e5832 100644 --- a/src/main/resources/assets/betterend/models/item/purpur_pedestal.json +++ b/src/main/resources/assets/betterend/models/item/purpur_pedestal.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/purpur_pedestal_default" -} +{ + "parent": "betterend:block/purpur_pedestal_default" +} diff --git a/src/main/resources/assets/betterend/models/item/quartz_pedestal.json b/src/main/resources/assets/betterend/models/item/quartz_pedestal.json index 0a652c75..34cae5a0 100644 --- a/src/main/resources/assets/betterend/models/item/quartz_pedestal.json +++ b/src/main/resources/assets/betterend/models/item/quartz_pedestal.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/quartz_pedestal_default" -} +{ + "parent": "betterend:block/quartz_pedestal_default" +} diff --git a/src/main/resources/assets/betterend/models/item/spawn_egg_dragonfly.json b/src/main/resources/assets/betterend/models/item/spawn_egg_dragonfly.json index 765225c9..796d20ab 100644 --- a/src/main/resources/assets/betterend/models/item/spawn_egg_dragonfly.json +++ b/src/main/resources/assets/betterend/models/item/spawn_egg_dragonfly.json @@ -1,3 +1,3 @@ -{ - "parent": "item/template_spawn_egg" -} +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/betterend/models/item/spawn_egg_end_slime.json b/src/main/resources/assets/betterend/models/item/spawn_egg_end_slime.json index 765225c9..796d20ab 100644 --- a/src/main/resources/assets/betterend/models/item/spawn_egg_end_slime.json +++ b/src/main/resources/assets/betterend/models/item/spawn_egg_end_slime.json @@ -1,3 +1,3 @@ -{ - "parent": "item/template_spawn_egg" -} +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/betterend/models/item/spawn_egg_shadow_walker.json b/src/main/resources/assets/betterend/models/item/spawn_egg_shadow_walker.json new file mode 100644 index 00000000..796d20ab --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/spawn_egg_shadow_walker.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} diff --git a/src/main/resources/assets/betterend/models/item/terminite_axe.json b/src/main/resources/assets/betterend/models/item/terminite_axe.json index 8f305558..8a6216b8 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_axe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_axe.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_axe" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/terminite_axe" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_boots.json b/src/main/resources/assets/betterend/models/item/terminite_boots.json index 9edb943b..8e7f7ffe 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_boots.json +++ b/src/main/resources/assets/betterend/models/item/terminite_boots.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/terminite_boots" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/terminite_boots" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_chestplate.json b/src/main/resources/assets/betterend/models/item/terminite_chestplate.json index 2ed53231..1b0e7442 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_chestplate.json +++ b/src/main/resources/assets/betterend/models/item/terminite_chestplate.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/terminite_chestplate" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/terminite_chestplate" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_hammer.json b/src/main/resources/assets/betterend/models/item/terminite_hammer.json index 95124c8d..f579c92d 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_hammer.json +++ b/src/main/resources/assets/betterend/models/item/terminite_hammer.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_hammer" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/terminite_hammer" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_helmet.json b/src/main/resources/assets/betterend/models/item/terminite_helmet.json index 42a9f7b9..7fbdb8a6 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_helmet.json +++ b/src/main/resources/assets/betterend/models/item/terminite_helmet.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/terminite_helmet" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/terminite_helmet" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_hoe.json b/src/main/resources/assets/betterend/models/item/terminite_hoe.json index 5ed37b45..1cacc313 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_hoe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_hoe.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_hoe" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/terminite_hoe" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_leggings.json b/src/main/resources/assets/betterend/models/item/terminite_leggings.json index 3eeace78..191cd4d8 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_leggings.json +++ b/src/main/resources/assets/betterend/models/item/terminite_leggings.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/terminite_leggings" - } +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/terminite_leggings" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json b/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json index 4ac934c9..e35f9635 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_pickaxe" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/terminite_pickaxe" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_shovel.json b/src/main/resources/assets/betterend/models/item/terminite_shovel.json index b784dbfb..2f34062b 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_shovel.json +++ b/src/main/resources/assets/betterend/models/item/terminite_shovel.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_shovel" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/terminite_shovel" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_sword.json b/src/main/resources/assets/betterend/models/item/terminite_sword.json index fac5e3ed..00cf03e3 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_sword.json +++ b/src/main/resources/assets/betterend/models/item/terminite_sword.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_sword" - } +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/terminite_sword" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/violecite.json b/src/main/resources/assets/betterend/models/item/violecite.json index 556e1602..c8139128 100644 --- a/src/main/resources/assets/betterend/models/item/violecite.json +++ b/src/main/resources/assets/betterend/models/item/violecite.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite" -} +{ + "parent": "betterend:block/violecite" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_bricks.json b/src/main/resources/assets/betterend/models/item/violecite_bricks.json index 8675cdf4..c998c0c4 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_bricks.json +++ b/src/main/resources/assets/betterend/models/item/violecite_bricks.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_bricks" -} +{ + "parent": "betterend:block/violecite_bricks" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json index 90478bb0..a1b35d09 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json +++ b/src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_bricks_half_slab" -} +{ + "parent": "betterend:block/violecite_bricks_half_slab" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json index 0ce09c5a..5a145605 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json +++ b/src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_bricks_stairs" -} +{ + "parent": "betterend:block/violecite_bricks_stairs" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json b/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json index 36388d2c..4e894bdd 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json +++ b/src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_bricks_wall_inventory" -} +{ + "parent": "betterend:block/violecite_bricks_wall_inventory" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_button.json b/src/main/resources/assets/betterend/models/item/violecite_button.json index 9db14a55..b8ed9ab9 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_button.json +++ b/src/main/resources/assets/betterend/models/item/violecite_button.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_button_inventory" -} +{ + "parent": "betterend:block/violecite_button_inventory" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_pillar.json b/src/main/resources/assets/betterend/models/item/violecite_pillar.json index 8ad651ee..c278b52f 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_pillar.json +++ b/src/main/resources/assets/betterend/models/item/violecite_pillar.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_pillar" -} +{ + "parent": "betterend:block/violecite_pillar" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_plate.json b/src/main/resources/assets/betterend/models/item/violecite_plate.json index c419e6b7..cdca92aa 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_plate.json +++ b/src/main/resources/assets/betterend/models/item/violecite_plate.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_pressure_plate_up" -} +{ + "parent": "betterend:block/violecite_pressure_plate_up" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_slab.json b/src/main/resources/assets/betterend/models/item/violecite_slab.json index 9fe4c049..e8909031 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_slab.json +++ b/src/main/resources/assets/betterend/models/item/violecite_slab.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_half_slab" -} +{ + "parent": "betterend:block/violecite_half_slab" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_small_tiles.json b/src/main/resources/assets/betterend/models/item/violecite_small_tiles.json index 248f878a..34b0be36 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_small_tiles.json +++ b/src/main/resources/assets/betterend/models/item/violecite_small_tiles.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_small_tiles" -} +{ + "parent": "betterend:block/violecite_small_tiles" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_stairs.json b/src/main/resources/assets/betterend/models/item/violecite_stairs.json index ecebc12f..c7af3f8c 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_stairs.json +++ b/src/main/resources/assets/betterend/models/item/violecite_stairs.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_stairs" -} +{ + "parent": "betterend:block/violecite_stairs" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_tile.json b/src/main/resources/assets/betterend/models/item/violecite_tile.json index 0a4f4c8b..8de1a119 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_tile.json +++ b/src/main/resources/assets/betterend/models/item/violecite_tile.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_tile" -} +{ + "parent": "betterend:block/violecite_tile" +} diff --git a/src/main/resources/assets/betterend/models/item/violecite_wall.json b/src/main/resources/assets/betterend/models/item/violecite_wall.json index aa6ed8b1..32556ef6 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_wall.json +++ b/src/main/resources/assets/betterend/models/item/violecite_wall.json @@ -1,3 +1,3 @@ -{ - "parent": "betterend:block/violecite_wall_inventory" -} +{ + "parent": "betterend:block/violecite_wall_inventory" +} diff --git a/src/main/resources/assets/betterend/particles/portal_sphere.json b/src/main/resources/assets/betterend/particles/portal_sphere.json index e3e05d9e..9ede22c3 100644 --- a/src/main/resources/assets/betterend/particles/portal_sphere.json +++ b/src/main/resources/assets/betterend/particles/portal_sphere.json @@ -1,38 +1,38 @@ -{ - "textures": [ - "betterend:glowing_sphere_0", - "betterend:glowing_sphere_1", - "betterend:glowing_sphere_2", - "betterend:glowing_sphere_3", - "betterend:glowing_sphere_4", - - "betterend:glowing_sphere_5", - "betterend:glowing_sphere_6", - "betterend:glowing_sphere_7", - "betterend:glowing_sphere_6", - "betterend:glowing_sphere_5", - - "betterend:glowing_sphere_4", - - "betterend:glowing_sphere_5", - "betterend:glowing_sphere_6", - "betterend:glowing_sphere_7", - "betterend:glowing_sphere_6", - "betterend:glowing_sphere_5", - - "betterend:glowing_sphere_4", - - "betterend:glowing_sphere_5", - "betterend:glowing_sphere_6", - "betterend:glowing_sphere_7", - "betterend:glowing_sphere_6", - "betterend:glowing_sphere_5", - - "betterend:glowing_sphere_4", - - "betterend:glowing_sphere_3", - "betterend:glowing_sphere_2", - "betterend:glowing_sphere_1", - "betterend:glowing_sphere_0" - ] +{ + "textures": [ + "betterend:glowing_sphere_0", + "betterend:glowing_sphere_1", + "betterend:glowing_sphere_2", + "betterend:glowing_sphere_3", + "betterend:glowing_sphere_4", + + "betterend:glowing_sphere_5", + "betterend:glowing_sphere_6", + "betterend:glowing_sphere_7", + "betterend:glowing_sphere_6", + "betterend:glowing_sphere_5", + + "betterend:glowing_sphere_4", + + "betterend:glowing_sphere_5", + "betterend:glowing_sphere_6", + "betterend:glowing_sphere_7", + "betterend:glowing_sphere_6", + "betterend:glowing_sphere_5", + + "betterend:glowing_sphere_4", + + "betterend:glowing_sphere_5", + "betterend:glowing_sphere_6", + "betterend:glowing_sphere_7", + "betterend:glowing_sphere_6", + "betterend:glowing_sphere_5", + + "betterend:glowing_sphere_4", + + "betterend:glowing_sphere_3", + "betterend:glowing_sphere_2", + "betterend:glowing_sphere_1", + "betterend:glowing_sphere_0" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/bookshelf.json b/src/main/resources/assets/betterend/patterns/block/bookshelf.json index 2cbd99e7..68b3923d 100644 --- a/src/main/resources/assets/betterend/patterns/block/bookshelf.json +++ b/src/main/resources/assets/betterend/patterns/block/bookshelf.json @@ -1,7 +1,7 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/%parent%_planks", - "side": "betterend:block/%parent%_bookshelf" - } +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "betterend:block/%parent%_planks", + "side": "betterend:block/%parent%_bookshelf" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_barrel_open.json b/src/main/resources/assets/betterend/patterns/block/pattern_barrel_open.json index 4b7204f6..0dc650bf 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_barrel_open.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_barrel_open.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "betterend:block/%block%_bottom", - "side": "betterend:block/%block%_side", - "top": "betterend:block/%block%_top_open" - } -} +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "betterend:block/%block%_bottom", + "side": "betterend:block/%block%_side", + "top": "betterend:block/%block%_top_open" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_block.json b/src/main/resources/assets/betterend/patterns/block/pattern_block.json index 5985f908..237de19a 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_block.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_block.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "betterend:block/%parent%" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_block_bottom_top.json b/src/main/resources/assets/betterend/patterns/block/pattern_block_bottom_top.json index ee6f5d88..4f941210 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_block_bottom_top.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_block_bottom_top.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "betterend:block/%block%_bottom", - "side": "betterend:block/%block%_side", - "top": "betterend:block/%block%_top" - } -} +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "betterend:block/%block%_bottom", + "side": "betterend:block/%block%_side", + "top": "betterend:block/%block%_top" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_block_sided.json b/src/main/resources/assets/betterend/patterns/block/pattern_block_sided.json index 7d956ddd..546abb95 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_block_sided.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_block_sided.json @@ -1,12 +1,12 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "betterend:block/%particle%", - "down": "betterend:block/%down%", - "up": "betterend:block/%up%", - "north": "betterend:block/%north%", - "south": "betterend:block/%south%", - "west": "betterend:block/%west%", - "east": "betterend:block/%east%" - } -} +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "betterend:block/%particle%", + "down": "betterend:block/%down%", + "up": "betterend:block/%up%", + "north": "betterend:block/%north%", + "south": "betterend:block/%south%", + "west": "betterend:block/%west%", + "east": "betterend:block/%east%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_button.json b/src/main/resources/assets/betterend/patterns/block/pattern_button.json index b1b6c2d8..fcbeafdb 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_button.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_button.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button", - "textures": { - "texture": "betterend:block/%parent%" - } +{ + "parent": "block/button", + "textures": { + "texture": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json b/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json index ba85aaba..777366ad 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_button_pressed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "betterend:block/%parent%" - } +{ + "parent": "block/button_pressed", + "textures": { + "texture": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom.json b/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom.json index 3c94e071..e66bf75d 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/sided_door_bottom", - "textures": { - "facade": "betterend:block/%block%_bottom", - "side": "betterend:block/%block%_side" - } -} +{ + "parent": "betterend:block/sided_door_bottom", + "textures": { + "facade": "betterend:block/%block%_bottom", + "side": "betterend:block/%block%_side" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom_hinge.json b/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom_hinge.json index c7ca46eb..f8c20c2b 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom_hinge.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_door_bottom_hinge.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/sided_door_bottom_rh", - "textures": { - "facade": "betterend:block/%block%_bottom", - "side": "betterend:block/%block%_side" - } -} +{ + "parent": "betterend:block/sided_door_bottom_rh", + "textures": { + "facade": "betterend:block/%block%_bottom", + "side": "betterend:block/%block%_side" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_door_top.json b/src/main/resources/assets/betterend/patterns/block/pattern_door_top.json index c1a9171b..e69010a8 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_door_top.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_door_top.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/sided_door_top", - "textures": { - "facade": "betterend:block/%block%_top", - "side": "betterend:block/%block%_side" - } -} +{ + "parent": "betterend:block/sided_door_top", + "textures": { + "facade": "betterend:block/%block%_top", + "side": "betterend:block/%block%_side" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_door_top_hinge.json b/src/main/resources/assets/betterend/patterns/block/pattern_door_top_hinge.json index 5f04777c..274c33b6 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_door_top_hinge.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_door_top_hinge.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/sided_door_top_rh", - "textures": { - "facade": "betterend:block/%block%_top", - "side": "betterend:block/%block%_side" - } -} +{ + "parent": "betterend:block/sided_door_top_rh", + "textures": { + "facade": "betterend:block/%block%_top", + "side": "betterend:block/%block%_side" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_empty.json b/src/main/resources/assets/betterend/patterns/block/pattern_empty.json index 9008f821..001f7b02 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_empty.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_empty.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "betterend:block/%texture%" - } -} +{ + "textures": { + "particle": "betterend:block/%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_closed.json b/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_closed.json index da62db6f..dcbab258 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_closed.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_closed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "betterend:block/%parent%" - } -} +{ + "parent": "block/template_fence_gate", + "textures": { + "texture": "betterend:block/%parent%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_open.json b/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_open.json index 95e02ba2..1e7bc9bd 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_open.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_fence_gate_open.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "betterend:block/%parent%" - } -} +{ + "parent": "block/template_fence_gate_open", + "textures": { + "texture": "betterend:block/%parent%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_fence_post.json b/src/main/resources/assets/betterend/patterns/block/pattern_fence_post.json index 057cfbe3..824045e1 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_fence_post.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_fence_post.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "betterend:block/%parent%" - } -} +{ + "parent": "block/fence_post", + "textures": { + "texture": "betterend:block/%parent%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_fence_side.json b/src/main/resources/assets/betterend/patterns/block/pattern_fence_side.json index 8870ba9b..0bf290c5 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_fence_side.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_fence_side.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "betterend:block/%parent%" - } -} +{ + "parent": "block/fence_side", + "textures": { + "texture": "betterend:block/%parent%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json b/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json index 39b0d96c..fd4af190 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_inner_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "betterend:block/%parent%", - "side": "betterend:block/%parent%", - "top": "betterend:block/%parent%" - } +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "betterend:block/%parent%", + "side": "betterend:block/%parent%", + "top": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_ladder.json b/src/main/resources/assets/betterend/patterns/block/pattern_ladder.json index 579af4df..741a7635 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_ladder.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_ladder.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/ladder", - "textures": { - "texture": "betterend:block/%texture%" - } -} +{ + "parent": "betterend:block/ladder", + "textures": { + "texture": "betterend:block/%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json b/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json index 060a9875..8bb69587 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_outer_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "betterend:block/%parent%", - "side": "betterend:block/%parent%", - "top": "betterend:block/%parent%" - } +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "betterend:block/%parent%", + "side": "betterend:block/%parent%", + "top": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_bottom.json b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_bottom.json index d24efabd..e370058a 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_bottom.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_bottom.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_bottom", - "textures": { - "base": "%mod%:block/%base%", - "pillar": "%mod%:block/%pillar%", - "bottom": "%mod%:block/%bottom%" - } +{ + "parent": "betterend:block/pedestal_bottom", + "textures": { + "base": "%mod%:block/%base%", + "pillar": "%mod%:block/%pillar%", + "bottom": "%mod%:block/%bottom%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column.json b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column.json index 3a1b2754..c8d9712d 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_column", - "textures": { - "base": "%mod%:block/%base%", - "pillar": "%mod%:block/%pillar%", - "bottom": "%mod%:block/%bottom%" - } +{ + "parent": "betterend:block/pedestal_column", + "textures": { + "base": "%mod%:block/%base%", + "pillar": "%mod%:block/%pillar%", + "bottom": "%mod%:block/%bottom%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column_top.json b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column_top.json index 06b858ed..25537cbc 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column_top.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_column_top.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/pedestal_column_top", - "textures": { - "base": "%mod%:block/%base%", - "pillar": "%mod%:block/%pillar%" - } +{ + "parent": "betterend:block/pedestal_column_top", + "textures": { + "base": "%mod%:block/%base%", + "pillar": "%mod%:block/%pillar%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_default.json b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_default.json index b0c67390..3b20a2ea 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_default.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_default.json @@ -1,9 +1,9 @@ -{ - "parent": "betterend:block/pedestal_default", - "textures": { - "top": "%mod%:block/%top%", - "base": "%mod%:block/%base%", - "pillar": "%mod%:block/%pillar%", - "bottom": "%mod%:block/%bottom%" - } +{ + "parent": "betterend:block/pedestal_default", + "textures": { + "top": "%mod%:block/%top%", + "base": "%mod%:block/%base%", + "pillar": "%mod%:block/%pillar%", + "bottom": "%mod%:block/%bottom%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_pillar.json b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_pillar.json index 2eb2a1f3..25e5f3bf 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_pillar.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_pillar.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/pedestal_pillar", - "textures": { - "pillar": "%mod%:block/%pillar%" - } +{ + "parent": "betterend:block/pedestal_pillar", + "textures": { + "pillar": "%mod%:block/%pillar%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_top.json b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_top.json index 93cc04e9..a5457a58 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_top.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pedestal_top.json @@ -1,8 +1,8 @@ -{ - "parent": "betterend:block/pedestal_top", - "textures": { - "top": "%mod%:block/%top%", - "base": "%mod%:block/%base%", - "pillar": "%mod%:block/%pillar%" - } +{ + "parent": "betterend:block/pedestal_top", + "textures": { + "top": "%mod%:block/%top%", + "base": "%mod%:block/%base%", + "pillar": "%mod%:block/%pillar%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json b/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json index 0dafd53c..e28a54e8 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pillar.json @@ -1,7 +1,7 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "betterend:block/%parent%_top", - "side": "betterend:block/%parent%_side" - } +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "betterend:block/%parent%_top", + "side": "betterend:block/%parent%_side" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json b/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json index 9a9285f7..c5a2d22e 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_down.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "betterend:block/%parent%" - } +{ + "parent": "block/pressure_plate_down", + "textures": { + "texture": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json b/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json index e5c7ae95..19d7c9cc 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_pressure_plate_up.json @@ -1,6 +1,6 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "betterend:block/%parent%" - } +{ + "parent": "block/pressure_plate_up", + "textures": { + "texture": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_sapling.json b/src/main/resources/assets/betterend/patterns/block/pattern_sapling.json index 22e48132..98b5ed2f 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_sapling.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_sapling.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "betterend:block/%texture%" - } -} +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "betterend:block/%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_slab.json b/src/main/resources/assets/betterend/patterns/block/pattern_slab.json index 1ac25f99..8b1c6769 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_slab.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_slab.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "betterend:block/%parent%", - "side": "betterend:block/%parent%", - "top": "betterend:block/%parent%" - } +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "betterend:block/%parent%", + "side": "betterend:block/%parent%", + "top": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json b/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json index b6650ea0..86341429 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_stairs.json @@ -1,8 +1,8 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "betterend:block/%parent%", - "side": "betterend:block/%parent%", - "top": "betterend:block/%parent%" - } +{ + "parent": "block/stairs", + "textures": { + "bottom": "betterend:block/%parent%", + "side": "betterend:block/%parent%", + "top": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_trapdoor.json b/src/main/resources/assets/betterend/patterns/block/pattern_trapdoor.json index 18938255..c173a425 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_trapdoor.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_trapdoor.json @@ -1,7 +1,7 @@ -{ - "parent": "betterend:block/sided_trapdoor", - "textures": { - "texture": "betterend:block/%block%", - "side": "betterend:block/%texture%" - } -} +{ + "parent": "betterend:block/sided_trapdoor", + "textures": { + "texture": "betterend:block/%block%", + "side": "betterend:block/%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_closed.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_closed.json index 53da3f90..01137e18 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_closed.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_closed.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "betterend:block/%parent%" - } -} +{ + "parent": "block/template_fence_gate_wall", + "textures": { + "texture": "betterend:block/%parent%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_open.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_open.json index 700a3f56..7804bef0 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_open.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_gate_open.json @@ -1,6 +1,6 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "betterend:block/%parent%" - } -} +{ + "parent": "block/template_fence_gate_wall_open", + "textures": { + "texture": "betterend:block/%parent%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json index 76c092af..7c2f89c0 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_inventory.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "betterend:block/%parent%" - } +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json index 23cf5852..9acedf1f 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_post.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "betterend:block/%parent%" - } +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json index f289b66f..bf2a7db1 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_side.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "betterend:block/%parent%" - } +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json b/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json index ba283ef7..d82c1464 100644 --- a/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json +++ b/src/main/resources/assets/betterend/patterns/block/pattern_wall_side_tall.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "betterend:block/%parent%" - } +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/stone_lantern_ceil.json b/src/main/resources/assets/betterend/patterns/block/stone_lantern_ceil.json new file mode 100644 index 00000000..a4ba3b3c --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/block/stone_lantern_ceil.json @@ -0,0 +1,155 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/%block%_side", + "texture": "betterend:block/%block%_side", + "top": "betterend:block/%block%_top", + "crystal": "betterend:block/aurora_crystal", + "bottom": "betterend:block/%block%_bottom" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 1, 4 ], + "to": [ 12, 2, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom" }, + "north": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" }, + "south": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" }, + "west": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" }, + "east": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 2, 3 ], + "to": [ 13, 4, 13 ], + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#bottom" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, + "south": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, + "west": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, + "east": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 12, 3 ], + "to": [ 13, 14, 13 ], + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#bottom" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 3, 13, 5 ], "texture": "#texture" }, + "south": { "uv": [ 3, 3, 13, 5 ], "texture": "#texture" }, + "west": { "uv": [ 3, 3, 13, 5 ], "texture": "#texture" }, + "east": { "uv": [ 3, 3, 13, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 14, 4 ], + "to": [ 12, 15, 12 ], + "faces": { + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 2, 12, 3 ], "texture": "#texture" }, + "south": { "uv": [ 4, 2, 12, 3 ], "texture": "#texture" }, + "west": { "uv": [ 4, 2, 12, 3 ], "texture": "#texture" }, + "east": { "uv": [ 4, 2, 12, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 5, 4 ], + "to": [ 6, 11, 6 ], + "faces": { + "north": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "south": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "west": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 5, 4 ], + "to": [ 12, 11, 6 ], + "faces": { + "north": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "west": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 5, 10 ], + "to": [ 6, 11, 12 ], + "faces": { + "north": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "south": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "east": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 5, 10 ], + "to": [ 12, 11, 12 ], + "faces": { + "north": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "east": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6, 15, 6 ], + "to": [ 10, 16, 10 ], + "faces": { + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#top" }, + "north": { "uv": [ 6, 1, 10, 2 ], "texture": "#texture" }, + "south": { "uv": [ 6, 1, 10, 2 ], "texture": "#texture" }, + "west": { "uv": [ 6, 1, 10, 2 ], "texture": "#texture" }, + "east": { "uv": [ 6, 1, 10, 2 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 4, 4 ], + "to": [ 12, 5, 12 ], + "faces": { + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 12, 12, 13 ], "texture": "#texture" }, + "south": { "uv": [ 4, 12, 12, 13 ], "texture": "#texture" }, + "west": { "uv": [ 4, 12, 12, 13 ], "texture": "#texture" }, + "east": { "uv": [ 4, 12, 12, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 11, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom" }, + "north": { "uv": [ 4, 5, 12, 6 ], "texture": "#texture" }, + "south": { "uv": [ 4, 5, 12, 6 ], "texture": "#texture" }, + "west": { "uv": [ 4, 5, 12, 6 ], "texture": "#texture" }, + "east": { "uv": [ 4, 5, 12, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Box10", + "from": [ 6, 5, 6 ], + "to": [ 10, 11, 10 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 5, 10, 11 ], "texture": "#crystal", "tintindex": 0 }, + "south": { "uv": [ 6, 5, 10, 11 ], "texture": "#crystal", "tintindex": 0 }, + "west": { "uv": [ 6, 5, 10, 11 ], "texture": "#crystal", "tintindex": 0 }, + "east": { "uv": [ 6, 5, 10, 11 ], "texture": "#crystal", "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/stone_lantern_floor.json b/src/main/resources/assets/betterend/patterns/block/stone_lantern_floor.json new file mode 100644 index 00000000..ebd3ba42 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/block/stone_lantern_floor.json @@ -0,0 +1,155 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/%block%_side", + "texture": "betterend:block/%block%_side", + "top": "betterend:block/%block%_top", + "crystal": "betterend:block/aurora_crystal", + "bottom": "betterend:block/%block%_bottom" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 0, 4 ], + "to": [ 12, 1, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, + "north": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" }, + "south": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" }, + "west": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" }, + "east": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 1, 3 ], + "to": [ 13, 3, 13 ], + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#bottom" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, + "south": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, + "west": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, + "east": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 11, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#bottom" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 3, 13, 5 ], "texture": "#texture" }, + "south": { "uv": [ 3, 3, 13, 5 ], "texture": "#texture" }, + "west": { "uv": [ 3, 3, 13, 5 ], "texture": "#texture" }, + "east": { "uv": [ 3, 3, 13, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 13, 4 ], + "to": [ 12, 14, 12 ], + "faces": { + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 2, 12, 3 ], "texture": "#texture" }, + "south": { "uv": [ 4, 2, 12, 3 ], "texture": "#texture" }, + "west": { "uv": [ 4, 2, 12, 3 ], "texture": "#texture" }, + "east": { "uv": [ 4, 2, 12, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 4, 4 ], + "to": [ 6, 10, 6 ], + "faces": { + "north": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "south": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "west": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 4, 4 ], + "to": [ 12, 10, 6 ], + "faces": { + "north": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "west": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 4, 10 ], + "to": [ 6, 10, 12 ], + "faces": { + "north": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "south": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "east": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 4, 10 ], + "to": [ 12, 10, 12 ], + "faces": { + "north": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 6, 12, 12 ], "texture": "#texture" }, + "east": { "uv": [ 4, 6, 6, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6, 14, 6 ], + "to": [ 10, 15, 10 ], + "faces": { + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#top" }, + "north": { "uv": [ 6, 1, 10, 2 ], "texture": "#texture" }, + "south": { "uv": [ 6, 1, 10, 2 ], "texture": "#texture" }, + "west": { "uv": [ 6, 1, 10, 2 ], "texture": "#texture" }, + "east": { "uv": [ 6, 1, 10, 2 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 3, 4 ], + "to": [ 12, 4, 12 ], + "faces": { + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 12, 12, 13 ], "texture": "#texture" }, + "south": { "uv": [ 4, 12, 12, 13 ], "texture": "#texture" }, + "west": { "uv": [ 4, 12, 12, 13 ], "texture": "#texture" }, + "east": { "uv": [ 4, 12, 12, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 10, 4 ], + "to": [ 12, 11, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom" }, + "north": { "uv": [ 4, 5, 12, 6 ], "texture": "#texture" }, + "south": { "uv": [ 4, 5, 12, 6 ], "texture": "#texture" }, + "west": { "uv": [ 4, 5, 12, 6 ], "texture": "#texture" }, + "east": { "uv": [ 4, 5, 12, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Box10", + "from": [ 6, 4, 6 ], + "to": [ 10, 10, 10 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 10, 12 ], "texture": "#crystal", "tintindex": 0 }, + "south": { "uv": [ 6, 6, 10, 12 ], "texture": "#crystal", "tintindex": 0 }, + "west": { "uv": [ 6, 6, 10, 12 ], "texture": "#crystal", "tintindex": 0 }, + "east": { "uv": [ 6, 6, 10, 12 ], "texture": "#crystal", "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_barrel.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_barrel.json index 26ffbc1b..d0e55903 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_barrel.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_barrel.json @@ -1,56 +1,56 @@ -{ - "variants": { - "facing=down,open=false": { - "model": "betterend:pattern/%block%", - "x": 180 - }, - "facing=down,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "x": 180 - }, - "facing=east,open=false": { - "model": "betterend:pattern/%block%", - "x": 90, - "y": 90 - }, - "facing=east,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "x": 90, - "y": 90 - }, - "facing=north,open=false": { - "model": "betterend:pattern/%block%", - "x": 90 - }, - "facing=north,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "x": 90 - }, - "facing=south,open=false": { - "model": "betterend:pattern/%block%", - "x": 90, - "y": 180 - }, - "facing=south,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "x": 90, - "y": 180 - }, - "facing=up,open=false": { - "model": "betterend:pattern/%block%" - }, - "facing=up,open=true": { - "model": "betterend:pattern/%block%/%block%_open" - }, - "facing=west,open=false": { - "model": "betterend:pattern/%block%", - "x": 90, - "y": 270 - }, - "facing=west,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "x": 90, - "y": 270 - } - } -} +{ + "variants": { + "facing=down,open=false": { + "model": "betterend:pattern/%block%", + "x": 180 + }, + "facing=down,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "x": 180 + }, + "facing=east,open=false": { + "model": "betterend:pattern/%block%", + "x": 90, + "y": 90 + }, + "facing=east,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "x": 90, + "y": 90 + }, + "facing=north,open=false": { + "model": "betterend:pattern/%block%", + "x": 90 + }, + "facing=north,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "x": 90 + }, + "facing=south,open=false": { + "model": "betterend:pattern/%block%", + "x": 90, + "y": 180 + }, + "facing=south,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "x": 90, + "y": 180 + }, + "facing=up,open=false": { + "model": "betterend:pattern/%block%" + }, + "facing=up,open=true": { + "model": "betterend:pattern/%block%/%block%_open" + }, + "facing=west,open=false": { + "model": "betterend:pattern/%block%", + "x": 90, + "y": 270 + }, + "facing=west,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "x": 90, + "y": 270 + } + } +} diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json index c2eaaf79..e3210284 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_block.json @@ -1,7 +1,7 @@ -{ - "variants": { - "": { - "model": "betterend:pattern/%block%" - } - } +{ + "variants": { + "": { + "model": "betterend:pattern/%block%" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json index d4bf513f..5b11978a 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_button.json @@ -1,118 +1,118 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "betterend:pattern/%block%", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=east,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=north,powered=false": { - "model": "betterend:pattern/%block%", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=south,powered=false": { - "model": "betterend:pattern/%block%", - "x": 180 - }, - "face=ceiling,facing=south,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "x": 180 - }, - "face=ceiling,facing=west,powered=false": { - "model": "betterend:pattern/%block%", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=west,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "x": 180, - "y": 90 - }, - "face=floor,facing=east,powered=false": { - "model": "betterend:pattern/%block%", - "y": 90 - }, - "face=floor,facing=east,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "y": 90 - }, - "face=floor,facing=north,powered=false": { - "model": "betterend:pattern/%block%" - }, - "face=floor,facing=north,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed" - }, - "face=floor,facing=south,powered=false": { - "model": "betterend:pattern/%block%", - "y": 180 - }, - "face=floor,facing=south,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "y": 180 - }, - "face=floor,facing=west,powered=false": { - "model": "betterend:pattern/%block%", - "y": 270 - }, - "face=floor,facing=west,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "y": 270 - }, - "face=wall,facing=east,powered=false": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=east,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=north,powered=false": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=north,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=south,powered=false": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=south,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=west,powered=false": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=west,powered=true": { - "model": "betterend:pattern/%block%/%block%_pressed", - "uvlock": true, - "x": 90, - "y": 270 - } - } +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "betterend:pattern/%block%", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "betterend:pattern/%block%", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "betterend:pattern/%block%", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "betterend:pattern/%block%", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "betterend:pattern/%block%", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "betterend:pattern/%block%" + }, + "face=floor,facing=north,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "betterend:pattern/%block%", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "betterend:pattern/%block%", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "betterend:pattern/%block%/%block%_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_door.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_door.json index d194b2e6..55e2892c 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_door.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_door.json @@ -1,124 +1,124 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "betterend:pattern/%block%/%block%_bottom" - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "betterend:pattern/%block%/%block%_bottom_hinge", - "y": 90 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "betterend:pattern/%block%/%block%_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "betterend:pattern/%block%/%block%_bottom", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "betterend:pattern/%block%/%block%_top" - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "betterend:pattern/%block%/%block%_top_hinge", - "y": 90 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "betterend:pattern/%block%/%block%_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "betterend:pattern/%block%/%block%_top", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "betterend:pattern/%block%/%block%_bottom", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "betterend:pattern/%block%/%block%_bottom_hinge" - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "betterend:pattern/%block%/%block%_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "betterend:pattern/%block%/%block%_bottom", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "betterend:pattern/%block%/%block%_top", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "betterend:pattern/%block%/%block%_top_hinge" - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "betterend:pattern/%block%/%block%_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "betterend:pattern/%block%/%block%_top", - "y": 180 - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "betterend:pattern/%block%/%block%_bottom", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "betterend:pattern/%block%/%block%_bottom_hinge", - "y": 180 - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "betterend:pattern/%block%/%block%_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "betterend:pattern/%block%/%block%_bottom" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "betterend:pattern/%block%/%block%_top", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "betterend:pattern/%block%/%block%_top_hinge", - "y": 180 - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "betterend:pattern/%block%/%block%_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "betterend:pattern/%block%/%block%_top" - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "betterend:pattern/%block%/%block%_bottom", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "betterend:pattern/%block%/%block%_bottom_hinge", - "y": 270 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "betterend:pattern/%block%/%block%_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "betterend:pattern/%block%/%block%_bottom", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "betterend:pattern/%block%/%block%_top", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "betterend:pattern/%block%/%block%_top_hinge", - "y": 270 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "betterend:pattern/%block%/%block%_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "betterend:pattern/%block%/%block%_top", - "y": 90 - } - } -} +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "betterend:pattern/%block%/%block%_bottom" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "betterend:pattern/%block%/%block%_bottom_hinge", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "betterend:pattern/%block%/%block%_bottom_hinge" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "betterend:pattern/%block%/%block%_bottom", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "betterend:pattern/%block%/%block%_top" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "betterend:pattern/%block%/%block%_top_hinge", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "betterend:pattern/%block%/%block%_top_hinge" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "betterend:pattern/%block%/%block%_top", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "betterend:pattern/%block%/%block%_bottom", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "betterend:pattern/%block%/%block%_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "betterend:pattern/%block%/%block%_bottom_hinge", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "betterend:pattern/%block%/%block%_bottom", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "betterend:pattern/%block%/%block%_top", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "betterend:pattern/%block%/%block%_top_hinge" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "betterend:pattern/%block%/%block%_top_hinge", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "betterend:pattern/%block%/%block%_top", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "betterend:pattern/%block%/%block%_bottom", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "betterend:pattern/%block%/%block%_bottom_hinge", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "betterend:pattern/%block%/%block%_bottom_hinge", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "betterend:pattern/%block%/%block%_bottom" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "betterend:pattern/%block%/%block%_top", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "betterend:pattern/%block%/%block%_top_hinge", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "betterend:pattern/%block%/%block%_top_hinge", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "betterend:pattern/%block%/%block%_top" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "betterend:pattern/%block%/%block%_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "betterend:pattern/%block%/%block%_bottom_hinge", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "betterend:pattern/%block%/%block%_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "betterend:pattern/%block%/%block%_bottom", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "betterend:pattern/%block%/%block%_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "betterend:pattern/%block%/%block%_top_hinge", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "betterend:pattern/%block%/%block%_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "betterend:pattern/%block%/%block%_top", + "y": 90 + } + } +} diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence.json index 9667f89d..f4f56fdf 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence.json @@ -1,48 +1,48 @@ -{ - "multipart": [ - { - "apply": { - "model": "betterend:pattern/%block%/%block%_post" - } - }, - { - "apply": { - "model": "betterend:pattern/%block%/%block%_side", - "uvlock": true - }, - "when": { - "north": true - } - }, - { - "apply": { - "model": "betterend:pattern/%block%/%block%_side", - "uvlock": true, - "y": 90 - }, - "when": { - "east": true - } - }, - { - "apply": { - "model": "betterend:pattern/%block%/%block%_side", - "uvlock": true, - "y": 180 - }, - "when": { - "south": true - } - }, - { - "apply": { - "model": "betterend:pattern/%block%/%block%_side", - "uvlock": true, - "y": 270 - }, - "when": { - "west": true - } - } - ] -} +{ + "multipart": [ + { + "apply": { + "model": "betterend:pattern/%block%/%block%_post" + } + }, + { + "apply": { + "model": "betterend:pattern/%block%/%block%_side", + "uvlock": true + }, + "when": { + "north": true + } + }, + { + "apply": { + "model": "betterend:pattern/%block%/%block%_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": true + } + }, + { + "apply": { + "model": "betterend:pattern/%block%/%block%_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": true + } + }, + { + "apply": { + "model": "betterend:pattern/%block%/%block%_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": true + } + } + ] +} diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence_gate.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence_gate.json index b9a38445..4d91b44a 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence_gate.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_fence_gate.json @@ -1,80 +1,80 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "model": "betterend:pattern/%block%/%block%_closed", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=false,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=false": { - "model": "betterend:pattern/%block%/%block%_wall_closed", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=true": { - "model": "betterend:pattern/%block%/%block%_wall_open", - "uvlock": true, - "y": 270 - }, - "facing=north,in_wall=false,open=false": { - "model": "betterend:pattern/%block%/%block%_closed", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=false,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=false": { - "model": "betterend:pattern/%block%/%block%_wall_closed", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=true": { - "model": "betterend:pattern/%block%/%block%_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=south,in_wall=false,open=false": { - "model": "betterend:pattern/%block%/%block%_closed", - "uvlock": true - }, - "facing=south,in_wall=false,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "uvlock": true - }, - "facing=south,in_wall=true,open=false": { - "model": "betterend:pattern/%block%/%block%_wall_closed", - "uvlock": true - }, - "facing=south,in_wall=true,open=true": { - "model": "betterend:pattern/%block%/%block%_wall_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "betterend:pattern/%block%/%block%_closed", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=false,open=true": { - "model": "betterend:pattern/%block%/%block%_open", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=false": { - "model": "betterend:pattern/%block%/%block%_wall_closed", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=true": { - "model": "betterend:pattern/%block%/%block%_wall_open", - "uvlock": true, - "y": 90 - } - } -} +{ + "variants": { + "facing=east,in_wall=false,open=false": { + "model": "betterend:pattern/%block%/%block%_closed", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=false,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=true,open=false": { + "model": "betterend:pattern/%block%/%block%_wall_closed", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=true,open=true": { + "model": "betterend:pattern/%block%/%block%_wall_open", + "uvlock": true, + "y": 270 + }, + "facing=north,in_wall=false,open=false": { + "model": "betterend:pattern/%block%/%block%_closed", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=false,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=true,open=false": { + "model": "betterend:pattern/%block%/%block%_wall_closed", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=true,open=true": { + "model": "betterend:pattern/%block%/%block%_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "betterend:pattern/%block%/%block%_closed", + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "betterend:pattern/%block%/%block%_wall_closed", + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "betterend:pattern/%block%/%block%_wall_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "betterend:pattern/%block%/%block%_closed", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=false,open=true": { + "model": "betterend:pattern/%block%/%block%_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "betterend:pattern/%block%/%block%_wall_closed", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { + "model": "betterend:pattern/%block%/%block%_wall_open", + "uvlock": true, + "y": 90 + } + } +} diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json index 2bf2f520..e02e2aff 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_ladder.json @@ -1,19 +1,19 @@ -{ - "variants": { - "facing=north": { - "model": "betterend:pattern/%block%" - }, - "facing=east": { - "model": "betterend:pattern/%block%", - "y": 90 - }, - "facing=south": { - "model": "betterend:pattern/%block%", - "y": 180 - }, - "facing=west": { - "model": "betterend:pattern/%block%", - "y": 270 - } - } -} +{ + "variants": { + "facing=north": { + "model": "betterend:pattern/%block%" + }, + "facing=east": { + "model": "betterend:pattern/%block%", + "y": 90 + }, + "facing=south": { + "model": "betterend:pattern/%block%", + "y": 180 + }, + "facing=west": { + "model": "betterend:pattern/%block%", + "y": 270 + } + } +} diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pedestal.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pedestal.json index e52dcb8c..17d389b4 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pedestal.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pedestal.json @@ -1,22 +1,22 @@ -{ - "variants": { - "state=default": { - "model": "betterend:pattern/%block%/%block%_default" - }, - "state=column": { - "model": "betterend:pattern/%block%/%block%_column" - }, - "state=column_top": { - "model": "betterend:pattern/%block%/%block%_column_top" - }, - "state=pedestal_top": { - "model": "betterend:pattern/%block%/%block%_top" - }, - "state=bottom": { - "model": "betterend:pattern/%block%/%block%_bottom" - }, - "state=pillar": { - "model": "betterend:pattern/%block%/%block%_pillar" - } - } +{ + "variants": { + "state=default": { + "model": "betterend:pattern/%block%/%block%_default" + }, + "state=column": { + "model": "betterend:pattern/%block%/%block%_column" + }, + "state=column_top": { + "model": "betterend:pattern/%block%/%block%_column_top" + }, + "state=pedestal_top": { + "model": "betterend:pattern/%block%/%block%_top" + }, + "state=bottom": { + "model": "betterend:pattern/%block%/%block%_bottom" + }, + "state=pillar": { + "model": "betterend:pattern/%block%/%block%_pillar" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json index f752f00b..078eff09 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pillar.json @@ -1,7 +1,7 @@ -{ - "variants": { - "axis=x": { "model": "betterend:pattern/%block%", "x": 90, "y": 90 }, - "axis=y": { "model": "betterend:pattern/%block%" }, - "axis=z": { "model": "betterend:pattern/%block%", "x": 90 } - } +{ + "variants": { + "axis=x": { "model": "betterend:pattern/%block%", "x": 90, "y": 90 }, + "axis=y": { "model": "betterend:pattern/%block%" }, + "axis=z": { "model": "betterend:pattern/%block%", "x": 90 } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json index f2781e4b..e0184902 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_pressure_plate.json @@ -1,10 +1,10 @@ -{ - "variants": { - "powered=false": { - "model": "betterend:pattern/%block%/%block%_up" - }, - "powered=true": { - "model": "betterend:pattern/%block%/%block%_down" - } - } +{ + "variants": { + "powered=false": { + "model": "betterend:pattern/%block%/%block%_up" + }, + "powered=true": { + "model": "betterend:pattern/%block%/%block%_down" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_sapling.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_sapling.json index 895caf78..55e9080f 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_sapling.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_sapling.json @@ -1,5 +1,5 @@ -{ - "variants": { - "": { "model": "betterend:pattern/%block%" } - } +{ + "variants": { + "": { "model": "betterend:pattern/%block%" } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json index 2ae9b387..a6b22fa8 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_slab.json @@ -1,15 +1,15 @@ -{ - "variants": { - "type=bottom": { - "model": "betterend:pattern/%block%" - }, - "type=double": { - "model": "betterend:block/%parent%" - }, - "type=top": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 180 - } - } +{ + "variants": { + "type=bottom": { + "model": "betterend:pattern/%block%" + }, + "type=double": { + "model": "betterend:block/%parent%" + }, + "type=top": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 180 + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json index 2fc8f835..818305f8 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_stairs.json @@ -1,209 +1,209 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "betterend:pattern/%block%/%block%_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "betterend:pattern/%block%/%block%_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "betterend:pattern/%block%" - }, - "facing=east,half=top,shape=inner_left": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "betterend:pattern/%block%/%block%_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "betterend:pattern/%block%/%block%_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "betterend:pattern/%block%/%block%_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "betterend:pattern/%block%/%block%_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "betterend:pattern/%block%", - "uvlock": true, - "x": 180, - "y": 180 - } - } +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "betterend:pattern/%block%/%block%_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "betterend:pattern/%block%/%block%_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "betterend:pattern/%block%" + }, + "facing=east,half=top,shape=inner_left": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "betterend:pattern/%block%/%block%_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "betterend:pattern/%block%/%block%_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "betterend:pattern/%block%/%block%_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "betterend:pattern/%block%/%block%_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "betterend:pattern/%block%", + "uvlock": true, + "x": 180, + "y": 180 + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_trapdoor.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_trapdoor.json index 9d21f404..1c1da9c4 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_trapdoor.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_trapdoor.json @@ -1,77 +1,77 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "betterend:pattern/%block%", - "y": 90 - }, - "facing=east,half=bottom,open=true": { - "model": "betterend:pattern/%block%", - "x": 90, - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "betterend:pattern/%block%", - "x": 180, - "y": 90 - }, - "facing=east,half=top,open=true": { - "model": "betterend:pattern/%block%", - "x": 270, - "y": 270 - }, - "facing=north,half=bottom,open=false": { - "model": "betterend:pattern/%block%" - }, - "facing=north,half=bottom,open=true": { - "model": "betterend:pattern/%block%", - "x": 90 - }, - "facing=north,half=top,open=false": { - "model": "betterend:pattern/%block%", - "x": 180 - }, - "facing=north,half=top,open=true": { - "model": "betterend:pattern/%block%", - "x": 270, - "y": 180 - }, - "facing=south,half=bottom,open=false": { - "model": "betterend:pattern/%block%", - "y": 180 - }, - "facing=south,half=bottom,open=true": { - "model": "betterend:pattern/%block%", - "x": 90, - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "betterend:pattern/%block%", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "betterend:pattern/%block%", - "x": 270, - "y": 0 - }, - "facing=west,half=bottom,open=false": { - "model": "betterend:pattern/%block%", - "y": 270 - }, - "facing=west,half=bottom,open=true": { - "model": "betterend:pattern/%block%", - "x": 90, - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "betterend:pattern/%block%", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "betterend:pattern/%block%", - "x": 270, - "y": 90 - } - } -} +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "betterend:pattern/%block%", + "y": 90 + }, + "facing=east,half=bottom,open=true": { + "model": "betterend:pattern/%block%", + "x": 90, + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "betterend:pattern/%block%", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "betterend:pattern/%block%", + "x": 270, + "y": 270 + }, + "facing=north,half=bottom,open=false": { + "model": "betterend:pattern/%block%" + }, + "facing=north,half=bottom,open=true": { + "model": "betterend:pattern/%block%", + "x": 90 + }, + "facing=north,half=top,open=false": { + "model": "betterend:pattern/%block%", + "x": 180 + }, + "facing=north,half=top,open=true": { + "model": "betterend:pattern/%block%", + "x": 270, + "y": 180 + }, + "facing=south,half=bottom,open=false": { + "model": "betterend:pattern/%block%", + "y": 180 + }, + "facing=south,half=bottom,open=true": { + "model": "betterend:pattern/%block%", + "x": 90, + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "betterend:pattern/%block%", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "betterend:pattern/%block%", + "x": 270, + "y": 0 + }, + "facing=west,half=bottom,open=false": { + "model": "betterend:pattern/%block%", + "y": 270 + }, + "facing=west,half=bottom,open=true": { + "model": "betterend:pattern/%block%", + "x": 90, + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "betterend:pattern/%block%", + "x": 180, + "y": 270 + }, + "facing=west,half=top,open=true": { + "model": "betterend:pattern/%block%", + "x": 270, + "y": 90 + } + } +} diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json index a09ffd57..5d69a841 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_wall.json @@ -1,90 +1,90 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_post" - } - }, - { - "when": { - "north": "low" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_side", - "uvlock": true - } - }, - { - "when": { - "east": "low" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "low" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "low" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "north": "tall" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_side_tall", - "uvlock": true - } - }, - { - "when": { - "east": "tall" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_side_tall", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "south": "tall" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_side_tall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "tall" - }, - "apply": { - "model": "betterend:pattern/%block%/%block%_side_tall", - "y": 270, - "uvlock": true - } - } - ] +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "betterend:pattern/%block%/%block%_side_tall", + "y": 270, + "uvlock": true + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/stone_lantern.json b/src/main/resources/assets/betterend/patterns/blockstate/stone_lantern.json new file mode 100644 index 00000000..f8917353 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/blockstate/stone_lantern.json @@ -0,0 +1,6 @@ +{ + "variants": { + "is_floor=false": { "model": "betterend:pattern/%block%/%block%_ceil" }, + "is_floor=true": { "model": "betterend:pattern/%block%/%block%_floor" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_block_item.json b/src/main/resources/assets/betterend/patterns/item/pattern_block_item.json index 79412c0a..8c7a1b76 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_block_item.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_block_item.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:block/%texture%" - } -} +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_button.json b/src/main/resources/assets/betterend/patterns/item/pattern_button.json index ddf66659..cd18bb89 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_button.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_button.json @@ -1,6 +1,6 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "betterend:block/%parent%" - } +{ + "parent": "block/button_inventory", + "textures": { + "texture": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_chest.json b/src/main/resources/assets/betterend/patterns/item/pattern_chest.json index 1febc69c..f2ac2fa3 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_chest.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_chest.json @@ -1,6 +1,6 @@ -{ - "parent": "betterend:block/chest_item", - "textures": { - "texture": "betterend:entity/chest/%texture%" - } -} +{ + "parent": "betterend:block/chest_item", + "textures": { + "texture": "betterend:entity/chest/%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_fence.json b/src/main/resources/assets/betterend/patterns/item/pattern_fence.json index d63ee15b..7ffb87d9 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_fence.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_fence.json @@ -1,6 +1,6 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "betterend:block/%parent%" - } -} +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "betterend:block/%parent%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_item.json b/src/main/resources/assets/betterend/patterns/item/pattern_item.json index 65ac21fc..9d72ad4a 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_item.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_item.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/%texture%" - } -} +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_wall.json b/src/main/resources/assets/betterend/patterns/item/pattern_wall.json index 76c092af..7c2f89c0 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_wall.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_wall.json @@ -1,6 +1,6 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "betterend:block/%parent%" - } +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "betterend:block/%parent%" + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/shaders/material/glow_10.frag b/src/main/resources/assets/betterend/shaders/material/glow_10.frag index 70f71947..cc21726c 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_10.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_10.frag @@ -1,6 +1,6 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.1 ? 1 : 0; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.1 ? 1 : 0; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_20_half.frag b/src/main/resources/assets/betterend/shaders/material/glow_20_half.frag index 9efc319b..c4c92a19 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_20_half.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_20_half.frag @@ -1,8 +1,8 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - float glow = frx_luminance(fragData.spriteColor.rgb) - 0.2; - glow = clamp(glow * 3, 0, 0.5); - fragData.emissivity = glow; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + float glow = frx_luminance(fragData.spriteColor.rgb) - 0.2; + glow = clamp(glow * 3, 0, 0.5); + fragData.emissivity = glow; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_33.frag b/src/main/resources/assets/betterend/shaders/material/glow_33.frag index 1aa1b27d..3cd1a7fe 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_33.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_33.frag @@ -1,6 +1,6 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.33 ? 1 : 0; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.33 ? 1 : 0; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_33_half.frag b/src/main/resources/assets/betterend/shaders/material/glow_33_half.frag index 17f1e47e..13e68d20 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_33_half.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_33_half.frag @@ -1,6 +1,6 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.33 ? 0.5 : 0; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.33 ? 0.5 : 0; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_50.frag b/src/main/resources/assets/betterend/shaders/material/glow_50.frag index 40a3441b..e1c3af27 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_50.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_50.frag @@ -1,6 +1,6 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.5 ? 1 : 0; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.5 ? 1 : 0; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_50_blue.frag b/src/main/resources/assets/betterend/shaders/material/glow_50_blue.frag index af528089..3f0c5554 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_50_blue.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_50_blue.frag @@ -1,8 +1,8 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - float a = abs(fragData.spriteColor.b - fragData.spriteColor.r); - float b = abs(fragData.spriteColor.b - fragData.spriteColor.g); - fragData.emissivity = (a > 0.1 && b > 0.1 && fragData.spriteColor.b > 0.5) ? 1 : 0; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + float a = abs(fragData.spriteColor.b - fragData.spriteColor.r); + float b = abs(fragData.spriteColor.b - fragData.spriteColor.g); + fragData.emissivity = (a > 0.1 && b > 0.1 && fragData.spriteColor.b > 0.5) ? 1 : 0; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_50_half.frag b/src/main/resources/assets/betterend/shaders/material/glow_50_half.frag index 349cfacc..b88e5c63 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_50_half.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_50_half.frag @@ -1,6 +1,6 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.5 ? 0.5 : 0; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = frx_luminance(fragData.spriteColor.rgb) > 0.5 ? 0.5 : 0; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_all.frag b/src/main/resources/assets/betterend/shaders/material/glow_all.frag index 2458e833..242501f8 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_all.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_all.frag @@ -1,6 +1,6 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = 1; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = 1; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_all_half.frag b/src/main/resources/assets/betterend/shaders/material/glow_all_half.frag index 7bb29ff4..0135e3c4 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_all_half.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_all_half.frag @@ -1,6 +1,6 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = 0.5; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = 0.5; +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_inc.frag b/src/main/resources/assets/betterend/shaders/material/glow_inc.frag index 7000eb4f..e44f5622 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_inc.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_inc.frag @@ -1,7 +1,7 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - float light = frx_luminance(fragData.spriteColor.rgb) * 2 - 0.3; - fragData.emissivity = clamp(light, 0, 1); -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + float light = frx_luminance(fragData.spriteColor.rgb) * 2 - 0.3; + fragData.emissivity = clamp(light, 0, 1); +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_transparent.frag b/src/main/resources/assets/betterend/shaders/material/glow_transparent.frag index 562c7ace..53f4a4ea 100644 --- a/src/main/resources/assets/betterend/shaders/material/glow_transparent.frag +++ b/src/main/resources/assets/betterend/shaders/material/glow_transparent.frag @@ -1,8 +1,8 @@ -#include frex:shaders/api/fragment.glsl -#include frex:shaders/lib/math.glsl - -void frx_startFragment(inout frx_FragmentData fragData) { - fragData.emissivity = 1; - fragData.ao = false; - fragData.diffuse = false; -} +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = 1; + fragData.ao = false; + fragData.diffuse = false; +} diff --git a/src/main/resources/assets/betterend/shaders/material/offset_floor.vert b/src/main/resources/assets/betterend/shaders/material/offset_floor.vert index a80a3b5e..c6c19e47 100644 --- a/src/main/resources/assets/betterend/shaders/material/offset_floor.vert +++ b/src/main/resources/assets/betterend/shaders/material/offset_floor.vert @@ -1,18 +1,18 @@ -#include frex:shaders/api/vertex.glsl -#include frex:shaders/api/world.glsl -#include frex:shaders/lib/math.glsl -#include frex:shaders/lib/noise/noise4d.glsl - -/****************************************************** - Based on "GPU-Generated Procedural Wind Animations for Trees" - by Renaldas Zioma in GPU Gems 3, 2007 - https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees - - Remake of canvas default shader for the Nether -******************************************************/ - -#define NOISE_SCALE 0.125 - -void frx_startVertex(inout frx_VertexData data) { - data.vertex.xz += data.normal.xz * data.spriteUV.y * 0.02; -} +#include frex:shaders/api/vertex.glsl +#include frex:shaders/api/world.glsl +#include frex:shaders/lib/math.glsl +#include frex:shaders/lib/noise/noise4d.glsl + +/****************************************************** + Based on "GPU-Generated Procedural Wind Animations for Trees" + by Renaldas Zioma in GPU Gems 3, 2007 + https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees + + Remake of canvas default shader for the Nether +******************************************************/ + +#define NOISE_SCALE 0.125 + +void frx_startVertex(inout frx_VertexData data) { + data.vertex.xz += data.normal.xz * data.spriteUV.y * 0.02; +} diff --git a/src/main/resources/assets/betterend/shaders/material/small_wave.vert b/src/main/resources/assets/betterend/shaders/material/small_wave.vert index 2d726f17..3314593a 100644 --- a/src/main/resources/assets/betterend/shaders/material/small_wave.vert +++ b/src/main/resources/assets/betterend/shaders/material/small_wave.vert @@ -1,24 +1,24 @@ -#include frex:shaders/api/vertex.glsl -#include frex:shaders/api/world.glsl -#include frex:shaders/lib/math.glsl -#include frex:shaders/lib/noise/noise4d.glsl - -/****************************************************** - Based on "GPU-Generated Procedural Wind Animations for Trees" - by Renaldas Zioma in GPU Gems 3, 2007 - https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees - - Remake of canvas default shader for the Nether -******************************************************/ - -void frx_startVertex(inout frx_VertexData data) { - #ifdef ANIMATED_FOLIAGE - float t = frx_renderSeconds() * 0.05; - - vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * 0.5; - float wind = snoise(vec4(pos, t)) * 0.02; - - data.vertex.x += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; - data.vertex.z += sin(t * 19) * wind; - #endif -} +#include frex:shaders/api/vertex.glsl +#include frex:shaders/api/world.glsl +#include frex:shaders/lib/math.glsl +#include frex:shaders/lib/noise/noise4d.glsl + +/****************************************************** + Based on "GPU-Generated Procedural Wind Animations for Trees" + by Renaldas Zioma in GPU Gems 3, 2007 + https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees + + Remake of canvas default shader for the Nether +******************************************************/ + +void frx_startVertex(inout frx_VertexData data) { + #ifdef ANIMATED_FOLIAGE + float t = frx_renderSeconds() * 0.05; + + vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * 0.5; + float wind = snoise(vec4(pos, t)) * 0.02; + + data.vertex.x += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; + data.vertex.z += sin(t * 19) * wind; + #endif +} diff --git a/src/main/resources/assets/betterend/shaders/material/wall_wave.vert b/src/main/resources/assets/betterend/shaders/material/wall_wave.vert index f95caecb..6cf34fe1 100644 --- a/src/main/resources/assets/betterend/shaders/material/wall_wave.vert +++ b/src/main/resources/assets/betterend/shaders/material/wall_wave.vert @@ -1,27 +1,27 @@ -#include frex:shaders/api/vertex.glsl -#include frex:shaders/api/world.glsl -#include frex:shaders/lib/math.glsl -#include frex:shaders/lib/noise/noise4d.glsl - -/****************************************************** - Based on "GPU-Generated Procedural Wind Animations for Trees" - by Renaldas Zioma in GPU Gems 3, 2007 - https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees - - Remake of canvas default shader for the Nether -******************************************************/ - -void frx_startVertex(inout frx_VertexData data) { - #ifdef ANIMATED_FOLIAGE - float t = frx_renderSeconds() * 0.05; - - vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * 0.5; - float wind = snoise(vec4(pos, t)) * 0.1; - - wind *= 1 - data.spriteUV.y; - - data.vertex.y += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; - data.vertex.x += cos(t * 14) * wind; - data.vertex.z += sin(t * 19) * wind; - #endif -} +#include frex:shaders/api/vertex.glsl +#include frex:shaders/api/world.glsl +#include frex:shaders/lib/math.glsl +#include frex:shaders/lib/noise/noise4d.glsl + +/****************************************************** + Based on "GPU-Generated Procedural Wind Animations for Trees" + by Renaldas Zioma in GPU Gems 3, 2007 + https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees + + Remake of canvas default shader for the Nether +******************************************************/ + +void frx_startVertex(inout frx_VertexData data) { + #ifdef ANIMATED_FOLIAGE + float t = frx_renderSeconds() * 0.05; + + vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * 0.5; + float wind = snoise(vec4(pos, t)) * 0.1; + + wind *= 1 - data.spriteUV.y; + + data.vertex.y += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; + data.vertex.x += cos(t * 14) * wind; + data.vertex.z += sin(t * 19) * wind; + #endif +} diff --git a/src/main/resources/assets/betterend/shaders/material/wall_wave_inverted.vert b/src/main/resources/assets/betterend/shaders/material/wall_wave_inverted.vert index bc664478..e5238c4a 100644 --- a/src/main/resources/assets/betterend/shaders/material/wall_wave_inverted.vert +++ b/src/main/resources/assets/betterend/shaders/material/wall_wave_inverted.vert @@ -1,27 +1,27 @@ -#include frex:shaders/api/vertex.glsl -#include frex:shaders/api/world.glsl -#include frex:shaders/lib/math.glsl -#include frex:shaders/lib/noise/noise4d.glsl - -/****************************************************** - Based on "GPU-Generated Procedural Wind Animations for Trees" - by Renaldas Zioma in GPU Gems 3, 2007 - https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees - - Remake of canvas default shader for the Nether -******************************************************/ - -void frx_startVertex(inout frx_VertexData data) { - #ifdef ANIMATED_FOLIAGE - float t = frx_renderSeconds() * 0.05; - - vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * 0.5; - float wind = snoise(vec4(pos, t)) * 0.1; - - wind *= data.spriteUV.y; - - data.vertex.y += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; - data.vertex.x += cos(t * 14) * wind; - data.vertex.z += sin(t * 19) * wind; - #endif -} +#include frex:shaders/api/vertex.glsl +#include frex:shaders/api/world.glsl +#include frex:shaders/lib/math.glsl +#include frex:shaders/lib/noise/noise4d.glsl + +/****************************************************** + Based on "GPU-Generated Procedural Wind Animations for Trees" + by Renaldas Zioma in GPU Gems 3, 2007 + https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees + + Remake of canvas default shader for the Nether +******************************************************/ + +void frx_startVertex(inout frx_VertexData data) { + #ifdef ANIMATED_FOLIAGE + float t = frx_renderSeconds() * 0.05; + + vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * 0.5; + float wind = snoise(vec4(pos, t)) * 0.1; + + wind *= data.spriteUV.y; + + data.vertex.y += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; + data.vertex.x += cos(t * 14) * wind; + data.vertex.z += sin(t * 19) * wind; + #endif +} diff --git a/src/main/resources/assets/betterend/shaders/material/wave.vert b/src/main/resources/assets/betterend/shaders/material/wave.vert index df877506..1ec4c5e1 100644 --- a/src/main/resources/assets/betterend/shaders/material/wave.vert +++ b/src/main/resources/assets/betterend/shaders/material/wave.vert @@ -1,26 +1,26 @@ -#include frex:shaders/api/vertex.glsl -#include frex:shaders/api/world.glsl -#include frex:shaders/lib/math.glsl -#include frex:shaders/lib/noise/noise4d.glsl - -/****************************************************** - Based on "GPU-Generated Procedural Wind Animations for Trees" - by Renaldas Zioma in GPU Gems 3, 2007 - https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees - - Remake of canvas default shader for the Nether -******************************************************/ - -#define NOISE_SCALE 0.125 - -void frx_startVertex(inout frx_VertexData data) { - #ifdef ANIMATED_FOLIAGE - float t = frx_renderSeconds() * 0.05; - - vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * NOISE_SCALE; - float wind = snoise(vec4(pos, t)) * 0.1; - - data.vertex.x += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; - data.vertex.z += sin(t * 19) * wind; - #endif -} +#include frex:shaders/api/vertex.glsl +#include frex:shaders/api/world.glsl +#include frex:shaders/lib/math.glsl +#include frex:shaders/lib/noise/noise4d.glsl + +/****************************************************** + Based on "GPU-Generated Procedural Wind Animations for Trees" + by Renaldas Zioma in GPU Gems 3, 2007 + https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees + + Remake of canvas default shader for the Nether +******************************************************/ + +#define NOISE_SCALE 0.125 + +void frx_startVertex(inout frx_VertexData data) { + #ifdef ANIMATED_FOLIAGE + float t = frx_renderSeconds() * 0.05; + + vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * NOISE_SCALE; + float wind = snoise(vec4(pos, t)) * 0.1; + + data.vertex.x += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; + data.vertex.z += sin(t * 19) * wind; + #endif +} diff --git a/src/main/resources/assets/betterend/shaders/material/wave_floor.vert b/src/main/resources/assets/betterend/shaders/material/wave_floor.vert index 5b7c4ecf..d91ec974 100644 --- a/src/main/resources/assets/betterend/shaders/material/wave_floor.vert +++ b/src/main/resources/assets/betterend/shaders/material/wave_floor.vert @@ -1,27 +1,27 @@ -#include frex:shaders/api/vertex.glsl -#include frex:shaders/api/world.glsl -#include frex:shaders/lib/math.glsl -#include frex:shaders/lib/noise/noise4d.glsl - -/****************************************************** - Based on "GPU-Generated Procedural Wind Animations for Trees" - by Renaldas Zioma in GPU Gems 3, 2007 - https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees - - Remake of canvas default shader for the Nether -******************************************************/ - -#define NOISE_SCALE 0.125 - -void frx_startVertex(inout frx_VertexData data) { - #ifdef ANIMATED_FOLIAGE - float t = frx_renderSeconds() * 0.05; - - vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * NOISE_SCALE; - float wind = snoise(vec4(pos, t)) * 0.1; - wind *= 1 - data.spriteUV.y; - - data.vertex.x += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; - data.vertex.z += sin(t * 19) * wind; - #endif -} +#include frex:shaders/api/vertex.glsl +#include frex:shaders/api/world.glsl +#include frex:shaders/lib/math.glsl +#include frex:shaders/lib/noise/noise4d.glsl + +/****************************************************** + Based on "GPU-Generated Procedural Wind Animations for Trees" + by Renaldas Zioma in GPU Gems 3, 2007 + https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees + + Remake of canvas default shader for the Nether +******************************************************/ + +#define NOISE_SCALE 0.125 + +void frx_startVertex(inout frx_VertexData data) { + #ifdef ANIMATED_FOLIAGE + float t = frx_renderSeconds() * 0.05; + + vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * NOISE_SCALE; + float wind = snoise(vec4(pos, t)) * 0.1; + wind *= 1 - data.spriteUV.y; + + data.vertex.x += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; + data.vertex.z += sin(t * 19) * wind; + #endif +} diff --git a/src/main/resources/assets/betterend/shaders/material/wave_large.vert b/src/main/resources/assets/betterend/shaders/material/wave_large.vert index c2d2019e..9d30934c 100644 --- a/src/main/resources/assets/betterend/shaders/material/wave_large.vert +++ b/src/main/resources/assets/betterend/shaders/material/wave_large.vert @@ -1,24 +1,24 @@ -#include frex:shaders/api/vertex.glsl -#include frex:shaders/api/world.glsl -#include frex:shaders/lib/math.glsl -#include frex:shaders/lib/noise/noise4d.glsl - -/****************************************************** - Based on "GPU-Generated Procedural Wind Animations for Trees" - by Renaldas Zioma in GPU Gems 3, 2007 - https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees - - Remake of canvas default shader for the Nether -******************************************************/ - -void frx_startVertex(inout frx_VertexData data) { - #ifdef ANIMATED_FOLIAGE - float t = frx_renderSeconds() * 0.05; - - vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * 0.0625; - float wind = snoise(vec4(pos, t)) * 0.25; - - data.vertex.x += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; - data.vertex.z += sin(t * 19) * wind; - #endif -} +#include frex:shaders/api/vertex.glsl +#include frex:shaders/api/world.glsl +#include frex:shaders/lib/math.glsl +#include frex:shaders/lib/noise/noise4d.glsl + +/****************************************************** + Based on "GPU-Generated Procedural Wind Animations for Trees" + by Renaldas Zioma in GPU Gems 3, 2007 + https://developer.nvidia.com/gpugems/gpugems3/part-i-geometry/chapter-6-gpu-generated-procedural-wind-animations-trees + + Remake of canvas default shader for the Nether +******************************************************/ + +void frx_startVertex(inout frx_VertexData data) { + #ifdef ANIMATED_FOLIAGE + float t = frx_renderSeconds() * 0.05; + + vec3 pos = (data.vertex.xyz + frx_modelOriginWorldPos()) * 0.0625; + float wind = snoise(vec4(pos, t)) * 0.25; + + data.vertex.x += (cos(t) * cos(t * 3) * cos(t * 5) * cos(t * 7) + sin(t * 25)) * wind; + data.vertex.z += sin(t * 19) * wind; + #endif +} diff --git a/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_1.ogg b/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_1.ogg new file mode 100644 index 00000000..154a25f9 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_1.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_2.ogg b/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_2.ogg new file mode 100644 index 00000000..8814f83d Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_2.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_damage.ogg b/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_damage.ogg new file mode 100644 index 00000000..bf6bffcf Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_damage.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_death.ogg b/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_death.ogg new file mode 100644 index 00000000..b9a68e19 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/entity/shadow_walker/shadow_walker_death.ogg differ diff --git a/src/main/resources/assets/betterend/textures/block/andesite_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/andesite_lantern_bottom.png new file mode 100644 index 00000000..aa16ec71 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/andesite_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/andesite_lantern_side.png b/src/main/resources/assets/betterend/textures/block/andesite_lantern_side.png new file mode 100644 index 00000000..5eb9af0b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/andesite_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/andesite_lantern_top.png b/src/main/resources/assets/betterend/textures/block/andesite_lantern_top.png new file mode 100644 index 00000000..24112f09 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/andesite_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/blackstone_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_bottom.png new file mode 100644 index 00000000..bda80c4f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/blackstone_lantern_side.png b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_side.png new file mode 100644 index 00000000..ab4cd4d5 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/blackstone_lantern_top.png b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_top.png new file mode 100644 index 00000000..6df14f19 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/blackstone_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/diorite_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/diorite_lantern_bottom.png new file mode 100644 index 00000000..829cd129 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/diorite_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/diorite_lantern_side.png b/src/main/resources/assets/betterend/textures/block/diorite_lantern_side.png new file mode 100644 index 00000000..e2d4f557 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/diorite_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/diorite_lantern_top.png b/src/main/resources/assets/betterend/textures/block/diorite_lantern_top.png new file mode 100644 index 00000000..60e620e3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/diorite_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_portal.png.mcmeta b/src/main/resources/assets/betterend/textures/block/end_portal.png.mcmeta index b2e2153a..312191f7 100644 --- a/src/main/resources/assets/betterend/textures/block/end_portal.png.mcmeta +++ b/src/main/resources/assets/betterend/textures/block/end_portal.png.mcmeta @@ -1,6 +1,6 @@ -{ - "animation": { - "interpolate": true, - "frametime": 4 - } +{ + "animation": { + "interpolate": true, + "frametime": 4 + } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/end_stone_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_bottom.png new file mode 100644 index 00000000..4317092f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_stone_lantern_side.png b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_side.png new file mode 100644 index 00000000..eecf51f6 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_stone_lantern_top.png b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_top.png new file mode 100644 index 00000000..f134d811 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_stone_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png.mcmeta b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png.mcmeta index 1c2798b6..98b9ae71 100644 --- a/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png.mcmeta +++ b/src/main/resources/assets/betterend/textures/block/end_stone_smelter_front_on.png.mcmeta @@ -1,12 +1,12 @@ -{ - "animation": { - "interpolate": true, - "frametime": 8, - "frames": [ - 0, - 1, - 2, - 3 - ] - } -} +{ + "animation": { + "interpolate": true, + "frametime": 8, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +} diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_bottom.png new file mode 100644 index 00000000..0a6c753b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_lantern_side.png b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_side.png new file mode 100644 index 00000000..98caa82f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_lantern_top.png b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_top.png new file mode 100644 index 00000000..fd3055e4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/flavolite_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/granite_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/granite_lantern_bottom.png new file mode 100644 index 00000000..48dda5a3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/granite_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/granite_lantern_side.png b/src/main/resources/assets/betterend/textures/block/granite_lantern_side.png new file mode 100644 index 00000000..28e8986a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/granite_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/granite_lantern_top.png b/src/main/resources/assets/betterend/textures/block/granite_lantern_top.png new file mode 100644 index 00000000..f8715e70 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/granite_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/purpur_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/purpur_lantern_bottom.png new file mode 100644 index 00000000..e48dc0cf Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/purpur_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/purpur_lantern_side.png b/src/main/resources/assets/betterend/textures/block/purpur_lantern_side.png new file mode 100644 index 00000000..788be07a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/purpur_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/purpur_lantern_top.png b/src/main/resources/assets/betterend/textures/block/purpur_lantern_top.png new file mode 100644 index 00000000..bec7d20a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/purpur_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/quartz_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/quartz_lantern_bottom.png new file mode 100644 index 00000000..b3b4521d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/quartz_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/quartz_lantern_side.png b/src/main/resources/assets/betterend/textures/block/quartz_lantern_side.png new file mode 100644 index 00000000..6bd07ae9 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/quartz_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/quartz_lantern_top.png b/src/main/resources/assets/betterend/textures/block/quartz_lantern_top.png new file mode 100644 index 00000000..44c04247 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/quartz_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_lantern_bottom.png b/src/main/resources/assets/betterend/textures/block/violecite_lantern_bottom.png new file mode 100644 index 00000000..fbeccbaf Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/violecite_lantern_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_lantern_side.png b/src/main/resources/assets/betterend/textures/block/violecite_lantern_side.png new file mode 100644 index 00000000..9842c601 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/violecite_lantern_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_lantern_top.png b/src/main/resources/assets/betterend/textures/block/violecite_lantern_top.png new file mode 100644 index 00000000..da9757df Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/violecite_lantern_top.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/shadow_walker.png b/src/main/resources/assets/betterend/textures/entity/shadow_walker.png new file mode 100644 index 00000000..fa9bb63f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/shadow_walker.png differ diff --git a/src/main/resources/assets/minecraft/blockstates/chorus_flower.json b/src/main/resources/assets/minecraft/blockstates/chorus_flower.json index 45269fb3..fed5be0f 100644 --- a/src/main/resources/assets/minecraft/blockstates/chorus_flower.json +++ b/src/main/resources/assets/minecraft/blockstates/chorus_flower.json @@ -1,22 +1,22 @@ -{ - "variants": { - "age=0": { - "model": "betterend:block/chorus_plant_flower" - }, - "age=1": { - "model": "betterend:block/chorus_plant_flower" - }, - "age=2": { - "model": "betterend:block/chorus_plant_flower" - }, - "age=3": { - "model": "betterend:block/chorus_plant_flower" - }, - "age=4": { - "model": "betterend:block/chorus_plant_flower" - }, - "age=5": { - "model": "betterend:block/chorus_plant_flower_open" - } - } +{ + "variants": { + "age=0": { + "model": "betterend:block/chorus_plant_flower" + }, + "age=1": { + "model": "betterend:block/chorus_plant_flower" + }, + "age=2": { + "model": "betterend:block/chorus_plant_flower" + }, + "age=3": { + "model": "betterend:block/chorus_plant_flower" + }, + "age=4": { + "model": "betterend:block/chorus_plant_flower" + }, + "age=5": { + "model": "betterend:block/chorus_plant_flower_open" + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/blockstates/chorus_plant.json b/src/main/resources/assets/minecraft/blockstates/chorus_plant.json index 5a46ba98..52268ebc 100644 --- a/src/main/resources/assets/minecraft/blockstates/chorus_plant.json +++ b/src/main/resources/assets/minecraft/blockstates/chorus_plant.json @@ -1,69 +1,69 @@ -{ - "multipart": [ - { - "when": { "OR": [ - {"up": "false"}, - {"down": "false"} - ]}, - "apply": { "model": "betterend:block/chorus_plant_center" } - }, - { - "when": {"roots": "true"}, - "apply": { "model": "betterend:block/chorus_plant_roots" } - }, - { - "when": {"north": "true"}, - "apply": [ - { "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 180 }, - { "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 180 }, - { "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 180 }, - { "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 180 } - ] - }, - { - "when": { "east": "true" }, - "apply": [ - { "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 270 }, - { "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 270 }, - { "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 270 }, - { "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 270 } - ] - }, - { - "when": { "south": "true" }, - "apply": [ - { "model": "betterend:block/chorus_plant_stem", "x": 90 }, - { "model": "betterend:block/chorus_plant_stem_2", "x": 90 }, - { "model": "betterend:block/chorus_plant_stem_3", "x": 90 }, - { "model": "betterend:block/chorus_plant_stem_4", "x": 90 } - ] - }, - { - "when": { "west": "true" }, - "apply": [ - { "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 90 }, - { "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 90 }, - { "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 90 }, - { "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 90 } - ] - }, - { - "when": { "up": "true" }, - "apply": [ - { "model": "betterend:block/chorus_plant_stem", "x": 180 }, - { "model": "betterend:block/chorus_plant_stem_2", "x": 180 }, - { "model": "betterend:block/chorus_plant_stem_3", "x": 180 }, - { "model": "betterend:block/chorus_plant_stem_4", "x": 180 } - ] - }, - { - "when": { "down": "true" }, - "apply": [ - { "model": "betterend:block/chorus_plant_stem" }, - { "model": "betterend:block/chorus_plant_stem_2" }, - { "model": "betterend:block/chorus_plant_stem_3" }, - { "model": "betterend:block/chorus_plant_stem_4" } - ] - } - ] +{ + "multipart": [ + { + "when": { "OR": [ + {"up": "false"}, + {"down": "false"} + ]}, + "apply": { "model": "betterend:block/chorus_plant_center" } + }, + { + "when": {"roots": "true"}, + "apply": { "model": "betterend:block/chorus_plant_roots" } + }, + { + "when": {"north": "true"}, + "apply": [ + { "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 180 }, + { "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 180 }, + { "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 180 }, + { "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 180 } + ] + }, + { + "when": { "east": "true" }, + "apply": [ + { "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 270 }, + { "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 270 }, + { "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 270 }, + { "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 270 } + ] + }, + { + "when": { "south": "true" }, + "apply": [ + { "model": "betterend:block/chorus_plant_stem", "x": 90 }, + { "model": "betterend:block/chorus_plant_stem_2", "x": 90 }, + { "model": "betterend:block/chorus_plant_stem_3", "x": 90 }, + { "model": "betterend:block/chorus_plant_stem_4", "x": 90 } + ] + }, + { + "when": { "west": "true" }, + "apply": [ + { "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 90 }, + { "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 90 }, + { "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 90 }, + { "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 90 } + ] + }, + { + "when": { "up": "true" }, + "apply": [ + { "model": "betterend:block/chorus_plant_stem", "x": 180 }, + { "model": "betterend:block/chorus_plant_stem_2", "x": 180 }, + { "model": "betterend:block/chorus_plant_stem_3", "x": 180 }, + { "model": "betterend:block/chorus_plant_stem_4", "x": 180 } + ] + }, + { + "when": { "down": "true" }, + "apply": [ + { "model": "betterend:block/chorus_plant_stem" }, + { "model": "betterend:block/chorus_plant_stem_2" }, + { "model": "betterend:block/chorus_plant_stem_3" }, + { "model": "betterend:block/chorus_plant_stem_4" } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/fabric/tags/items/hammers.json b/src/main/resources/data/fabric/tags/items/hammers.json index db00d6af..847bbc95 100644 --- a/src/main/resources/data/fabric/tags/items/hammers.json +++ b/src/main/resources/data/fabric/tags/items/hammers.json @@ -1,11 +1,11 @@ -{ - "replace": false, - "values": [ - "betterend:iron_hammer", - "betterend:golden_hammer", - "betterend:diamond_hammer", - "betterend:netherite_hammer", - "betterend:terminite_hammer", - "betterend:aeternium_hammer" - ] +{ + "replace": false, + "values": [ + "betterend:iron_hammer", + "betterend:golden_hammer", + "betterend:diamond_hammer", + "betterend:netherite_hammer", + "betterend:terminite_hammer", + "betterend:aeternium_hammer" + ] } \ No newline at end of file