diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index e5d8d28..d7ac870 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,9 @@ # gradle .gradle/ -build/classes/ -build/generated/ -build/libs/ -build/resources/ -build/tmp/ out/ classes/ +build/ # idea @@ -26,4 +22,4 @@ bin/ # fabric -run/ \ No newline at end of file +run/ diff --git a/build.gradle b/build.gradle index 00773e8..0bc48b4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,64 +1,56 @@ plugins { - id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'fabric-loom' version '1.0-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group -minecraft { -} - repositories { maven { url "https://jitpack.io" } - maven { url "http://server.bbkr.space/artifactory/libs-release" } maven { url 'https://maven.blamejared.com' } + maven { url "https://api.modrinth.com/maven" } + flatDir { dirs 'localMaven'} } dependencies { //to change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "vazkii.patchouli:Patchouli:${patchouli_version}" + modImplementation "vazkii.patchouli:Patchouli:${patchouli_version}" modImplementation "com.github.Draylar:maybe-data:${maybedata_version}" include "com.github.Draylar:maybe-data:${maybedata_version}" - modImplementation "eu.midnightdust:midnight-hats:${midnighthats_version}" - include "eu.midnightdust:midnight-hats:${midnighthats_version}" - - modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}") - include ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}") - modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}") - include ("me.shedaniel.cloth:config-2:${project.cloth_config_version}") - modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}") + + modImplementation "maven.modrinth:midnightlib:${midnightlib_version}" + include "maven.modrinth:midnightlib:${midnightlib_version}" } processResources { inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching("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" +tasks.withType(JavaCompile).configureEach { + // 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 + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + + // Minecraft 1.17 (21w19a) upwards uses Java 16. + it.options.release = 17 } // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/build/loom-cache/maybe-data-1.0.0-1.16.2.jar b/build/loom-cache/maybe-data-1.0.0-1.16.2.jar deleted file mode 100644 index bda0f29..0000000 Binary files a/build/loom-cache/maybe-data-1.0.0-1.16.2.jar and /dev/null differ diff --git a/build/loom-cache/midnight-hats-1.0.2.jar b/build/loom-cache/midnight-hats-1.0.2.jar deleted file mode 100644 index 1668bd6..0000000 Binary files a/build/loom-cache/midnight-hats-1.0.2.jar and /dev/null differ diff --git a/gradle.properties b/gradle.properties index 4445aeb..3d7ac95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,25 +3,18 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.2 - yarn_mappings=1.16.2+build.6 - loader_version=0.9.1+build.205 + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.18 + loader_version=0.14.9 # Mod Properties - mod_version = 2.0.0 + mod_version = 2.1.0 maven_group = eu.midnightdust.motschen archives_base_name = dishes # 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.17.2+build.396-1.16 - patchouli_version=1.16-40-FABRIC - maybedata_version=1.0.0-1.16.2 - - # Config stuff - auto_config_version = 3.2.0-unstable - cloth_config_version = 4.7.0-unstable - mod_menu_version = 1.14.6+build.31 - - # MidnightHats - midnighthats_version=1.0.2 \ No newline at end of file + fabric_version=0.62.0+1.19.2 + patchouli_version=1.19.2-76-FABRIC + maybedata_version=1.3.2-fixed-1.19 + midnightlib_version=0.6.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b7e1f3..ae04661 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-5.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 8e25e6c..a69d9cb --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,113 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -105,84 +140,101 @@ 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, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# 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, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# 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" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9618d8d..53a6b23 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,100 +1,91 @@ -@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 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% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/localMaven/maybe-data-1.3.2-fixed-1.19-sources.jar b/localMaven/maybe-data-1.3.2-fixed-1.19-sources.jar new file mode 100644 index 0000000..442ccab Binary files /dev/null and b/localMaven/maybe-data-1.3.2-fixed-1.19-sources.jar differ diff --git a/localMaven/maybe-data-1.3.2-fixed-1.19.jar b/localMaven/maybe-data-1.3.2-fixed-1.19.jar new file mode 100644 index 0000000..84620ae Binary files /dev/null and b/localMaven/maybe-data-1.3.2-fixed-1.19.jar differ diff --git a/settings.gradle b/settings.gradle index 5b60df3..f91a4fe 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ pluginManagement { repositories { - jcenter() maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' diff --git a/src/main/java/eu/midnightdust/motschen/dishes/DishesClient.java b/src/main/java/eu/midnightdust/motschen/dishes/DishesClient.java index 9a79018..3557345 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/DishesClient.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/DishesClient.java @@ -1,20 +1,21 @@ package eu.midnightdust.motschen.dishes; +import eu.midnightdust.motschen.dishes.config.DishesConfig; import eu.midnightdust.motschen.dishes.entities.client.IceCreamTraderRenderer; -import eu.midnightdust.motschen.dishes.init.CropInit; import eu.midnightdust.motschen.dishes.init.IceCreamTraderInit; +import eu.midnightdust.motschen.dishes.init.LettuceInit; +import eu.midnightdust.motschen.dishes.init.TomatoInit; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; -import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; +import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; import net.minecraft.client.render.RenderLayer; public class DishesClient implements ClientModInitializer { @Override public void onInitializeClient() { - EntityRendererRegistry.INSTANCE.register(IceCreamTraderInit.ICE_CREAM_TRADER, (dispatcher, context) -> new IceCreamTraderRenderer(dispatcher)); - BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),CropInit.TomatoBush); - BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),CropInit.LettuceBush); - BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DishesMain.BirthdayCake); + EntityRendererRegistry.register(IceCreamTraderInit.ICE_CREAM_TRADER, IceCreamTraderRenderer::new); + if (DishesConfig.tomatoes) BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), TomatoInit.TomatoBush); + if (DishesConfig.lettuce) BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), LettuceInit.LettuceBush); } } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/DishesMain.java b/src/main/java/eu/midnightdust/motschen/dishes/DishesMain.java index 31d7293..eefa439 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/DishesMain.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/DishesMain.java @@ -5,11 +5,11 @@ import eu.midnightdust.motschen.dishes.blockstates.DishBites; import eu.midnightdust.motschen.dishes.compat.CookingGuideItem; import eu.midnightdust.motschen.dishes.compat.Flags; import eu.midnightdust.motschen.dishes.config.DishesConfig; -import eu.midnightdust.motschen.dishes.init.BlockEntityInit; import eu.midnightdust.motschen.dishes.init.CropInit; +import eu.midnightdust.motschen.dishes.init.IceCreamTraderInit; import eu.midnightdust.motschen.dishes.init.WorldGenInit; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; -import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer; +import eu.midnightdust.motschen.dishes.item.DishItem; +import eu.midnightdust.motschen.dishes.item.IceCreamItem; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -22,8 +22,6 @@ import net.minecraft.util.registry.Registry; public class DishesMain implements ModInitializer { public static final String MOD_ID = "dishes"; - public static DishesConfig DD_CONFIG; - public static final ItemGroup MainGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "main"), () -> new ItemStack(DishesMain.CheeseRoll)); public static final ItemGroup DishesGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "dishes"), () -> new ItemStack(DishesMain.FishAndChips)); @@ -31,10 +29,12 @@ public class DishesMain implements ModInitializer { public static final ItemGroup SweetsGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "sweets"), () -> new ItemStack(DishesMain.IceCreamVanilla)); public static final Item CookingGuide = new CookingGuideItem(new Item.Settings().maxCount(1)); public static final Block Plate = new Plate(); + public static final Block Bowl = new Bowl(); public static final Block PizzaBox = new Plate(); public static final Block PotatoesWithCurdCheese = new Dish(); public static final Block TinyPotatoesWithCurdCheese = new Dish(); public static final Block Schnitzel = new Dish(); + public static final Block PizzaMargherita = new Pizza(); public static final Block PizzaSalami = new Pizza(); public static final Block PizzaHam = new Pizza(); public static final Block PizzaTuna = new Pizza(); @@ -46,6 +46,7 @@ public class DishesMain implements ModInitializer { public static final Block Cheeseburger = new Dish(); public static final Block Spaceburger = new Dish(); public static final Block FishAndChips = new Dish(); + public static final Block Borscht = new Soup(); public static final Item Knife = new Item(new Item.Settings().group(DishesMain.MainGroup).recipeRemainder(DishesMain.Knife).maxCount(1)); public static final Item PotatoSlice = new Item(new Item.Settings().group(DishesMain.MainGroup).food(new FoodComponent.Builder().hunger(1).saturationModifier(0.5f).snack().build())); public static final Item RawFries = new Item(new Item.Settings().group(DishesMain.MainGroup).food(new FoodComponent.Builder().hunger(2).saturationModifier(0.75f).snack().build())); @@ -61,24 +62,22 @@ public class DishesMain implements ModInitializer { public static final Item CheeseRoll = new Item(new Item.Settings().group(DishesMain.MainGroup).food(new FoodComponent.Builder().hunger(4).saturationModifier(1f).build())); public static final Item CheeseSlice = new Item(new Item.Settings().group(DishesMain.MainGroup).food(new FoodComponent.Builder().hunger(2).saturationModifier(0.5f).snack().build())); - public static final Item IceCreamVanilla = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Item IceCreamChocolate = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Item IceCreamWhiteChocolate = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Item IceCreamStrawberry = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Item IceCreamBanana = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Item IceCreamPear = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Item IceCreamSweetberry = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Item IceCreamBlueberry = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Item IceCreamBubblegum = new Item(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); - public static final Block BirthdayCake = new Cake(); + public static final Item IceCreamVanilla = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamChocolate = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamWhiteChocolate = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamStrawberry = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamBanana = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamPear = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamSweetberry = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamBlueberry = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamBubblegum = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); + public static final Item IceCreamGlowberry = new IceCreamItem(new Item.Settings().group(DishesMain.SweetsGroup).food(new FoodComponent.Builder().hunger(6).saturationModifier(1f).build())); @Override public void onInitialize() { - AutoConfig.register(DishesConfig.class, JanksonConfigSerializer::new); - DD_CONFIG = AutoConfig.getConfigHolder(DishesConfig.class).getConfig(); + DishesConfig.init("dishes", DishesConfig.class); new DishBites(); - BlockEntityInit.init(); // General // Registry.register(Registry.ITEM, new Identifier("dishes","salt_ore"), new BlockItem(SaltOre, new Item.Settings().group(DishesMain.MainGroup))); @@ -99,47 +98,57 @@ public class DishesMain implements ModInitializer { CropInit.init(); // Dishes // - Registry.register(Registry.ITEM, new Identifier("dishes","plate"), new BlockItem(Plate, new Item.Settings().group(DishesMain.DishesGroup))); + Registry.register(Registry.ITEM, new Identifier("dishes","plate"), new DishItem(Plate, new Item.Settings().group(DishesMain.DishesGroup))); Registry.register(Registry.BLOCK, new Identifier("dishes","plate"), Plate); - Registry.register(Registry.ITEM, new Identifier("dishes","potatoeswithcurdcheese"), new BlockItem(PotatoesWithCurdCheese, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","bowl"), new DishItem(Bowl, new Item.Settings().group(DishesMain.DishesGroup))); + Registry.register(Registry.BLOCK, new Identifier("dishes","bowl"), Bowl); + Registry.register(Registry.ITEM, new Identifier("dishes","potatoeswithcurdcheese"), new DishItem(PotatoesWithCurdCheese, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","potatoeswithcurdcheese"), PotatoesWithCurdCheese); - if (FabricLoader.getInstance().isModLoaded("lil_tater") | FabricLoader.getInstance().isModLoaded("liltater") | FabricLoader.getInstance().isModLoaded("ltr")) { - Registry.register(Registry.ITEM, new Identifier("dishes","tinypotatoeswithcurdcheese"), new BlockItem(TinyPotatoesWithCurdCheese, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); - Registry.register(Registry.BLOCK, new Identifier("dishes","tinypotatoeswithcurdcheese"), TinyPotatoesWithCurdCheese); - } + if (FabricLoader.getInstance().isModLoaded("lil_tater") | FabricLoader.getInstance().isModLoaded("liltater") | FabricLoader.getInstance().isModLoaded("ltr")) + Registry.register(Registry.ITEM, new Identifier("dishes","tinypotatoeswithcurdcheese"), new DishItem(TinyPotatoesWithCurdCheese, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + else + Registry.register(Registry.ITEM, new Identifier("dishes","tinypotatoeswithcurdcheese"), new DishItem(TinyPotatoesWithCurdCheese, new Item.Settings().food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); - Registry.register(Registry.ITEM, new Identifier("dishes","schnitzel"), new BlockItem(Schnitzel, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.BLOCK, new Identifier("dishes","tinypotatoeswithcurdcheese"), TinyPotatoesWithCurdCheese); + + Registry.register(Registry.ITEM, new Identifier("dishes","schnitzel"), new DishItem(Schnitzel, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","schnitzel"), Schnitzel); - Registry.register(Registry.ITEM, new Identifier("dishes","spaghetti_bolognese"), new BlockItem(SpaghettiBolognese, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","spaghetti_bolognese"), new DishItem(SpaghettiBolognese, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","spaghetti_bolognese"), SpaghettiBolognese); - Registry.register(Registry.ITEM, new Identifier("dishes","steak"), new BlockItem(Steak, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","steak"), new DishItem(Steak, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","steak"), Steak); - Registry.register(Registry.ITEM, new Identifier("dishes","hamburger"), new BlockItem(Hamburger, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","hamburger"), new DishItem(Hamburger, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","hamburger"), Hamburger); - Registry.register(Registry.ITEM, new Identifier("dishes","chickenburger"), new BlockItem(Chickenburger, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","chickenburger"), new DishItem(Chickenburger, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","chickenburger"), Chickenburger); - Registry.register(Registry.ITEM, new Identifier("dishes","cheeseburger"), new BlockItem(Cheeseburger, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","cheeseburger"), new DishItem(Cheeseburger, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","cheeseburger"), Cheeseburger); - if (FabricLoader.getInstance().isModLoaded("galacticraft-rewoven") | FabricLoader.getInstance().isModLoaded("astromine")) { - Registry.register(Registry.ITEM, new Identifier("dishes", "spaceburger"), new BlockItem(Spaceburger, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); - Registry.register(Registry.BLOCK, new Identifier("dishes", "spaceburger"), Spaceburger); - } + if (FabricLoader.getInstance().isModLoaded("ad_astra")) + Registry.register(Registry.ITEM, new Identifier("dishes", "spaceburger"), new DishItem(Spaceburger, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + else + Registry.register(Registry.ITEM, new Identifier("dishes", "spaceburger"), new DishItem(Spaceburger, new Item.Settings().food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); - Registry.register(Registry.ITEM, new Identifier("dishes","fishandchips"), new BlockItem(FishAndChips, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.BLOCK, new Identifier("dishes", "spaceburger"), Spaceburger); + + Registry.register(Registry.ITEM, new Identifier("dishes","fishandchips"), new DishItem(FishAndChips, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","fishandchips"), FishAndChips); + Registry.register(Registry.ITEM, new Identifier("dishes","borscht"), new DishItem(Borscht, new Item.Settings().group(DishesMain.DishesGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.BLOCK, new Identifier("dishes","borscht"), Borscht); // Pizza // - Registry.register(Registry.ITEM, new Identifier("dishes","pizzabox"), new BlockItem(PizzaBox, new Item.Settings().group(DishesMain.PizzaGroup))); + Registry.register(Registry.ITEM, new Identifier("dishes","pizzabox"), new DishItem(PizzaBox, new Item.Settings().group(DishesMain.PizzaGroup))); Registry.register(Registry.BLOCK, new Identifier("dishes","pizzabox"), PizzaBox); - Registry.register(Registry.ITEM, new Identifier("dishes","pizzasalami"), new BlockItem(PizzaSalami, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","pizzamargherita"), new DishItem(PizzaMargherita, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.BLOCK, new Identifier("dishes","pizzamargherita"), PizzaMargherita); + Registry.register(Registry.ITEM, new Identifier("dishes","pizzasalami"), new DishItem(PizzaSalami, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","pizzasalami"), PizzaSalami); - Registry.register(Registry.ITEM, new Identifier("dishes","pizzaham"), new BlockItem(PizzaHam, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","pizzaham"), new DishItem(PizzaHam, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","pizzaham"), PizzaHam); - Registry.register(Registry.ITEM, new Identifier("dishes","pizzatuna"), new BlockItem(PizzaTuna, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","pizzatuna"), new DishItem(PizzaTuna, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","pizzatuna"), PizzaTuna); - Registry.register(Registry.ITEM, new Identifier("dishes","pizzabacon"), new BlockItem(PizzaBacon, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); + Registry.register(Registry.ITEM, new Identifier("dishes","pizzabacon"), new DishItem(PizzaBacon, new Item.Settings().group(DishesMain.PizzaGroup).food(new FoodComponent.Builder().hunger(10).saturationModifier(1f).build()))); Registry.register(Registry.BLOCK, new Identifier("dishes","pizzabacon"), PizzaBacon); // Ice Cream // @@ -152,18 +161,14 @@ public class DishesMain implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("dishes","ice_cream_sweetberry"), IceCreamSweetberry); Registry.register(Registry.ITEM, new Identifier("dishes","ice_cream_blueberry"), IceCreamBlueberry); Registry.register(Registry.ITEM, new Identifier("dishes","ice_cream_bubblegum"), IceCreamBubblegum); + Registry.register(Registry.ITEM, new Identifier("dishes","ice_cream_glowberry"), IceCreamGlowberry); - // Cake // - Registry.register(Registry.ITEM, new Identifier("dishes","birthday_cake"), new BlockItem(BirthdayCake, new Item.Settings().group(DishesMain.SweetsGroup))); - Registry.register(Registry.BLOCK, new Identifier("dishes","birthday_cake"), BirthdayCake); - + Registry.register(Registry.ITEM, new Identifier("dishes","cooking_guide"), CookingGuide); // Compat // - if (FabricLoader.getInstance().isModLoaded("patchouli")) { - Registry.register(Registry.ITEM, new Identifier("dishes","cooking_guide"), CookingGuide); - } if (FabricLoader.getInstance().isModLoaded("patchouli")) { Flags.init(); } + IceCreamTraderInit.init(); WorldGenInit.init(); } } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/Bowl.java b/src/main/java/eu/midnightdust/motschen/dishes/block/Bowl.java new file mode 100644 index 0000000..8af62f8 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/dishes/block/Bowl.java @@ -0,0 +1,21 @@ +package eu.midnightdust.motschen.dishes.block; + +import net.minecraft.block.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; + +public class Bowl extends Plate { + + private static final VoxelShape SHAPE; + public Bowl() { + super(); + } + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { + return SHAPE; + } + static { + SHAPE = createCuboidShape(0, 0, 0, 16, 4, 16); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/Cake.java b/src/main/java/eu/midnightdust/motschen/dishes/block/Cake.java deleted file mode 100644 index e9746e5..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/block/Cake.java +++ /dev/null @@ -1,62 +0,0 @@ -package eu.midnightdust.motschen.dishes.block; - -import eu.midnightdust.motschen.dishes.block.blockentity.BirthdayCakeBlockEntity; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.*; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.item.ItemPlacementContext; -import net.minecraft.state.StateManager; -import net.minecraft.state.property.Properties; -import net.minecraft.world.BlockView; - -import java.util.function.ToIntFunction; - -public class Cake extends CakeBlock implements BlockEntityProvider { - - public Cake() { - super(FabricBlockSettings.copy(Blocks.CAKE).lightLevel(createLightLevelFromBlockState(15))); - this.setDefaultState(this.stateManager.getDefaultState().with(BITES, 0)); - } - - @Override - public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { - return super.getPlacementState(itemPlacementContext) - .with(BITES, 0); - } - - @Override - protected void appendProperties(StateManager.Builder builder) { - builder.add(BITES); - } - - @Override - public BlockEntity createBlockEntity(BlockView world) { - return new BirthdayCakeBlockEntity(); - } - - private static ToIntFunction createLightLevelFromBlockState(int litLevel) { - return (blockState) -> { - if (blockState.get(Properties.BITES) == 0) { - return 15; - } - if (blockState.get(Properties.BITES) == 1) { - return 14; - } - else if (blockState.get(Properties.BITES) == 2) { - return 13; - } - else if (blockState.get(Properties.BITES) == 3) { - return 13; - } - else if (blockState.get(Properties.BITES) == 4) { - return 12; - } - else if (blockState.get(Properties.BITES) == 5) { - return 12; - } - else { - return 11; - } - }; - } -} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/Dish.java b/src/main/java/eu/midnightdust/motschen/dishes/block/Dish.java index 75cfadd..f171200 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/block/Dish.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/block/Dish.java @@ -22,35 +22,22 @@ import net.minecraft.world.WorldView; public class Dish extends HorizontalFacingBlock { public static final IntProperty DISH_BITES = DishBites.DISH_BITES; - private static final VoxelShape NORTH_SHAPE; - private static final VoxelShape EAST_SHAPE; - private static final VoxelShape SOUTH_SHAPE; - private static final VoxelShape WEST_SHAPE; + private static final VoxelShape SHAPE; public Dish() { - super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE)); + super(FabricBlockSettings.of(Material.STONE).nonOpaque().sounds(BlockSoundGroup.STONE)); this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(DISH_BITES, 0)); } public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (player.getHungerManager().isNotFull()) { - switch (state.get(DISH_BITES)) { - case 0: world.setBlockState(pos, state.with(DISH_BITES, 1)); - player.getHungerManager().add(2, 4); - return ActionResult.SUCCESS; - case 1: world.setBlockState(pos, state.with(DISH_BITES, 2)); - player.getHungerManager().add(2, 4); - return ActionResult.SUCCESS; - case 2: world.setBlockState(pos, state.with(DISH_BITES, 3)); - player.getHungerManager().add(2, 4); - return ActionResult.SUCCESS; - case 3: world.setBlockState(pos, state.with(DISH_BITES, 4)); - player.getHungerManager().add(2, 4); - return ActionResult.SUCCESS; - case 4: world.setBlockState(pos, DishesMain.Plate.getDefaultState()); - player.getHungerManager().add(2, 1); - return ActionResult.SUCCESS; + if (state.get(DISH_BITES) == 4) { + world.setBlockState(pos, DishesMain.Plate.getDefaultState()); + player.getHungerManager().add(2, 1); + return ActionResult.SUCCESS; } + world.setBlockState(pos, state.with(DISH_BITES, state.get(DISH_BITES) + 1)); + player.getHungerManager().add(2, 4); return ActionResult.SUCCESS; } else { @@ -71,21 +58,10 @@ public class Dish extends HorizontalFacingBlock { } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - switch (state.get(FACING)) { - case NORTH: return NORTH_SHAPE; - case EAST: return EAST_SHAPE; - case SOUTH: return SOUTH_SHAPE; - case WEST: return WEST_SHAPE; - default: return super.getOutlineShape(state, view, pos, context); - } + return SHAPE; } static { - VoxelShape shape = createCuboidShape(0, 0, 0, 16, 5, 16); - - EAST_SHAPE = shape; - NORTH_SHAPE = shape; - SOUTH_SHAPE = shape; - WEST_SHAPE = shape; + SHAPE = createCuboidShape(0, 0, 0, 16, 5, 16); } public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { return !worldView.isAir(pos.down()); diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/Lettuce.java b/src/main/java/eu/midnightdust/motschen/dishes/block/Lettuce.java index 42ae0bc..f321175 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/block/Lettuce.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/block/Lettuce.java @@ -1,6 +1,6 @@ package eu.midnightdust.motschen.dishes.block; -import eu.midnightdust.motschen.dishes.init.CropInit; +import eu.midnightdust.motschen.dishes.init.LettuceInit; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -17,7 +17,7 @@ public class Lettuce extends CropBlock { @Override @Environment(EnvType.CLIENT) protected ItemConvertible getSeedsItem() { - return CropInit.LettuceBush; + return LettuceInit.LettuceBush; } } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/Pizza.java b/src/main/java/eu/midnightdust/motschen/dishes/block/Pizza.java index a19ad3e..4d4dd72 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/block/Pizza.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/block/Pizza.java @@ -22,41 +22,22 @@ import net.minecraft.world.WorldView; public class Pizza extends HorizontalFacingBlock { public static final IntProperty DISH_BITES = DishBites.DISH_BITES; - private static final VoxelShape NORTH_SHAPE; - private static final VoxelShape EAST_SHAPE; - private static final VoxelShape SOUTH_SHAPE; - private static final VoxelShape WEST_SHAPE; + private static final VoxelShape SHAPE; public Pizza() { - super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE)); + super(FabricBlockSettings.of(Material.STONE).nonOpaque().sounds(BlockSoundGroup.STONE)); this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(DISH_BITES, 0)); } public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (player.getHungerManager().isNotFull()) { - switch (state.get(DISH_BITES)) { - case 0: world.setBlockState(pos, state.with(DISH_BITES, 1)); - player.getHungerManager().add(2, 4); - return ActionResult.SUCCESS; - case 1: world.setBlockState(pos, state.with(DISH_BITES, 2)); - player.getHungerManager().add(2, 4); - return ActionResult.SUCCESS; - case 2: world.setBlockState(pos, state.with(DISH_BITES, 3)); - player.getHungerManager().add(2, 4); - return ActionResult.SUCCESS; - case 3: world.setBlockState(pos, state.with(DISH_BITES, 4)); - player.getHungerManager().add(2, 4); - return ActionResult.SUCCESS; - case 4: - switch (state.get(FACING)) { - case NORTH: world.setBlockState(pos, DishesMain.PizzaBox.getDefaultState().with(FACING, Direction.NORTH)); return ActionResult.SUCCESS; - case EAST: world.setBlockState(pos, DishesMain.PizzaBox.getDefaultState().with(FACING, Direction.EAST)); return ActionResult.SUCCESS; - case WEST: world.setBlockState(pos, DishesMain.PizzaBox.getDefaultState().with(FACING, Direction.WEST)); return ActionResult.SUCCESS; - case SOUTH: world.setBlockState(pos, DishesMain.PizzaBox.getDefaultState().with(FACING, Direction.SOUTH)); return ActionResult.SUCCESS; - } - player.getHungerManager().add(2, 1); - return ActionResult.SUCCESS; + if (state.get(DISH_BITES) == 4) { + world.setBlockState(pos, DishesMain.PizzaBox.getDefaultState().with(FACING, state.get(FACING))); + player.getHungerManager().add(2, 1); + return ActionResult.SUCCESS; } + world.setBlockState(pos, state.with(DISH_BITES, state.get(DISH_BITES) + 1)); + player.getHungerManager().add(2, 4); return ActionResult.SUCCESS; } else { @@ -78,21 +59,12 @@ public class Pizza extends HorizontalFacingBlock { } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - switch (state.get(FACING)) { - case NORTH: return NORTH_SHAPE; - case EAST: return EAST_SHAPE; - case SOUTH: return SOUTH_SHAPE; - case WEST: return WEST_SHAPE; - default: return super.getOutlineShape(state, view, pos, context); - } + return SHAPE; } static { VoxelShape shape = createCuboidShape(0, 0, 0, 16, 5, 16); - EAST_SHAPE = shape; - NORTH_SHAPE = shape; - SOUTH_SHAPE = shape; - WEST_SHAPE = shape; + SHAPE = shape; } public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { return !worldView.isAir(pos.down()); diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/Plate.java b/src/main/java/eu/midnightdust/motschen/dishes/block/Plate.java index f7f9ea5..5b3b63c 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/block/Plate.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/block/Plate.java @@ -8,19 +8,14 @@ import net.minecraft.state.StateManager; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; -import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.WorldView; public class Plate extends HorizontalFacingBlock { - private static final VoxelShape NORTH_SHAPE; - private static final VoxelShape EAST_SHAPE; - private static final VoxelShape SOUTH_SHAPE; - private static final VoxelShape WEST_SHAPE; - + private static final VoxelShape SHAPE; public Plate() { - super(FabricBlockSettings.copy(Blocks.CAKE).nonOpaque().sounds(BlockSoundGroup.STONE)); + super(FabricBlockSettings.of(Material.STONE).nonOpaque().sounds(BlockSoundGroup.STONE)); this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); } @@ -36,33 +31,10 @@ public class Plate extends HorizontalFacingBlock { } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { - switch (state.get(FACING)) { - case NORTH: return NORTH_SHAPE; - case EAST: return EAST_SHAPE; - case SOUTH: return SOUTH_SHAPE; - case WEST: return WEST_SHAPE; - default: return super.getOutlineShape(state, view, pos, context); - } + return SHAPE; } static { - VoxelShape shape = createCuboidShape(0, 0, 0, 16, 2, 16); - - EAST_SHAPE = shape; - NORTH_SHAPE = shape; - SOUTH_SHAPE = shape; - WEST_SHAPE = shape; - } - private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) { - VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() }; - - int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4; - for (int i = 0; i < times; i++) { - buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX))); - buffer[0] = buffer[1]; - buffer[1] = VoxelShapes.empty(); - } - - return buffer[0]; + SHAPE = createCuboidShape(0, 0, 0, 16, 2, 16); } public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { return !worldView.isAir(pos.down()); diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/Soup.java b/src/main/java/eu/midnightdust/motschen/dishes/block/Soup.java new file mode 100644 index 0000000..a365056 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/dishes/block/Soup.java @@ -0,0 +1,70 @@ +package eu.midnightdust.motschen.dishes.block; + +import eu.midnightdust.motschen.dishes.DishesMain; +import eu.midnightdust.motschen.dishes.blockstates.SoupSips; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.IntProperty; +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.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldView; + +public class Soup extends HorizontalFacingBlock { + + public static final IntProperty SOUP_SIPS = SoupSips.SOUP_SIPS; + private static final VoxelShape SHAPE; + + public Soup() { + super(FabricBlockSettings.of(Material.STONE).nonOpaque().sounds(BlockSoundGroup.STONE)); + this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(SOUP_SIPS, 0)); + } + + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (player.getHungerManager().isNotFull()) { + if (state.get(SOUP_SIPS) == 3) { + world.setBlockState(pos, DishesMain.Bowl.getDefaultState()); + player.getHungerManager().add(2, 1); + return ActionResult.SUCCESS; + } + world.setBlockState(pos, state.with(SOUP_SIPS, state.get(SOUP_SIPS) + 1)); + player.getHungerManager().add(2, 4); + return ActionResult.SUCCESS; + } + else { + return ActionResult.FAIL; + } + } + + @Override + public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { + return super.getPlacementState(itemPlacementContext) + .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()) + .with(SOUP_SIPS, 0); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACING, SOUP_SIPS); + } + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { + return SHAPE; + } + static { + SHAPE = createCuboidShape(0, 0, 0, 16, 5, 16); + } + public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { + return !worldView.isAir(pos.down()); + } + +} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/Tomato.java b/src/main/java/eu/midnightdust/motschen/dishes/block/Tomato.java index bd2b1d4..d746ef9 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/block/Tomato.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/block/Tomato.java @@ -1,6 +1,6 @@ package eu.midnightdust.motschen.dishes.block; -import eu.midnightdust.motschen.dishes.init.CropInit; +import eu.midnightdust.motschen.dishes.init.TomatoInit; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -17,7 +17,7 @@ public class Tomato extends CropBlock { @Override @Environment(EnvType.CLIENT) protected ItemConvertible getSeedsItem() { - return CropInit.TomatoBush; + return TomatoInit.TomatoBush; } } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/block/blockentity/BirthdayCakeBlockEntity.java b/src/main/java/eu/midnightdust/motschen/dishes/block/blockentity/BirthdayCakeBlockEntity.java deleted file mode 100644 index 9a9b626..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/block/blockentity/BirthdayCakeBlockEntity.java +++ /dev/null @@ -1,52 +0,0 @@ -package eu.midnightdust.motschen.dishes.block.blockentity; - -import eu.midnightdust.motschen.dishes.init.BlockEntityInit; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.particle.ParticleTypes; -import net.minecraft.state.property.Properties; -import net.minecraft.util.Tickable; -import net.minecraft.util.math.BlockPos; - -public class BirthdayCakeBlockEntity extends BlockEntity implements Tickable { - private float flame; - - public BirthdayCakeBlockEntity() { - super(BlockEntityInit.BirthdayCakeBlockEntity); - } - - @Override - public void tick() { - BlockPos pos = this.pos; - BlockState state = this.world.getBlockState(pos); - flame = flame + 0.5f; - if (flame == 9) { - flame = 1; - } - - if (flame == 5 && state.get(Properties.BITES) < 4) { - world.addParticle(ParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.8, pos.getZ() + 0.15, 0, 0, 0); - } - if (flame == 1 && state.get(Properties.BITES) < 2) { - world.addParticle(ParticleTypes.FLAME, pos.getX() + 0.25, pos.getY() + 0.8, pos.getZ() + 0.25, 0, 0, 0); - } - if (flame == 7 && state.get(Properties.BITES) < 1) { - world.addParticle(ParticleTypes.FLAME, pos.getX() + 0.15, pos.getY() + 0.8, pos.getZ() + 0.5, 0, 0, 0); - } - if (flame == 3 && state.get(Properties.BITES) < 2) { - world.addParticle(ParticleTypes.FLAME, pos.getX() + 0.25, pos.getY() + 0.8, pos.getZ() + 0.75, 0, 0, 0); - } - if (flame == 4 && state.get(Properties.BITES) < 4) { - world.addParticle(ParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.8, pos.getZ() + 0.85, 0, 0, 0); - } - if (flame == 8 && state.get(Properties.BITES) < 6) { - world.addParticle(ParticleTypes.FLAME, pos.getX() + 0.75, pos.getY() + 0.8, pos.getZ() + 0.75, 0, 0, 0); - } - if (flame == 2) { - world.addParticle(ParticleTypes.FLAME, pos.getX() + 0.85, pos.getY() + 0.8, pos.getZ() + 0.5, 0, 0, 0); - } - if (flame == 6 && state.get(Properties.BITES) < 6) { - world.addParticle(ParticleTypes.FLAME, pos.getX() + 0.75, pos.getY() + 0.8, pos.getZ() + 0.25, 0, 0, 0); - } - } -} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/blockstates/SoupSips.java b/src/main/java/eu/midnightdust/motschen/dishes/blockstates/SoupSips.java new file mode 100644 index 0000000..c45c366 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/dishes/blockstates/SoupSips.java @@ -0,0 +1,10 @@ +package eu.midnightdust.motschen.dishes.blockstates; + +import net.minecraft.state.property.IntProperty; + +public class SoupSips { + public static final IntProperty SOUP_SIPS; + static { + SOUP_SIPS = IntProperty.of("sips", 0, 3); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/compat/CookingGuideItem.java b/src/main/java/eu/midnightdust/motschen/dishes/compat/CookingGuideItem.java index 343e98e..822aa34 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/compat/CookingGuideItem.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/compat/CookingGuideItem.java @@ -20,7 +20,7 @@ public class CookingGuideItem extends Item { Optional item = Registry.ITEM.getOrEmpty(new Identifier("patchouli", "guide_book")); ItemStack stack = new ItemStack(item.get()); - stack.getOrCreateTag().putString("patchouli:book", "dishes:cooking_guide"); + stack.getOrCreateNbt().putString("patchouli:book", "dishes:cooking_guide"); user.setStackInHand(hand, stack); return TypedActionResult.pass(itemStack); diff --git a/src/main/java/eu/midnightdust/motschen/dishes/compat/Flags.java b/src/main/java/eu/midnightdust/motschen/dishes/compat/Flags.java index c3435ab..109510b 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/compat/Flags.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/compat/Flags.java @@ -7,12 +7,14 @@ import net.minecraft.util.registry.Registry; public class Flags { public static Item FlagGermany = new Item(new Item.Settings()); public static Item FlagItaly = new Item(new Item.Settings()); - public static Item FlagBritain = new Item(new Item.Settings()); + public static Item FlagUK = new Item(new Item.Settings()); + public static Item FlagUkraine = new Item(new Item.Settings()); public static Item FlagUSA = new Item(new Item.Settings()); public static void init() { Registry.register(Registry.ITEM, new Identifier("dishes","flag_germany"), FlagGermany); Registry.register(Registry.ITEM, new Identifier("dishes","flag_italy"), FlagItaly); - Registry.register(Registry.ITEM, new Identifier("dishes","flag_britain"), FlagBritain); - Registry.register(Registry.ITEM, new Identifier("dishes","flag_america"), FlagUSA); + Registry.register(Registry.ITEM, new Identifier("dishes","flag_uk"), FlagUK); + Registry.register(Registry.ITEM, new Identifier("dishes","flag_ukraine"), FlagUkraine); + Registry.register(Registry.ITEM, new Identifier("dishes","flag_usa"), FlagUSA); } } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/config/DishesConfig.java b/src/main/java/eu/midnightdust/motschen/dishes/config/DishesConfig.java index 7f68d34..ba523d8 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/config/DishesConfig.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/config/DishesConfig.java @@ -1,21 +1,11 @@ package eu.midnightdust.motschen.dishes.config; -import me.sargunvohra.mcmods.autoconfig1u.ConfigData; -import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; -import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry; +import eu.midnightdust.lib.config.MidnightConfig; -@Config(name = "dishes") -public class DishesConfig implements ConfigData { - - @ConfigEntry.Category("main") - @ConfigEntry.Gui.TransitiveObject - public MainConfig main = new MainConfig(); - - @ConfigEntry.Category("worldgen") - @ConfigEntry.Gui.TransitiveObject - public WorldGenConfig worldgen = new WorldGenConfig(); - - @ConfigEntry.Category("trader") - @ConfigEntry.Gui.TransitiveObject - public IceCreamTraderConfig trader = new IceCreamTraderConfig(); +public class DishesConfig extends MidnightConfig { + @Entry public static boolean spawnTrader = true; + @Entry public static boolean tomatoes = true; + @Entry public static boolean lettuce = true; + @Entry public static boolean saltOre = true; + @Entry public static boolean customLoot = true; } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/config/IceCreamTraderConfig.java b/src/main/java/eu/midnightdust/motschen/dishes/config/IceCreamTraderConfig.java deleted file mode 100644 index 3f1ed7c..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/config/IceCreamTraderConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package eu.midnightdust.motschen.dishes.config; - -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; -import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; - -@Config(name = "trader") -public class IceCreamTraderConfig { - - @Comment(value = "\nEnable Ice Cream Trader\nDefault: true") - public boolean enabled = true; - - @Comment(value = "\nEnable Ice Cream Trader Spawning\nDefault: true") - public boolean spawntrader = true; -} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/config/MainConfig.java b/src/main/java/eu/midnightdust/motschen/dishes/config/MainConfig.java deleted file mode 100644 index 187559b..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/config/MainConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -package eu.midnightdust.motschen.dishes.config; - -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; -import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; - -@Config(name = "main") -public class MainConfig { - - @Comment(value = "\nEnable Tomatoes\nDefault: true") - public boolean tomatoes = true; - @Comment(value = "\nEnable Lettuce\nDefault: true") - public boolean lettuce = true; -} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/config/ModMenuIntegration.java b/src/main/java/eu/midnightdust/motschen/dishes/config/ModMenuIntegration.java deleted file mode 100644 index 7597c65..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/config/ModMenuIntegration.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.midnightdust.motschen.dishes.config; - -import io.github.prospector.modmenu.api.ConfigScreenFactory; -import io.github.prospector.modmenu.api.ModMenuApi; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -public class ModMenuIntegration implements ModMenuApi { - - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> AutoConfig.getConfigScreen(DishesConfig.class, parent).get(); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/config/WorldGenConfig.java b/src/main/java/eu/midnightdust/motschen/dishes/config/WorldGenConfig.java deleted file mode 100644 index 3e8509c..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/config/WorldGenConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package eu.midnightdust.motschen.dishes.config; - -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; -import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; - -@Config(name = "trader") -public class WorldGenConfig { - - @Comment(value = "\nEnable Salt Ore\nDefault: true") - public boolean salt_ore = true; - - @Comment(value = "\nEnable Custom Loot\nDefault: true") - public boolean loot = true; -} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderEntity.java b/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderEntity.java index 1d85211..9314f1c 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderEntity.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderEntity.java @@ -2,9 +2,8 @@ package eu.midnightdust.motschen.dishes.entities; import net.minecraft.entity.EntityType; import net.minecraft.entity.passive.WanderingTraderEntity; -import net.minecraft.village.TradeOffer; +import net.minecraft.village.TradeOfferList; import net.minecraft.village.TradeOffers; -import net.minecraft.village.TraderOfferList; import net.minecraft.world.World; public class IceCreamTraderEntity extends WanderingTraderEntity { @@ -14,16 +13,10 @@ public class IceCreamTraderEntity extends WanderingTraderEntity { @Override protected void fillRecipes() { - TradeOffers.Factory[] factorys = IceCreamTraderTradeOffers.ICE_CREAM_TRADER_TRADES.get(1); - if (factorys != null) { - TraderOfferList traderOfferList = this.getOffers(); - this.fillRecipesFromPool(traderOfferList, factorys, 9); - int i = this.random.nextInt(factorys.length); - TradeOffers.Factory factory = factorys[i]; - TradeOffer tradeOffer = factory.create(this, null); - if (tradeOffer != null) { - traderOfferList.add(tradeOffer); - } + TradeOffers.Factory[] factories = IceCreamTraderTradeOffers.ICE_CREAM_TRADER_TRADES.get(1); + if (factories != null) { + TradeOfferList traderOfferList = this.getOffers(); + this.fillRecipesFromPool(traderOfferList, factories, factories.length); } } } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderSpawn.java b/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderSpawn.java index d44519a..aefd199 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderSpawn.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderSpawn.java @@ -5,14 +5,12 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnReason; import net.minecraft.entity.SpawnRestriction; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundTag; import net.minecraft.server.world.ServerWorld; -import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.RegistryEntry; import net.minecraft.world.*; import net.minecraft.world.level.ServerWorldProperties; import net.minecraft.world.poi.PointOfInterestStorage; -import net.minecraft.world.poi.PointOfInterestType; import java.util.Iterator; import java.util.Optional; @@ -20,14 +18,13 @@ import java.util.Random; public class IceCreamTraderSpawn { public static void tick(ServerWorld serverWorld) { - - if (serverWorld.getGameRules().getBoolean(GameRules.DO_TRADER_SPAWNING)) { - if (serverWorld.getTimeOfDay() % (24000 * 3) == 1500) { - if (serverWorld.getRandom().nextInt(100) < 10) { - spawnTrader(serverWorld); - } + if (serverWorld.getGameRules().getBoolean(GameRules.DO_TRADER_SPAWNING)) { + if (serverWorld.getTimeOfDay() % (24000 * 3) == 1500) { + if (serverWorld.getRandom().nextInt(100) < 10) { + spawnTrader(serverWorld); } } + } } private static void spawnTrader(ServerWorld serverWorld) { @@ -36,11 +33,11 @@ public class IceCreamTraderSpawn { if (playerentity != null) { BlockPos blockPos = playerentity.getBlockPos(); PointOfInterestStorage pointOfInterestStorage = serverWorld.getPointOfInterestStorage(); - Optional optional = pointOfInterestStorage.getPosition(PointOfInterestType.MEETING.getCompletionCondition(), (blockPosX) -> true, blockPos, 48, PointOfInterestStorage.OccupationStatus.ANY); + Optional optional = pointOfInterestStorage.getPosition(RegistryEntry::hasKeyAndValue, (blockPosX) -> true, blockPos, 48, PointOfInterestStorage.OccupationStatus.ANY); BlockPos blockPos2 = optional.orElse(blockPos); BlockPos blockPos3 = getLlamaSpawnPosition(serverWorld, blockPos2, 48); if (blockPos3 != null && wontSuffocateAt(serverWorld, blockPos3)) { - IceCreamTraderEntity traderEntity = IceCreamTraderInit.ICE_CREAM_TRADER.spawn(serverWorld, (CompoundTag) null, (Text) null, (PlayerEntity) null, blockPos3, SpawnReason.EVENT, false, false); + IceCreamTraderEntity traderEntity = IceCreamTraderInit.ICE_CREAM_TRADER.spawn(serverWorld, null,null,null, blockPos3, SpawnReason.EVENT, false, false); if (traderEntity != null) { serverWorldProperties.setWanderingTraderId(traderEntity.getUuid()); traderEntity.setDespawnDelay(32000); @@ -69,13 +66,13 @@ public class IceCreamTraderSpawn { private static boolean wontSuffocateAt(BlockView blockView, BlockPos blockPos) { - Iterator var3 = BlockPos.iterate(blockPos, blockPos.add(1, 2, 1)).iterator(); + Iterator var3 = BlockPos.iterate(blockPos, blockPos.add(1, 2, 1)).iterator(); BlockPos blockPos2; do { if (!var3.hasNext()) { return true; } - blockPos2 = (BlockPos) var3.next(); + blockPos2 = var3.next(); } while (blockView.getBlockState(blockPos2).getCollisionShape(blockView, blockPos2).isEmpty()); return false; } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderTradeOffers.java b/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderTradeOffers.java index 704d656..b9e9c24 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderTradeOffers.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/entities/IceCreamTraderTradeOffers.java @@ -8,21 +8,21 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.util.math.random.Random; import net.minecraft.village.TradeOffer; import net.minecraft.village.TradeOffers; -import java.util.Random; - public class IceCreamTraderTradeOffers { public static final Int2ObjectMap ICE_CREAM_TRADER_TRADES; private static Int2ObjectMap copyToFastUtilMap(ImmutableMap map) { - return new Int2ObjectOpenHashMap(map); + return new Int2ObjectOpenHashMap<>(map); } static { ICE_CREAM_TRADER_TRADES = copyToFastUtilMap(ImmutableMap.of(1, new TradeOffers.Factory[] - {new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamVanilla, 1, 1, 10, 3), + { + new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamVanilla, 1, 1, 10, 3), new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamChocolate, 1, 1, 10, 3), new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamWhiteChocolate, 1, 1, 10, 3), new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamStrawberry, 1, 1, 10, 3), @@ -30,7 +30,9 @@ public class IceCreamTraderTradeOffers { new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamPear, 1, 1, 10, 3), new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamSweetberry, 1, 1, 10, 3), new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamBlueberry, 1, 1, 10, 3), - new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamBubblegum, 1, 1, 10, 3)})); + new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamBubblegum, 1, 1, 10, 3), + new IceCreamTraderTradeOffers.SellItemFactory(DishesMain.IceCreamGlowberry, 1, 1, 10, 3) + })); } static class SellItemFactory implements TradeOffers.Factory { diff --git a/src/main/java/eu/midnightdust/motschen/dishes/entities/client/IceCreamTraderRenderer.java b/src/main/java/eu/midnightdust/motschen/dishes/entities/client/IceCreamTraderRenderer.java index b93359d..1b121e0 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/entities/client/IceCreamTraderRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/entities/client/IceCreamTraderRenderer.java @@ -3,16 +3,17 @@ package eu.midnightdust.motschen.dishes.entities.client; import eu.midnightdust.motschen.dishes.entities.IceCreamTraderEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.render.entity.EntityRenderDispatcher; +import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.MobEntityRenderer; +import net.minecraft.client.render.entity.model.EntityModelLayers; import net.minecraft.client.render.entity.model.VillagerResemblingModel; import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) public class IceCreamTraderRenderer extends MobEntityRenderer> { - public IceCreamTraderRenderer(EntityRenderDispatcher dispatcher) { - super(dispatcher, new VillagerResemblingModel<>(0.0f), 0.5F); + public IceCreamTraderRenderer(EntityRendererFactory.Context context) { + super(context, new VillagerResemblingModel<>(context.getPart(EntityModelLayers.VILLAGER)), 0.5F); } @Override diff --git a/src/main/java/eu/midnightdust/motschen/dishes/init/BlockEntityInit.java b/src/main/java/eu/midnightdust/motschen/dishes/init/BlockEntityInit.java deleted file mode 100644 index d827dc5..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/init/BlockEntityInit.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.midnightdust.motschen.dishes.init; - -import eu.midnightdust.motschen.dishes.DishesMain; -import eu.midnightdust.motschen.dishes.block.blockentity.BirthdayCakeBlockEntity; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - -public class BlockEntityInit { - - public static BlockEntityType BirthdayCakeBlockEntity; - - public static void init() { - BirthdayCakeBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DishesMain.MOD_ID,"birthday_cake_blockentity"), BlockEntityType.Builder.create(BirthdayCakeBlockEntity::new, DishesMain.BirthdayCake).build(null)); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/init/CropInit.java b/src/main/java/eu/midnightdust/motschen/dishes/init/CropInit.java index 1a81246..ef2ebd8 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/init/CropInit.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/init/CropInit.java @@ -1,35 +1,14 @@ package eu.midnightdust.motschen.dishes.init; -import eu.midnightdust.motschen.dishes.DishesMain; -import eu.midnightdust.motschen.dishes.block.Lettuce; -import eu.midnightdust.motschen.dishes.block.Tomato; import eu.midnightdust.motschen.dishes.config.DishesConfig; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; -import net.minecraft.block.Block; -import net.minecraft.item.AliasedBlockItem; -import net.minecraft.item.FoodComponent; -import net.minecraft.item.Item; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; public class CropInit { - private static final DishesConfig config = AutoConfig.getConfigHolder(DishesConfig.class).getConfig(); - - public static final Item Tomato = new Item(new Item.Settings().group(DishesMain.MainGroup).food(new FoodComponent.Builder().hunger(2).saturationModifier(1f).snack().build())); - public static final Block TomatoBush = new Tomato(); - public static final Item Lettuce = new Item(new Item.Settings().group(DishesMain.MainGroup).food(new FoodComponent.Builder().hunger(1).saturationModifier(0.75f).snack().build())); - public static final Block LettuceBush = new Lettuce(); - public static void init() { - if (config.main.tomatoes == true) { - Registry.register(Registry.ITEM, new Identifier("dishes","tomatoseed"), new AliasedBlockItem(TomatoBush, new Item.Settings().group(DishesMain.MainGroup))); - Registry.register(Registry.ITEM, new Identifier("dishes","tomato"), Tomato); - Registry.register(Registry.BLOCK, new Identifier("dishes","tomatobush"), TomatoBush); + if (DishesConfig.tomatoes) { + TomatoInit.init(); } - if (config.main.lettuce == true) { - Registry.register(Registry.ITEM, new Identifier("dishes","lettuceseed"), new AliasedBlockItem(LettuceBush, new Item.Settings().group(DishesMain.MainGroup))); - Registry.register(Registry.ITEM, new Identifier("dishes","lettuce"), Lettuce); - Registry.register(Registry.BLOCK, new Identifier("dishes","lettucebush"), LettuceBush); + if (DishesConfig.lettuce) { + LettuceInit.init(); } } } diff --git a/src/main/java/eu/midnightdust/motschen/dishes/init/IceCreamTraderInit.java b/src/main/java/eu/midnightdust/motschen/dishes/init/IceCreamTraderInit.java index d9821c9..6ecd1ae 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/init/IceCreamTraderInit.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/init/IceCreamTraderInit.java @@ -17,7 +17,7 @@ import net.minecraft.util.registry.Registry; public class IceCreamTraderInit { public static final EntityType ICE_CREAM_TRADER = - Registry.register(Registry.ENTITY_TYPE,new Identifier(DishesMain.MOD_ID,"ice_cream_trader"), FabricEntityTypeBuilder.create(SpawnGroup.CREATURE,IceCreamTraderEntity::new).dimensions(EntityDimensions.fixed(1f,2f)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DishesMain.MOD_ID,"ice_cream_trader"), FabricEntityTypeBuilder.create(SpawnGroup.CREATURE, IceCreamTraderEntity::new).dimensions(EntityDimensions.fixed(1f,2f)).trackRangeBlocks(100).trackedUpdateRate(4).build()); public static void init() { Registry.register(Registry.ITEM, new Identifier(DishesMain.MOD_ID,"ice_cream_trader_spawn_egg"), new SpawnEggItem(ICE_CREAM_TRADER,5349438,15377456, new Item.Settings().group(ItemGroup.MISC))); diff --git a/src/main/java/eu/midnightdust/motschen/dishes/init/LettuceInit.java b/src/main/java/eu/midnightdust/motschen/dishes/init/LettuceInit.java new file mode 100644 index 0000000..113bcef --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/dishes/init/LettuceInit.java @@ -0,0 +1,20 @@ +package eu.midnightdust.motschen.dishes.init; + +import eu.midnightdust.motschen.dishes.block.Lettuce; +import net.minecraft.block.Block; +import net.minecraft.item.AliasedBlockItem; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class LettuceInit { + public static final Item Lettuce = new Item(new Item.Settings().food(new FoodComponent.Builder().hunger(1).saturationModifier(0.75f).snack().build())); + public static final Block LettuceBush = new Lettuce(); + + public static void init() { + Registry.register(Registry.ITEM, new Identifier("dishes","lettuceseed"), new AliasedBlockItem(LettuceBush, new Item.Settings())); + Registry.register(Registry.ITEM, new Identifier("dishes","lettuce"), Lettuce); + Registry.register(Registry.BLOCK, new Identifier("dishes","lettucebush"), LettuceBush); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/init/TomatoInit.java b/src/main/java/eu/midnightdust/motschen/dishes/init/TomatoInit.java new file mode 100644 index 0000000..8f9906b --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/dishes/init/TomatoInit.java @@ -0,0 +1,20 @@ +package eu.midnightdust.motschen.dishes.init; + +import eu.midnightdust.motschen.dishes.block.Tomato; +import net.minecraft.block.Block; +import net.minecraft.item.AliasedBlockItem; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class TomatoInit { + public static final Item Tomato = new Item(new Item.Settings().food(new FoodComponent.Builder().hunger(2).saturationModifier(1f).snack().build())); + public static final Block TomatoBush = new Tomato(); + + public static void init() { + Registry.register(Registry.ITEM, new Identifier("dishes","tomatoseed"), new AliasedBlockItem(TomatoBush, new Item.Settings())); + Registry.register(Registry.ITEM, new Identifier("dishes","tomato"), Tomato); + Registry.register(Registry.BLOCK, new Identifier("dishes","tomatobush"), TomatoBush); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/init/WorldGenInit.java b/src/main/java/eu/midnightdust/motschen/dishes/init/WorldGenInit.java index 0a6e8d7..5154958 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/init/WorldGenInit.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/init/WorldGenInit.java @@ -3,26 +3,19 @@ package eu.midnightdust.motschen.dishes.init; import eu.midnightdust.motschen.dishes.config.DishesConfig; import eu.midnightdust.motschen.dishes.entities.IceCreamTraderSpawn; import eu.midnightdust.motschen.dishes.world.LootModifier; -import eu.midnightdust.motschen.dishes.world.OreFeatureInjector; import eu.midnightdust.motschen.dishes.world.OreFeatures; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.minecraft.server.world.ServerWorld; public class WorldGenInit { - private static final DishesConfig config = AutoConfig.getConfigHolder(DishesConfig.class).getConfig(); - public static void init() { - if (config.trader.enabled == true) { - IceCreamTraderInit.init(); - } - if (config.worldgen.loot == true) { LootModifier.init(); } - if (config.worldgen.salt_ore == true) { + if (DishesConfig.customLoot) { + LootModifier.init(); } + if (DishesConfig.saltOre) { OreFeatures.init(); - OreFeatureInjector.init(); } - if (config.trader.enabled == true && config.trader.spawntrader == true) { + if (DishesConfig.spawnTrader) { ServerTickEvents.END_SERVER_TICK.register(minecraftServer -> { ServerWorld world = minecraftServer.getOverworld(); IceCreamTraderSpawn.tick(world); diff --git a/src/main/java/eu/midnightdust/motschen/dishes/item/DishItem.java b/src/main/java/eu/midnightdust/motschen/dishes/item/DishItem.java new file mode 100644 index 0000000..c9bc56b --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/dishes/item/DishItem.java @@ -0,0 +1,27 @@ +package eu.midnightdust.motschen.dishes.item; + +import net.minecraft.block.Block; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class DishItem extends BlockItem { + public DishItem(Block block, Settings settings) { + super(block, settings); + } + + @Override + public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + super.appendTooltip(stack, world, tooltip, context); + if (I18n.hasTranslation(stack.getItem().getTranslationKey()+".tooltip")) { + for (String str : I18n.translate(stack.getItem().getTranslationKey()+".tooltip").split("\n")) + tooltip.add(Text.literal(str)); + } + } +} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/item/IceCreamItem.java b/src/main/java/eu/midnightdust/motschen/dishes/item/IceCreamItem.java new file mode 100644 index 0000000..b77780f --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/dishes/item/IceCreamItem.java @@ -0,0 +1,22 @@ +package eu.midnightdust.motschen.dishes.item; + +import eu.midnightdust.motschen.dishes.DishesMain; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class IceCreamItem extends Item { + public IceCreamItem(Settings settings) { + super(settings); + } + + @Override + public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { + if (stack.getItem() == DishesMain.IceCreamGlowberry && this.getFoodComponent() != null) + user.addStatusEffect(new StatusEffectInstance(StatusEffects.GLOWING, 100, 1)); + return super.finishUsing(stack, world, user); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/mixin/GenerationSettingsAccessorMixin.java b/src/main/java/eu/midnightdust/motschen/dishes/mixin/GenerationSettingsAccessorMixin.java deleted file mode 100644 index 8699725..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/mixin/GenerationSettingsAccessorMixin.java +++ /dev/null @@ -1,19 +0,0 @@ -package eu.midnightdust.motschen.dishes.mixin; - -import net.minecraft.world.biome.GenerationSettings; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.List; -import java.util.function.Supplier; - -@Mixin(GenerationSettings.class) -public interface GenerationSettingsAccessorMixin { - - @Accessor - List>>> getFeatures(); - - @Accessor - void setFeatures(List>>> features); -} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/world/LootModifier.java b/src/main/java/eu/midnightdust/motschen/dishes/world/LootModifier.java index fc58e95..55cbf13 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/world/LootModifier.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/world/LootModifier.java @@ -2,59 +2,57 @@ package eu.midnightdust.motschen.dishes.world; import eu.midnightdust.motschen.dishes.DishesMain; import eu.midnightdust.motschen.dishes.config.DishesConfig; -import eu.midnightdust.motschen.dishes.init.CropInit; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; -import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder; -import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback; +import eu.midnightdust.motschen.dishes.init.LettuceInit; +import eu.midnightdust.motschen.dishes.init.TomatoInit; +import net.fabricmc.fabric.api.loot.v2.LootTableEvents; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.loot.UniformLootTableRange; +import net.minecraft.loot.LootPool; import net.minecraft.loot.condition.RandomChanceLootCondition; import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.provider.number.UniformLootNumberProvider; public class LootModifier { - private static final DishesConfig config = AutoConfig.getConfigHolder(DishesConfig.class).getConfig(); - public static void init() { - if (FabricLoader.getInstance().isModLoaded("galacticraft-rewoven")) { - LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, id, supplier, setter) -> { - if (id.getPath().contains("galacticraft-rewoven") && id.getPath().contains("loot_tables") && id.getPath().contains("chests")) { - FabricLootPoolBuilder spaceburger = FabricLootPoolBuilder.builder() - .rolls(UniformLootTableRange.between(0, 2)) - .withCondition(RandomChanceLootCondition.builder(1.0f).build()) + if (FabricLoader.getInstance().isModLoaded("ad_astra")) { + LootTableEvents.MODIFY.register((resourceManager, lootManager, id, supplier, setter) -> { + if (id.getPath().contains("ad_astra") && id.getPath().contains("loot_tables") && id.getPath().contains("chests")) { + LootPool.Builder spaceburger = LootPool.builder() + .rolls(UniformLootNumberProvider.create(0, 2)) + .conditionally(RandomChanceLootCondition.builder(0.5f).build()) .with(ItemEntry.builder(DishesMain.Spaceburger)); supplier.pool(spaceburger); } }); } if (FabricLoader.getInstance().isModLoaded("patchouli")) { - LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, id, supplier, setter) -> { + LootTableEvents.MODIFY.register((resourceManager, lootManager, id, supplier, setter) -> { if (id.getPath().contains("chests") && id.getPath().contains("village")) { - FabricLootPoolBuilder patchouli = FabricLootPoolBuilder.builder() - .rolls(UniformLootTableRange.between(0, 1)) - .withCondition(RandomChanceLootCondition.builder(1.0f).build()) + LootPool.Builder patchouli = LootPool.builder() + .rolls(UniformLootNumberProvider.create(0, 1)) + .conditionally(RandomChanceLootCondition.builder(0.5f).build()) .with(ItemEntry.builder(DishesMain.CookingGuide)); supplier.pool(patchouli); } }); } - if (config.main.tomatoes == true) { - LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, id, supplier, setter) -> { + if (DishesConfig.tomatoes) { + LootTableEvents.MODIFY.register((resourceManager, lootManager, id, supplier, setter) -> { if (id.getPath().contains("chests") && id.getPath().contains("village")) { - FabricLootPoolBuilder tomato = FabricLootPoolBuilder.builder() - .rolls(UniformLootTableRange.between(0, 5)) - .withCondition(RandomChanceLootCondition.builder(1.0f).build()) - .with(ItemEntry.builder(CropInit.Tomato)); + LootPool.Builder tomato = LootPool.builder() + .rolls(UniformLootNumberProvider.create(0, 5)) + .conditionally(RandomChanceLootCondition.builder(0.5f).build()) + .with(ItemEntry.builder(TomatoInit.Tomato)); supplier.pool(tomato); } }); } - if (config.main.lettuce == true) { - LootTableLoadingCallback.EVENT.register((resourceManager, lootManager, id, supplier, setter) -> { + if (DishesConfig.lettuce) { + LootTableEvents.MODIFY.register((resourceManager, lootManager, id, supplier, setter) -> { if (id.getPath().contains("chests") && id.getPath().contains("village")) { - FabricLootPoolBuilder lettuce = FabricLootPoolBuilder.builder() - .rolls(UniformLootTableRange.between(0, 5)) - .withCondition(RandomChanceLootCondition.builder(1.0f).build()) - .with(ItemEntry.builder(CropInit.Lettuce)); + LootPool.Builder lettuce = LootPool.builder() + .rolls(UniformLootNumberProvider.create(0, 5)) + .conditionally(RandomChanceLootCondition.builder(0.5f).build()) + .with(ItemEntry.builder(LettuceInit.Lettuce)); supplier.pool(lettuce); } }); diff --git a/src/main/java/eu/midnightdust/motschen/dishes/world/OreFeatureInjector.java b/src/main/java/eu/midnightdust/motschen/dishes/world/OreFeatureInjector.java deleted file mode 100644 index c4452af..0000000 --- a/src/main/java/eu/midnightdust/motschen/dishes/world/OreFeatureInjector.java +++ /dev/null @@ -1,44 +0,0 @@ -package eu.midnightdust.motschen.dishes.world; - -import com.google.common.collect.Lists; -import eu.midnightdust.motschen.dishes.mixin.GenerationSettingsAccessorMixin; -import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; -import net.minecraft.util.registry.BuiltinRegistries; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.feature.ConfiguredFeature; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Supplier; - -public class OreFeatureInjector { - - public static void init() { - BuiltinRegistries.BIOME.forEach(OreFeatureInjector::addToBiome); - RegistryEntryAddedCallback.event(BuiltinRegistries.BIOME).register((i, identifier, biome) -> addToBiome(biome)); - } - - private static void addToBiome(Biome biome) { - addSaltOre(biome); - } - - private static void addSaltOre(Biome biome) { - if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND) { - addFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, OreFeatures.SALT_ORE_FEATURE); - } - } - - public static void addFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature feature) { - GenerationSettingsAccessorMixin generationSettingsAccessor = (GenerationSettingsAccessorMixin) biome.getGenerationSettings(); - int stepIndex = step.ordinal(); - List>>> featuresByStep = new ArrayList<>( generationSettingsAccessor.getFeatures()); - while (featuresByStep.size() <= stepIndex) { - featuresByStep.add(Lists.newArrayList()); - } - List>> features = new ArrayList<>(featuresByStep.get(stepIndex)); - features.add(() -> feature); - featuresByStep.set(stepIndex, features); - generationSettingsAccessor.setFeatures(featuresByStep); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/dishes/world/OreFeatures.java b/src/main/java/eu/midnightdust/motschen/dishes/world/OreFeatures.java index eebb787..ee4579f 100644 --- a/src/main/java/eu/midnightdust/motschen/dishes/world/OreFeatures.java +++ b/src/main/java/eu/midnightdust/motschen/dishes/world/OreFeatures.java @@ -1,18 +1,35 @@ package eu.midnightdust.motschen.dishes.world; import eu.midnightdust.motschen.dishes.DishesMain; +import net.fabricmc.fabric.api.biome.v1.BiomeModifications; +import net.minecraft.tag.BiomeTags; import net.minecraft.util.Identifier; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.OreFeatureConfig; +import net.minecraft.util.registry.RegistryEntry; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.YOffset; +import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.placementmodifier.CountPlacementModifier; +import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier; +import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier; + +import java.util.List; public class OreFeatures { - public static final ConfiguredFeature SALT_ORE_FEATURE = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, DishesMain.SaltOre.getDefaultState(), 4)).method_30377(120).spreadHorizontally().repeat(20); - + private static final ConfiguredFeature SALT_ORE_FEATURE = new ConfiguredFeature<>(Feature.ORE, new OreFeatureConfig( + OreConfiguredFeatures.STONE_ORE_REPLACEABLES, DishesMain.SaltOre.getDefaultState(),4)); + public static PlacedFeature SALT_ORE_PLACED_FEATURE = new PlacedFeature( + RegistryEntry.of(SALT_ORE_FEATURE), + List.of( + CountPlacementModifier.of(20), + SquarePlacementModifier.of(), + HeightRangePlacementModifier.uniform(YOffset.BOTTOM, YOffset.fixed(120)) + )); public static void init() { Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier(DishesMain.MOD_ID, "salt_ore"), SALT_ORE_FEATURE); - + Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier(DishesMain.MOD_ID, "placed_salt_ore"), SALT_ORE_PLACED_FEATURE); + BiomeModifications.addFeature(biome -> (!biome.hasTag(BiomeTags.IS_NETHER) && !biome.hasTag(BiomeTags.END_CITY_HAS_STRUCTURE)), + GenerationStep.Feature.UNDERGROUND_ORES, BuiltinRegistries.PLACED_FEATURE.getKey(OreFeatures.SALT_ORE_PLACED_FEATURE).get()); } } diff --git a/src/main/resources/assets/dishes/blockstates/birthday_cake.json b/src/main/resources/assets/dishes/blockstates/birthday_cake.json deleted file mode 100644 index d73fbb7..0000000 --- a/src/main/resources/assets/dishes/blockstates/birthday_cake.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "variants": { - "bites=0": { "model": "dishes:block/birthday_cake" }, - "bites=1": { "model": "dishes:block/birthday_cake_slice1" }, - "bites=2": { "model": "dishes:block/birthday_cake_slice2" }, - "bites=3": { "model": "dishes:block/birthday_cake_slice3" }, - "bites=4": { "model": "dishes:block/birthday_cake_slice4" }, - "bites=5": { "model": "dishes:block/birthday_cake_slice5" }, - "bites=6": { "model": "dishes:block/birthday_cake_slice6" } - } -} diff --git a/src/main/resources/assets/dishes/blockstates/borscht.json b/src/main/resources/assets/dishes/blockstates/borscht.json new file mode 100644 index 0000000..8f96396 --- /dev/null +++ b/src/main/resources/assets/dishes/blockstates/borscht.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=north,sips=0": { "model": "dishes:block/borscht" }, + "facing=east,sips=0": { "model": "dishes:block/borscht", "y": 90 }, + "facing=south,sips=0": { "model": "dishes:block/borscht", "y": 180 }, + "facing=west,sips=0": { "model": "dishes:block/borscht", "y": 270 }, + "facing=north,sips=1": { "model": "dishes:block/borscht1" }, + "facing=east,sips=1": { "model": "dishes:block/borscht1", "y": 90 }, + "facing=south,sips=1": { "model": "dishes:block/borscht1", "y": 180 }, + "facing=west,sips=1": { "model": "dishes:block/borscht1", "y": 270 }, + "facing=north,sips=2": { "model": "dishes:block/borscht2" }, + "facing=east,sips=2": { "model": "dishes:block/borscht2", "y": 90 }, + "facing=south,sips=2": { "model": "dishes:block/borscht2", "y": 180 }, + "facing=west,sips=2": { "model": "dishes:block/borscht2", "y": 270 }, + "facing=north,sips=3": { "model": "dishes:block/borscht3" }, + "facing=east,sips=3": { "model": "dishes:block/borscht3", "y": 90 }, + "facing=south,sips=3": { "model": "dishes:block/borscht3", "y": 180 }, + "facing=west,sips=3": { "model": "dishes:block/borscht3", "y": 270 } + } +} diff --git a/src/main/resources/assets/dishes/blockstates/bowl.json b/src/main/resources/assets/dishes/blockstates/bowl.json new file mode 100644 index 0000000..5894c33 --- /dev/null +++ b/src/main/resources/assets/dishes/blockstates/bowl.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "dishes:block/bowl" } + } +} diff --git a/src/main/resources/assets/dishes/blockstates/pizzamargherita.json b/src/main/resources/assets/dishes/blockstates/pizzamargherita.json new file mode 100644 index 0000000..e13b71b --- /dev/null +++ b/src/main/resources/assets/dishes/blockstates/pizzamargherita.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north,bites=0": { "model": "dishes:block/pizzamargherita" }, + "facing=east,bites=0": { "model": "dishes:block/pizzamargherita", "y": 90 }, + "facing=south,bites=0": { "model": "dishes:block/pizzamargherita", "y": 180 }, + "facing=west,bites=0": { "model": "dishes:block/pizzamargherita", "y": 270 }, + "facing=north,bites=1": { "model": "dishes:block/pizzamargherita1" }, + "facing=east,bites=1": { "model": "dishes:block/pizzamargherita1", "y": 90 }, + "facing=south,bites=1": { "model": "dishes:block/pizzamargherita1", "y": 180 }, + "facing=west,bites=1": { "model": "dishes:block/pizzamargherita1", "y": 270 }, + "facing=north,bites=2": { "model": "dishes:block/pizzamargherita2" }, + "facing=east,bites=2": { "model": "dishes:block/pizzamargherita2", "y": 90 }, + "facing=south,bites=2": { "model": "dishes:block/pizzamargherita2", "y": 180 }, + "facing=west,bites=2": { "model": "dishes:block/pizzamargherita2", "y": 270 }, + "facing=north,bites=3": { "model": "dishes:block/pizzamargherita3" }, + "facing=east,bites=3": { "model": "dishes:block/pizzamargherita3", "y": 90 }, + "facing=south,bites=3": { "model": "dishes:block/pizzamargherita3", "y": 180 }, + "facing=west,bites=3": { "model": "dishes:block/pizzamargherita3", "y": 270 }, + "facing=north,bites=4": { "model": "dishes:block/pizzamargherita4" }, + "facing=east,bites=4": { "model": "dishes:block/pizzamargherita4", "y": 90 }, + "facing=south,bites=4": { "model": "dishes:block/pizzamargherita4", "y": 180 }, + "facing=west,bites=4": { "model": "dishes:block/pizzamargherita4", "y": 270 } + } +} diff --git a/src/main/resources/assets/dishes/lang/de_de.json b/src/main/resources/assets/dishes/lang/de_de.json index be62f2f..ddcaa42 100644 --- a/src/main/resources/assets/dishes/lang/de_de.json +++ b/src/main/resources/assets/dishes/lang/de_de.json @@ -13,11 +13,11 @@ "item.dishes.tomato":"Tomate", "item.dishes.tomatobush":"Tomatenbusch", "item.dishes.tomatoseed":"Tomatensamen", - "item.dishes.lettuce":"Salat", + "item.dishes.lettuce":"Eisbergsalat", "item.dishes.raw_bacon":"Roher Speck", "item.dishes.bacon":"Speck", - "item.dishes.lettucebush":"Salatbusch", - "item.dishes.lettuceseed":"Salatsamen", + "item.dishes.lettucebush":"Eisbergsalatbusch", + "item.dishes.lettuceseed":"Eisbergsalatsamen", "item.dishes.potato_slice":"Kartoffelstückchen", "item.dishes.raw_fries":"Rohe Pommes", "item.dishes.fries":"Pommes", @@ -26,6 +26,7 @@ "item.dishes.cheese_slice":"Käsescheibe", "item.dishes.knife":"Messer", "block.dishes.plate":"Teller", + "block.dishes.bowl":"Schüssel", "block.dishes.pizzabox":"Leerer Pizzakarton", "block.dishes.potatoeswithcurdcheese":"Kartoffeln mit Quark", "block.dishes.tinypotatoeswithcurdcheese":"Tiny Potatoes mit Quark", @@ -40,6 +41,7 @@ "block.dishes.chickenburger":"Chickenburger", "block.dishes.cheeseburger":"Cheeseburger", "block.dishes.fishandchips":"Fish and Chips", + "block.dishes.borscht":"Borschtsch", "itemGroup.dishes.sweets":"Delicious Dishes - Süßigkeiten", "item.dishes.ice_cream_vanilla":"Vanilleeis", @@ -47,6 +49,7 @@ "item.dishes.ice_cream_banana":"Bananeneis", "item.dishes.ice_cream_pear":"Birneneis", "item.dishes.ice_cream_sweetberry":"Süßbeereis", + "item.dishes.ice_cream_glowberry":"Leuchtbeereis", "item.dishes.ice_cream_blueberry":"Blaubeereis", "item.dishes.ice_cream_bubblegum":"Kaugummieis", "item.dishes.ice_cream_chocolate":"Schokoladeneis", @@ -54,5 +57,11 @@ "item.dishes.ice_cream_trader_spawn_egg":"Erschaffe Eiscremeverkäufer", "entity.dishes.ice_cream_trader":"Eiscremeverkäufer", - "block.dishes.birthday_cake": "Geburtstagskuchen" + "dishes.midnightconfig.title":"Delicious Dishes Konfiguration", + + "dishes.midnightconfig.tomatoes":"Aktiviere Tomaten", + "dishes.midnightconfig.lettuce":"Aktiviere Eisbergsalat", + "dishes.midnightconfig.saltOre":"Aktiviere Salzerz", + "dishes.midnightconfig.customLoot":"Aktiviere Anpassung von Loot", + "dishes.midnightconfig.spawnTrader":"Aktiviere den Eiscremeverkäufer" } \ No newline at end of file diff --git a/src/main/resources/assets/dishes/lang/en_us.json b/src/main/resources/assets/dishes/lang/en_us.json index 34693c0..2da84cf 100644 --- a/src/main/resources/assets/dishes/lang/en_us.json +++ b/src/main/resources/assets/dishes/lang/en_us.json @@ -26,10 +26,12 @@ "item.dishes.cheese_slice":"Cheese Slice", "item.dishes.knife":"Knife", "block.dishes.plate":"Plate", + "block.dishes.bowl":"Bowl", "block.dishes.pizzabox":"Empty Pizzabox", "block.dishes.potatoeswithcurdcheese":"Potatoes with Curd Cheese", "block.dishes.tinypotatoeswithcurdcheese":"Tiny Potatoes with Curd Cheese", "block.dishes.schnitzel":"Schnitzel", + "block.dishes.pizzamargherita":"Pizza Margherita", "block.dishes.pizzasalami":"Pizza Salami", "block.dishes.pizzaham":"Pizza Ham", "block.dishes.pizzatuna":"Pizza Tuna", @@ -40,7 +42,9 @@ "block.dishes.chickenburger":"Chickenburger", "block.dishes.cheeseburger":"Cheeseburger", "block.dishes.spaceburger":"Spaceburger", + "block.dishes.spaceburger.tooltip":"§bTastes... suspicious.", "block.dishes.fishandchips":"Fish and Chips", + "block.dishes.borscht":"Borscht", "itemGroup.dishes.sweets":"Delicious Dishes - Sweets", "item.dishes.ice_cream_vanilla":"Vanilla Ice Cream", @@ -48,6 +52,7 @@ "item.dishes.ice_cream_banana":"Banana Ice Cream", "item.dishes.ice_cream_pear":"Pear Ice Cream", "item.dishes.ice_cream_sweetberry":"Sweet Berry Ice Cream", + "item.dishes.ice_cream_glowberry":"Glow Berry Ice Cream", "item.dishes.ice_cream_blueberry":"Blueberry Ice Cream", "item.dishes.ice_cream_bubblegum":"Bubblegum Ice Cream", "item.dishes.ice_cream_chocolate":"Chocolate Ice Cream", @@ -55,17 +60,11 @@ "item.dishes.ice_cream_trader_spawn_egg":"Spawn Ice Cream Trader", "entity.dishes.ice_cream_trader":"Ice Cream Trader", - "block.dishes.birthday_cake":"Birthday Cake", + "dishes.midnightconfig.title":"Delicious Dishes Config", - "text.autoconfig.dishes.title":"Delicious Dishes Config", - "text.autoconfig.dishes.category.main":"Crops", - "text.autoconfig.dishes.category.worldgen":"World Gen", - "text.autoconfig.dishes.category.trader":"Trader", - - "text.autoconfig.dishes.option.main.tomatoes":"Enable Tomatoes", - "text.autoconfig.dishes.option.main.lettuce":"Enable Lettuce", - "text.autoconfig.dishes.option.worldgen.salt_ore":"Enable Salt Ore", - "text.autoconfig.dishes.option.worldgen.loot":"Enable Loot Tables", - "text.autoconfig.dishes.option.trader.enabled":"Enable Ice Cream Trader", - "text.autoconfig.dishes.option.trader.spawntrader":"Spawn Ice Cream Trader" + "dishes.midnightconfig.tomatoes":"Enable Tomatoes", + "dishes.midnightconfig.lettuce":"Enable Lettuce", + "dishes.midnightconfig.saltOre":"Enable Salt Ore", + "dishes.midnightconfig.customLoot":"Enable Custom Loot", + "dishes.midnightconfig.spawnTrader":"Spawn Ice Cream Trader" } \ No newline at end of file diff --git a/src/main/resources/assets/dishes/lang/zh_cn.json b/src/main/resources/assets/dishes/lang/zh_cn.json index a1fb440..2052507 100644 --- a/src/main/resources/assets/dishes/lang/zh_cn.json +++ b/src/main/resources/assets/dishes/lang/zh_cn.json @@ -52,7 +52,5 @@ "item.dishes.ice_cream_chocolate":"巧克力冰淇淋", "item.dishes.ice_cream_white_chocolate":"白巧克力冰淇淋", "item.dishes.ice_cream_trader_spawn_egg": "冰淇淋商人刷怪蛋", - "entity.dishes.ice_cream_trader": "冰淇淋商人", - - "block.dishes.birthday_cake": "生日蛋糕" + "entity.dishes.ice_cream_trader": "冰淇淋商人" } diff --git a/src/main/resources/assets/dishes/models/block/birthday_cake.json b/src/main/resources/assets/dishes/models/block/birthday_cake.json deleted file mode 100644 index ee804f5..0000000 --- a/src/main/resources/assets/dishes/models/block/birthday_cake.json +++ /dev/null @@ -1,339 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "3": "block/red_concrete", - "4": "dishes:block/flame", - "5": "block/black_concrete", - "bottom": "block/cake_bottom", - "top": "block/cake_top", - "particle": "block/cake_side", - "side": "block/cake_side" - }, - "elements": [ - { - "from": [1, 0, 1], - "to": [15, 8, 15], - "faces": { - "north": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "east": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "south": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "west": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, - "down": {"uv": [1, 1, 15, 15], "texture": "#bottom", "cullface": "down"} - } - }, - { - "from": [3, 8, 3], - "to": [4, 11, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [10.3, 11, 6.9], - "to": [11.3, 12, 6.9], - "rotation": {"angle": 45, "axis": "y", "origin": [3, 19, 14]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [3.4, 11, 3.4], - "to": [3.6, 11.2, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 19, 11]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [2, 8, 7.5], - "to": [3, 11, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 16, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [9.6, 11, 11.6], - "to": [10.6, 12, 11.6], - "rotation": {"angle": 45, "axis": "y", "origin": [2, 19, 19]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [2.4, 11, 7.9], - "to": [2.6, 11.2, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [10, 19, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [7.5, 8, 13], - "to": [8.5, 11, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 21]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [14.6, 11, 17.3], - "to": [15.6, 12, 17.3], - "rotation": {"angle": 45, "axis": "y", "origin": [7, 19, 24]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [7.9, 11, 13.4], - "to": [8.1, 11.2, 13.6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 19, 21]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 12], - "to": [13, 11, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 15.9], - "to": [20.3, 12, 15.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 23]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 12.4], - "to": [12.6, 11.2, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 20]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [13, 8, 7.5], - "to": [14, 11, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 16, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [20.6, 11, 11.6], - "to": [21.6, 12, 11.6], - "rotation": {"angle": 45, "axis": "y", "origin": [13, 19, 19]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [13.4, 11, 7.9], - "to": [13.6, 11.2, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 19, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 3], - "to": [13, 11, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 6.9], - "to": [20.3, 12, 6.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 14]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 3.4], - "to": [12.6, 11.2, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 11]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [7.5, 8, 2], - "to": [8.5, 11, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [14.6, 11, 6.3], - "to": [15.6, 12, 6.3], - "rotation": {"angle": 45, "axis": "y", "origin": [7, 19, 13]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [7.9, 11, 2.4], - "to": [8.1, 11.2, 2.6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 19, 10]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [3, 8, 12], - "to": [4, 11, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [10.3, 11, 15.9], - "to": [11.3, 12, 15.9], - "rotation": {"angle": 45, "axis": "y", "origin": [3, 19, 23]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [3.4, 11, 12.4], - "to": [3.6, 11.2, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 19, 20]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - } - ], - "groups": [0, - { - "name": "candles", - "origin": [8, 8, 8], - "children": [ - { - "name": "candle1", - "origin": [10, 16, 11], - "children": [1, 2, 3] - }, - { - "name": "candle2", - "origin": [10, 16, 11], - "children": [4, 5, 6] - }, - { - "name": "candle3", - "origin": [10, 16, 11], - "children": [7, 8, 9] - }, - { - "name": "candle4", - "origin": [10, 16, 11], - "children": [10, 11, 12] - }, - { - "name": "candle5", - "origin": [10, 16, 11], - "children": [13, 14, 15] - }, - { - "name": "candle6", - "origin": [10, 16, 11], - "children": [16, 17, 18] - }, - { - "name": "candle7", - "origin": [10, 16, 11], - "children": [19, 20, 21] - }, - { - "name": "candle8", - "origin": [10, 16, 11], - "children": [22, 23, 24] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/birthday_cake_slice1.json b/src/main/resources/assets/dishes/models/block/birthday_cake_slice1.json deleted file mode 100644 index 266cfaf..0000000 --- a/src/main/resources/assets/dishes/models/block/birthday_cake_slice1.json +++ /dev/null @@ -1,301 +0,0 @@ -{ - "credit": "made by Motschen", - "textures": { - "3": "block/red_concrete", - "4": "dishes:block/flame", - "5": "block/black_concrete", - "6": "block/cake_inner", - "bottom": "block/cake_bottom", - "top": "block/cake_top", - "particle": "block/cake_side", - "side": "block/cake_side" - }, - "elements": [ - { - "from": [3, 0, 1], - "to": [15, 8, 15], - "faces": { - "north": {"uv": [1, 8, 13, 16], "texture": "#side"}, - "east": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "south": {"uv": [3, 8, 15, 16], "texture": "#side"}, - "west": {"uv": [1, 8, 15, 16], "texture": "#6"}, - "up": {"uv": [3, 1, 15, 15], "texture": "#top"}, - "down": {"uv": [3, 1, 15, 15], "texture": "#bottom", "cullface": "down"} - } - }, - { - "from": [3, 8, 3], - "to": [4, 11, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [10.3, 11, 6.9], - "to": [11.3, 12, 6.9], - "rotation": {"angle": 45, "axis": "y", "origin": [3, 19, 14]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [3.4, 11, 3.4], - "to": [3.6, 11.2, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 19, 11]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [7.5, 8, 13], - "to": [8.5, 11, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 21]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [14.6, 11, 17.3], - "to": [15.6, 12, 17.3], - "rotation": {"angle": 45, "axis": "y", "origin": [7, 19, 24]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [7.9, 11, 13.4], - "to": [8.1, 11.2, 13.6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 19, 21]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 12], - "to": [13, 11, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 15.9], - "to": [20.3, 12, 15.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 23]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 12.4], - "to": [12.6, 11.2, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 20]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [13, 8, 7.5], - "to": [14, 11, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 16, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [20.6, 11, 11.6], - "to": [21.6, 12, 11.6], - "rotation": {"angle": 45, "axis": "y", "origin": [13, 19, 19]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [13.4, 11, 7.9], - "to": [13.6, 11.2, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 19, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 3], - "to": [13, 11, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 6.9], - "to": [20.3, 12, 6.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 14]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 3.4], - "to": [12.6, 11.2, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 11]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [7.5, 8, 2], - "to": [8.5, 11, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [14.6, 11, 6.3], - "to": [15.6, 12, 6.3], - "rotation": {"angle": 45, "axis": "y", "origin": [7, 19, 13]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [7.9, 11, 2.4], - "to": [8.1, 11.2, 2.6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 19, 10]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [3, 8, 12], - "to": [4, 11, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [10.3, 11, 15.9], - "to": [11.3, 12, 15.9], - "rotation": {"angle": 45, "axis": "y", "origin": [3, 19, 23]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [3.4, 11, 12.4], - "to": [3.6, 11.2, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 19, 20]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - } - ], - "groups": [0, - { - "name": "candles", - "origin": [8, 8, 8], - "children": [ - { - "name": "candle1", - "origin": [10, 16, 11], - "children": [1, 2, 3] - }, - { - "name": "candle3", - "origin": [10, 16, 11], - "children": [4, 5, 6] - }, - { - "name": "candle4", - "origin": [10, 16, 11], - "children": [7, 8, 9] - }, - { - "name": "candle5", - "origin": [10, 16, 11], - "children": [10, 11, 12] - }, - { - "name": "candle6", - "origin": [10, 16, 11], - "children": [13, 14, 15] - }, - { - "name": "candle7", - "origin": [10, 16, 11], - "children": [16, 17, 18] - }, - { - "name": "candle8", - "origin": [10, 16, 11], - "children": [19, 20, 21] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/birthday_cake_slice2.json b/src/main/resources/assets/dishes/models/block/birthday_cake_slice2.json deleted file mode 100644 index 9d63997..0000000 --- a/src/main/resources/assets/dishes/models/block/birthday_cake_slice2.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "credit": "made by Motschen", - "textures": { - "3": "block/red_concrete", - "4": "dishes:block/flame", - "5": "block/black_concrete", - "6": "block/cake_inner", - "bottom": "block/cake_bottom", - "top": "block/cake_top", - "particle": "block/cake_side", - "side": "block/cake_side" - }, - "elements": [ - { - "from": [5, 0, 1], - "to": [15, 8, 15], - "faces": { - "north": {"uv": [1, 8, 11, 16], "texture": "#side"}, - "east": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "south": {"uv": [5, 8, 15, 16], "texture": "#side"}, - "west": {"uv": [1, 8, 15, 16], "texture": "#6"}, - "up": {"uv": [5, 1, 15, 15], "texture": "#top"}, - "down": {"uv": [5, 1, 15, 15], "texture": "#bottom", "cullface": "down"} - } - }, - { - "from": [7.5, 8, 13], - "to": [8.5, 11, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 21]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [14.6, 11, 17.3], - "to": [15.6, 12, 17.3], - "rotation": {"angle": 45, "axis": "y", "origin": [7, 19, 24]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [7.9, 11, 13.4], - "to": [8.1, 11.2, 13.6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 19, 21]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 12], - "to": [13, 11, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 15.9], - "to": [20.3, 12, 15.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 23]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 12.4], - "to": [12.6, 11.2, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 20]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [13, 8, 7.5], - "to": [14, 11, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 16, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [20.6, 11, 11.6], - "to": [21.6, 12, 11.6], - "rotation": {"angle": 45, "axis": "y", "origin": [13, 19, 19]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [13.4, 11, 7.9], - "to": [13.6, 11.2, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 19, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 3], - "to": [13, 11, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 6.9], - "to": [20.3, 12, 6.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 14]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 3.4], - "to": [12.6, 11.2, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 11]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [7.5, 8, 2], - "to": [8.5, 11, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [14.6, 11, 6.3], - "to": [15.6, 12, 6.3], - "rotation": {"angle": 45, "axis": "y", "origin": [7, 19, 13]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [7.9, 11, 2.4], - "to": [8.1, 11.2, 2.6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 19, 10]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - } - ], - "groups": [0, - { - "name": "candles", - "origin": [8, 8, 8], - "children": [ - { - "name": "candle3", - "origin": [10, 16, 11], - "children": [1, 2, 3] - }, - { - "name": "candle4", - "origin": [10, 16, 11], - "children": [4, 5, 6] - }, - { - "name": "candle5", - "origin": [10, 16, 11], - "children": [7, 8, 9] - }, - { - "name": "candle6", - "origin": [10, 16, 11], - "children": [10, 11, 12] - }, - { - "name": "candle7", - "origin": [10, 16, 11], - "children": [13, 14, 15] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/birthday_cake_slice3.json b/src/main/resources/assets/dishes/models/block/birthday_cake_slice3.json deleted file mode 100644 index 726c2df..0000000 --- a/src/main/resources/assets/dishes/models/block/birthday_cake_slice3.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "credit": "made by Motschen", - "textures": { - "3": "block/red_concrete", - "4": "dishes:block/flame", - "5": "block/black_concrete", - "6": "block/cake_inner", - "bottom": "block/cake_bottom", - "top": "block/cake_top", - "particle": "block/cake_side", - "side": "block/cake_side" - }, - "elements": [ - { - "from": [7, 0, 1], - "to": [15, 8, 15], - "faces": { - "north": {"uv": [1, 8, 9, 16], "texture": "#side"}, - "east": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "south": {"uv": [7, 8, 15, 16], "texture": "#side"}, - "west": {"uv": [1, 8, 15, 16], "texture": "#6"}, - "up": {"uv": [7, 1, 15, 15], "texture": "#top"}, - "down": {"uv": [7, 1, 15, 15], "texture": "#bottom", "cullface": "down"} - } - }, - { - "from": [7.5, 8, 13], - "to": [8.5, 11, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 21]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [14.6, 11, 17.3], - "to": [15.6, 12, 17.3], - "rotation": {"angle": 45, "axis": "y", "origin": [7, 19, 24]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [7.9, 11, 13.4], - "to": [8.1, 11.2, 13.6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 19, 21]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 12], - "to": [13, 11, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 15.9], - "to": [20.3, 12, 15.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 23]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 12.4], - "to": [12.6, 11.2, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 20]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [13, 8, 7.5], - "to": [14, 11, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 16, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [20.6, 11, 11.6], - "to": [21.6, 12, 11.6], - "rotation": {"angle": 45, "axis": "y", "origin": [13, 19, 19]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [13.4, 11, 7.9], - "to": [13.6, 11.2, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 19, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 3], - "to": [13, 11, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 6.9], - "to": [20.3, 12, 6.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 14]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 3.4], - "to": [12.6, 11.2, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 11]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [7.5, 8, 2], - "to": [8.5, 11, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 10]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [14.6, 11, 6.3], - "to": [15.6, 12, 6.3], - "rotation": {"angle": 45, "axis": "y", "origin": [7, 19, 13]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [7.9, 11, 2.4], - "to": [8.1, 11.2, 2.6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 19, 10]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - } - ], - "groups": [0, - { - "name": "candles", - "origin": [8, 8, 8], - "children": [ - { - "name": "candle3", - "origin": [10, 16, 11], - "children": [1, 2, 3] - }, - { - "name": "candle4", - "origin": [10, 16, 11], - "children": [4, 5, 6] - }, - { - "name": "candle5", - "origin": [10, 16, 11], - "children": [7, 8, 9] - }, - { - "name": "candle6", - "origin": [10, 16, 11], - "children": [10, 11, 12] - }, - { - "name": "candle7", - "origin": [10, 16, 11], - "children": [13, 14, 15] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/birthday_cake_slice4.json b/src/main/resources/assets/dishes/models/block/birthday_cake_slice4.json deleted file mode 100644 index 636a06e..0000000 --- a/src/main/resources/assets/dishes/models/block/birthday_cake_slice4.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "credit": "made by Motschen", - "textures": { - "3": "block/red_concrete", - "4": "dishes:block/flame", - "5": "block/black_concrete", - "6": "block/cake_inner", - "bottom": "block/cake_bottom", - "top": "block/cake_top", - "particle": "block/cake_side", - "side": "block/cake_side" - }, - "elements": [ - { - "from": [9, 0, 1], - "to": [15, 8, 15], - "faces": { - "north": {"uv": [1, 8, 7, 16], "texture": "#side"}, - "east": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "south": {"uv": [9, 8, 15, 16], "texture": "#side"}, - "west": {"uv": [1, 8, 15, 16], "texture": "#6"}, - "up": {"uv": [9, 1, 15, 15], "texture": "#top"}, - "down": {"uv": [9, 1, 15, 15], "texture": "#bottom", "cullface": "down"} - } - }, - { - "from": [12, 8, 12], - "to": [13, 11, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 15.9], - "to": [20.3, 12, 15.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 23]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 12.4], - "to": [12.6, 11.2, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 20]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [13, 8, 7.5], - "to": [14, 11, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 16, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [20.6, 11, 11.6], - "to": [21.6, 12, 11.6], - "rotation": {"angle": 45, "axis": "y", "origin": [13, 19, 19]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [13.4, 11, 7.9], - "to": [13.6, 11.2, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 19, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 3], - "to": [13, 11, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 6.9], - "to": [20.3, 12, 6.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 14]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 3.4], - "to": [12.6, 11.2, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 11]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - } - ], - "groups": [0, - { - "name": "candles", - "origin": [8, 8, 8], - "children": [ - { - "name": "candle4", - "origin": [10, 16, 11], - "children": [1, 2, 3] - }, - { - "name": "candle5", - "origin": [10, 16, 11], - "children": [4, 5, 6] - }, - { - "name": "candle6", - "origin": [10, 16, 11], - "children": [7, 8, 9] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/birthday_cake_slice5.json b/src/main/resources/assets/dishes/models/block/birthday_cake_slice5.json deleted file mode 100644 index 4d562ea..0000000 --- a/src/main/resources/assets/dishes/models/block/birthday_cake_slice5.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "credit": "made by Motschen", - "textures": { - "3": "block/red_concrete", - "4": "dishes:block/flame", - "5": "block/black_concrete", - "6": "block/cake_inner", - "bottom": "block/cake_bottom", - "top": "block/cake_top", - "particle": "block/cake_side", - "side": "block/cake_side" - }, - "elements": [ - { - "from": [11, 0, 1], - "to": [15, 8, 15], - "faces": { - "north": {"uv": [1, 8, 5, 16], "texture": "#side"}, - "east": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "south": {"uv": [11, 8, 15, 16], "texture": "#side"}, - "west": {"uv": [1, 8, 15, 16], "texture": "#6"}, - "up": {"uv": [11, 1, 15, 15], "texture": "#top"}, - "down": {"uv": [11, 1, 15, 15], "texture": "#bottom", "cullface": "down"} - } - }, - { - "from": [12, 8, 12], - "to": [13, 11, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 20]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 15.9], - "to": [20.3, 12, 15.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 23]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 12.4], - "to": [12.6, 11.2, 12.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 20]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [13, 8, 7.5], - "to": [14, 11, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 16, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [20.6, 11, 11.6], - "to": [21.6, 12, 11.6], - "rotation": {"angle": 45, "axis": "y", "origin": [13, 19, 19]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [13.4, 11, 7.9], - "to": [13.6, 11.2, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 19, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - }, - { - "from": [12, 8, 3], - "to": [13, 11, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 16, 11]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [19.3, 11, 6.9], - "to": [20.3, 12, 6.9], - "rotation": {"angle": 45, "axis": "y", "origin": [12, 19, 14]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [12.4, 11, 3.4], - "to": [12.6, 11.2, 3.6], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 19, 11]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - } - ], - "groups": [0, - { - "name": "candles", - "origin": [8, 8, 8], - "children": [ - { - "name": "candle4", - "origin": [10, 16, 11], - "children": [1, 2, 3] - }, - { - "name": "candle5", - "origin": [10, 16, 11], - "children": [4, 5, 6] - }, - { - "name": "candle6", - "origin": [10, 16, 11], - "children": [7, 8, 9] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/birthday_cake_slice6.json b/src/main/resources/assets/dishes/models/block/birthday_cake_slice6.json deleted file mode 100644 index 607adb3..0000000 --- a/src/main/resources/assets/dishes/models/block/birthday_cake_slice6.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "made by Motschen", - "textures": { - "3": "block/red_concrete", - "4": "dishes:block/flame", - "5": "block/black_concrete", - "6": "block/cake_inner", - "bottom": "block/cake_bottom", - "top": "block/cake_top", - "particle": "block/cake_side", - "side": "block/cake_side" - }, - "elements": [ - { - "from": [13, 0, 1], - "to": [15, 8, 15], - "faces": { - "north": {"uv": [1, 8, 3, 16], "texture": "#side"}, - "east": {"uv": [1, 8, 15, 16], "texture": "#side"}, - "south": {"uv": [13, 8, 15, 16], "texture": "#side"}, - "west": {"uv": [1, 8, 15, 16], "texture": "#6"}, - "up": {"uv": [13, 1, 15, 15], "texture": "#top"}, - "down": {"uv": [13, 1, 15, 15], "texture": "#bottom", "cullface": "down"} - } - }, - { - "from": [13, 8, 7.5], - "to": [14, 11, 8.5], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 16, 15]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#3"} - } - }, - { - "from": [20.6, 11, 11.6], - "to": [21.6, 12, 11.6], - "rotation": {"angle": 45, "axis": "y", "origin": [13, 19, 19]}, - "faces": { - "north": {"uv": [0, 0, 15, 15], "texture": "#4"}, - "south": {"uv": [0, 0, 15, 15], "texture": "#4"} - } - }, - { - "from": [13.4, 11, 7.9], - "to": [13.6, 11.2, 8.1], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 19, 16]}, - "faces": { - "north": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "east": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "south": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "west": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"}, - "up": {"uv": [0, 0, 0.2, 0.2], "texture": "#5"} - } - } - ], - "groups": [0, - { - "name": "candles", - "origin": [8, 8, 8], - "children": [ - { - "name": "candle5", - "origin": [10, 16, 11], - "children": [1, 2, 3] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/borscht.json b/src/main/resources/assets/dishes/models/block/borscht.json new file mode 100644 index 0000000..4a64133 --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/borscht.json @@ -0,0 +1,503 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/quartz_block_side", + "4": "item/beetroot", + "7": "block/beetroots_stage3", + "8": "item/beetroot_soup", + "10": "item/milk_bucket", + "particle": "block/quartz_block_side" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 1, 12], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [3, 3, 11, 11], "texture": "#0"}, + "down": {"uv": [3, 3, 11, 11], "texture": "#0"} + } + }, + { + "from": [13, 3, 1], + "to": [15, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 1], + "to": [3, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 13], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [3, 2, 12], + "to": [4, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 3], + "to": [4, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 3], + "to": [13, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 12], + "to": [13, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 11], + "to": [12, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 11], + "to": [5, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 4], + "to": [5, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 4], + "to": [12, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [2, 3, 0], + "to": [14, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 7]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [2, 3, 14], + "to": [14, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 13], + "to": [13, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 2], + "to": [13, 3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [13, 3, 13], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [14, 3, 2], + "to": [16, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [0, 3, 2], + "to": [2, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [2, 2, 3], + "to": [3, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [13, 2, 3], + "to": [14, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [5, 2, 7.5], + "to": [8, 4, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 10, 13]}, + "faces": { + "north": {"uv": [7, 9, 10, 11], "texture": "#4"}, + "east": {"uv": [10, 8, 12, 10], "texture": "#4"}, + "south": {"uv": [6, 5, 9, 7], "texture": "#4"}, + "west": {"uv": [5, 10, 7, 12], "texture": "#4"}, + "up": {"uv": [7, 7, 10, 9], "texture": "#4"} + } + }, + { + "from": [11, 2, 1.5], + "to": [14, 4, 3.5], + "rotation": {"angle": 45, "axis": "y", "origin": [13, 10, 13]}, + "faces": { + "north": {"uv": [7, 9, 10, 11], "texture": "#4"}, + "east": {"uv": [10, 8, 12, 10], "texture": "#4"}, + "south": {"uv": [6, 5, 9, 7], "texture": "#4"}, + "west": {"uv": [5, 10, 7, 12], "texture": "#4"}, + "up": {"uv": [7, 7, 10, 9], "texture": "#4"} + } + }, + { + "from": [2, 2, 8.2], + "to": [5, 4, 10.2], + "rotation": {"angle": -45, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [1, 14, 4, 16], "texture": "#7"}, + "east": {"uv": [7, 12, 9, 14], "texture": "#7"}, + "south": {"uv": [7, 14, 10, 16], "texture": "#7"}, + "west": {"uv": [12, 14, 14, 16], "texture": "#7"}, + "up": {"uv": [6, 14, 9, 16], "texture": "#7"} + } + }, + { + "from": [4, 2, 10.2], + "to": [7, 3.5, 12.2], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [7, 4, 10, 5.5], "texture": "#10"}, + "east": {"uv": [4, 3, 6, 4.5], "texture": "#10"}, + "south": {"uv": [5, 3, 8, 4.5], "texture": "#10"}, + "west": {"uv": [7, 3, 9, 4.5], "texture": "#10"}, + "up": {"uv": [8, 3, 11, 5], "texture": "#10"} + } + }, + { + "from": [5, 3, 7.2], + "to": [8, 3.5, 9.2], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [4, 8, 7, 8.5], "texture": "#7"}, + "east": {"uv": [5, 6, 7, 6.5], "texture": "#7"}, + "south": {"uv": [9, 7, 12, 7.5], "texture": "#7"}, + "west": {"uv": [4, 7, 6, 8.5], "texture": "#7"}, + "up": {"uv": [4, 8, 7, 10], "texture": "#7"} + } + }, + { + "from": [5, 3.5, 11.45], + "to": [5.5, 3.75, 11.7], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"}, + "east": {"uv": [5, 6, 5.25, 6.25], "texture": "#7"}, + "south": {"uv": [9, 7, 9.5, 7.25], "texture": "#7"}, + "west": {"uv": [4, 7, 4.25, 7.25], "texture": "#7"}, + "up": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"} + } + }, + { + "from": [9.5, 3.5, 9.7], + "to": [10, 3.75, 9.95], + "rotation": {"angle": 22.5, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"}, + "east": {"uv": [5, 6, 5.25, 6.25], "texture": "#7"}, + "south": {"uv": [9, 7, 9.5, 7.25], "texture": "#7"}, + "west": {"uv": [4, 7, 4.25, 7.25], "texture": "#7"}, + "up": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"} + } + }, + { + "from": [6, 3.5, 10.7], + "to": [6.5, 3.75, 10.95], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"}, + "east": {"uv": [5, 6, 5.25, 6.25], "texture": "#7"}, + "south": {"uv": [9, 7, 9.5, 7.25], "texture": "#7"}, + "west": {"uv": [4, 7, 4.25, 7.25], "texture": "#7"}, + "up": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"} + } + }, + { + "from": [4.25, 3.5, 12.7], + "to": [4.75, 3.75, 12.95], + "rotation": {"angle": -45, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"}, + "east": {"uv": [5, 6, 5.25, 6.25], "texture": "#7"}, + "south": {"uv": [9, 7, 9.5, 7.25], "texture": "#7"}, + "west": {"uv": [4, 7, 4.25, 7.25], "texture": "#7"}, + "up": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"} + } + }, + { + "from": [0.75, 4, 12.2], + "to": [1.75, 4.2, 12.7], + "rotation": {"angle": -45, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [4, 8, 5, 8.2], "texture": "#7"}, + "east": {"uv": [5, 6, 5.5, 6.2], "texture": "#7"}, + "south": {"uv": [9, 7, 10, 7.2], "texture": "#7"}, + "west": {"uv": [4, 7, 4.5, 7.2], "texture": "#7"}, + "up": {"uv": [4, 8, 5, 8.5], "texture": "#7"} + } + }, + { + "from": [1, 3.75, 8.2], + "to": [3, 4.25, 10.2], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 10, 16]}, + "faces": { + "north": {"uv": [3, 9, 5, 9.5], "texture": "#7"}, + "east": {"uv": [6, 8, 8, 8.5], "texture": "#7"}, + "south": {"uv": [10, 6, 12, 6.5], "texture": "#7"}, + "west": {"uv": [0, 8, 2, 9.5], "texture": "#7"}, + "up": {"uv": [14, 8, 16, 10], "texture": "#7"} + } + }, + { + "from": [4, 1, 4], + "to": [12, 1.2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 15]}, + "faces": { + "up": {"uv": [5, 6, 11, 9], "texture": "#8"} + } + }, + { + "from": [3, 2.5, 3], + "to": [13, 2.7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 15]}, + "faces": { + "up": {"uv": [5, 6, 11, 9], "texture": "#8"} + } + }, + { + "from": [2, 3, 2], + "to": [14, 3.2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 15]}, + "faces": { + "up": {"uv": [5, 6, 11, 9], "texture": "#8"} + } + } + ], + "groups": [ + { + "name": "plate", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] + }, + { + "name": "beetroot", + "origin": [8, 8, 8], + "color": 0, + "children": [25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35] + }, + 36, + 37, + 38 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/borscht1.json b/src/main/resources/assets/dishes/models/block/borscht1.json new file mode 100644 index 0000000..dbaf521 --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/borscht1.json @@ -0,0 +1,458 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/quartz_block_side", + "4": "item/beetroot", + "7": "block/beetroots_stage3", + "8": "item/beetroot_soup", + "10": "item/milk_bucket", + "particle": "block/quartz_block_side" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 1, 12], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [3, 3, 11, 11], "texture": "#0"}, + "down": {"uv": [3, 3, 11, 11], "texture": "#0"} + } + }, + { + "from": [13, 3, 1], + "to": [15, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 1], + "to": [3, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 13], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [3, 2, 12], + "to": [4, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 3], + "to": [4, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 3], + "to": [13, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 12], + "to": [13, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 11], + "to": [12, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 11], + "to": [5, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 4], + "to": [5, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 4], + "to": [12, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [2, 3, 0], + "to": [14, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 7]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [2, 3, 14], + "to": [14, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 13], + "to": [13, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 2], + "to": [13, 3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [13, 3, 13], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [14, 3, 2], + "to": [16, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [0, 3, 2], + "to": [2, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [2, 2, 3], + "to": [3, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [13, 2, 3], + "to": [14, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [5, 1.75, 7.5], + "to": [8, 3.75, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 9.75, 13]}, + "faces": { + "north": {"uv": [7, 9, 10, 11], "texture": "#4"}, + "east": {"uv": [10, 8, 12, 10], "texture": "#4"}, + "south": {"uv": [6, 5, 9, 7], "texture": "#4"}, + "west": {"uv": [5, 10, 7, 12], "texture": "#4"}, + "up": {"uv": [7, 7, 10, 9], "texture": "#4"} + } + }, + { + "from": [2, 1.75, 8.2], + "to": [5, 3.75, 10.2], + "rotation": {"angle": -45, "axis": "y", "origin": [9, 9.75, 16]}, + "faces": { + "north": {"uv": [1, 14, 4, 16], "texture": "#7"}, + "east": {"uv": [7, 12, 9, 14], "texture": "#7"}, + "south": {"uv": [7, 14, 10, 16], "texture": "#7"}, + "west": {"uv": [12, 14, 14, 16], "texture": "#7"}, + "up": {"uv": [6, 14, 9, 16], "texture": "#7"} + } + }, + { + "from": [4, 1.75, 10.2], + "to": [6.5, 3.25, 11.7], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 9.75, 16]}, + "faces": { + "north": {"uv": [7, 4, 10, 5.5], "texture": "#10"}, + "east": {"uv": [4, 3, 6, 4.5], "texture": "#10"}, + "south": {"uv": [5, 3, 8, 4.5], "texture": "#10"}, + "west": {"uv": [7, 3, 9, 4.5], "texture": "#10"}, + "up": {"uv": [8, 3, 11, 5], "texture": "#10"} + } + }, + { + "from": [5, 2.75, 7.2], + "to": [8, 3.25, 9.2], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 9.75, 16]}, + "faces": { + "north": {"uv": [4, 8, 7, 8.5], "texture": "#7"}, + "east": {"uv": [5, 6, 7, 6.5], "texture": "#7"}, + "south": {"uv": [9, 7, 12, 7.5], "texture": "#7"}, + "west": {"uv": [4, 7, 6, 8.5], "texture": "#7"}, + "up": {"uv": [4, 8, 7, 10], "texture": "#7"} + } + }, + { + "from": [5, 3.25, 11.45], + "to": [5.5, 3.5, 11.7], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 9.75, 16]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"}, + "east": {"uv": [5, 6, 5.25, 6.25], "texture": "#7"}, + "south": {"uv": [9, 7, 9.5, 7.25], "texture": "#7"}, + "west": {"uv": [4, 7, 4.25, 7.25], "texture": "#7"}, + "up": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"} + } + }, + { + "from": [9.5, 3.25, 9.7], + "to": [10, 3.5, 9.95], + "rotation": {"angle": 22.5, "axis": "y", "origin": [9, 9.75, 16]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"}, + "east": {"uv": [5, 6, 5.25, 6.25], "texture": "#7"}, + "south": {"uv": [9, 7, 9.5, 7.25], "texture": "#7"}, + "west": {"uv": [4, 7, 4.25, 7.25], "texture": "#7"}, + "up": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"} + } + }, + { + "from": [6, 3.25, 10.7], + "to": [6.5, 3.5, 10.95], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 9.75, 16]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"}, + "east": {"uv": [5, 6, 5.25, 6.25], "texture": "#7"}, + "south": {"uv": [9, 7, 9.5, 7.25], "texture": "#7"}, + "west": {"uv": [4, 7, 4.25, 7.25], "texture": "#7"}, + "up": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"} + } + }, + { + "from": [4.25, 3.25, 12.7], + "to": [4.75, 3.5, 12.95], + "rotation": {"angle": -45, "axis": "y", "origin": [9, 9.75, 16]}, + "faces": { + "north": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"}, + "east": {"uv": [5, 6, 5.25, 6.25], "texture": "#7"}, + "south": {"uv": [9, 7, 9.5, 7.25], "texture": "#7"}, + "west": {"uv": [4, 7, 4.25, 7.25], "texture": "#7"}, + "up": {"uv": [4, 8, 4.5, 8.25], "texture": "#7"} + } + }, + { + "from": [4, 1, 4], + "to": [12, 1.2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 15]}, + "faces": { + "up": {"uv": [5, 6, 11, 9], "texture": "#8"} + } + }, + { + "from": [3, 2.5, 3], + "to": [13, 2.7, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 15]}, + "faces": { + "up": {"uv": [5, 6, 11, 9], "texture": "#8"} + } + } + ], + "groups": [ + { + "name": "plate", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] + }, + { + "name": "beetroot", + "origin": [8, 8, 8], + "color": 0, + "children": [25, 26, 27, 28, 29, 30, 31, 32] + }, + 33, + 34 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/borscht2.json b/src/main/resources/assets/dishes/models/block/borscht2.json new file mode 100644 index 0000000..a0fe662 --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/borscht2.json @@ -0,0 +1,384 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/quartz_block_side", + "7": "block/beetroots_stage3", + "8": "item/beetroot_soup", + "particle": "block/quartz_block_side" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 1, 12], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [3, 3, 11, 11], "texture": "#0"}, + "down": {"uv": [3, 3, 11, 11], "texture": "#0"} + } + }, + { + "from": [13, 3, 1], + "to": [15, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 1], + "to": [3, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 13], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [3, 2, 12], + "to": [4, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 3], + "to": [4, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 3], + "to": [13, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 12], + "to": [13, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 11], + "to": [12, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 11], + "to": [5, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 4], + "to": [5, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 4], + "to": [12, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [2, 3, 0], + "to": [14, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 7]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [2, 3, 14], + "to": [14, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 13], + "to": [13, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 2], + "to": [13, 3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [13, 3, 13], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [14, 3, 2], + "to": [16, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [0, 3, 2], + "to": [2, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [2, 2, 3], + "to": [3, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [13, 2, 3], + "to": [14, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [2, 1, 8.2], + "to": [5, 3, 10.2], + "rotation": {"angle": -45, "axis": "y", "origin": [9, 9, 16]}, + "faces": { + "north": {"uv": [1, 14, 4, 16], "texture": "#7"}, + "east": {"uv": [7, 12, 9, 14], "texture": "#7"}, + "south": {"uv": [7, 14, 10, 16], "texture": "#7"}, + "west": {"uv": [12, 14, 14, 16], "texture": "#7"}, + "up": {"uv": [6, 14, 9, 16], "texture": "#7"} + } + }, + { + "from": [5, 2, 7.2], + "to": [8, 2.5, 9.2], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 9, 16]}, + "faces": { + "north": {"uv": [4, 8, 7, 8.5], "texture": "#7"}, + "east": {"uv": [5, 6, 7, 6.5], "texture": "#7"}, + "south": {"uv": [9, 7, 12, 7.5], "texture": "#7"}, + "west": {"uv": [4, 7, 6, 8.5], "texture": "#7"}, + "up": {"uv": [4, 8, 7, 10], "texture": "#7"} + } + }, + { + "from": [4, 1, 4], + "to": [12, 1.2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 15]}, + "faces": { + "up": {"uv": [5, 6, 11, 9], "texture": "#8"} + } + }, + { + "from": [3, 2, 3], + "to": [13, 2.2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 15]}, + "faces": { + "up": {"uv": [5, 6, 11, 9], "texture": "#8"} + } + } + ], + "groups": [ + { + "name": "plate", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] + }, + { + "name": "beetroot", + "origin": [8, 8, 8], + "color": 0, + "children": [25, 26] + }, + 27, + 28 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/borscht3.json b/src/main/resources/assets/dishes/models/block/borscht3.json new file mode 100644 index 0000000..f7d2133 --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/borscht3.json @@ -0,0 +1,363 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/quartz_block_side", + "7": "block/beetroots_stage3", + "8": "item/beetroot_soup", + "particle": "block/quartz_block_side" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 1, 12], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [3, 3, 11, 11], "texture": "#0"}, + "down": {"uv": [3, 3, 11, 11], "texture": "#0"} + } + }, + { + "from": [13, 3, 1], + "to": [15, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 1], + "to": [3, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 13], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [3, 2, 12], + "to": [4, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 3], + "to": [4, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 3], + "to": [13, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 12], + "to": [13, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 11], + "to": [12, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 11], + "to": [5, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 4], + "to": [5, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 4], + "to": [12, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [2, 3, 0], + "to": [14, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 7]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [2, 3, 14], + "to": [14, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 13], + "to": [13, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 2], + "to": [13, 3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [13, 3, 13], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [14, 3, 2], + "to": [16, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [0, 3, 2], + "to": [2, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [2, 2, 3], + "to": [3, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [13, 2, 3], + "to": [14, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [4, 1, 10.2], + "to": [6, 1.5, 11.2], + "rotation": {"angle": -22.5, "axis": "y", "origin": [9, 9, 16]}, + "faces": { + "north": {"uv": [4, 8, 7, 8.5], "texture": "#7"}, + "east": {"uv": [5, 6, 7, 6.5], "texture": "#7"}, + "south": {"uv": [9, 7, 12, 7.5], "texture": "#7"}, + "west": {"uv": [4, 7, 6, 8.5], "texture": "#7"}, + "up": {"uv": [4, 8, 7, 10], "texture": "#7"} + } + }, + { + "from": [4, 1, 4], + "to": [12, 1.2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 9, 15]}, + "faces": { + "up": {"uv": [5, 6, 11, 9], "texture": "#8"} + } + } + ], + "groups": [ + { + "name": "plate", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] + }, + { + "name": "beetroot", + "origin": [8, 8, 8], + "color": 0, + "children": [25] + }, + 26 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/bowl.json b/src/main/resources/assets/dishes/models/block/bowl.json new file mode 100644 index 0000000..0d63c3b --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/bowl.json @@ -0,0 +1,334 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/quartz_block_side", + "particle": "block/quartz_block_side" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 1, 12], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [3, 3, 11, 11], "texture": "#0"}, + "down": {"uv": [3, 3, 11, 11], "texture": "#0"} + } + }, + { + "from": [13, 3, 1], + "to": [15, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 1], + "to": [3, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [1, 3, 13], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [3, 2, 12], + "to": [4, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 3], + "to": [4, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 3], + "to": [13, 3, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [12, 2, 12], + "to": [13, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 11], + "to": [12, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 11], + "to": [5, 2, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 4], + "to": [5, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [11, 1, 4], + "to": [12, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#0"} + } + }, + { + "from": [2, 3, 0], + "to": [14, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 7]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [2, 3, 14], + "to": [14, 4, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 2], "texture": "#0"} + } + }, + { + "from": [4, 1, 12], + "to": [12, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 13], + "to": [13, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [3, 2, 2], + "to": [13, 3, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 1], "texture": "#0"} + } + }, + { + "from": [4, 1, 3], + "to": [12, 2, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#0"} + } + }, + { + "from": [13, 3, 13], + "to": [15, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 9, 20]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#0"} + } + }, + { + "from": [14, 3, 2], + "to": [16, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [21, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [0, 3, 2], + "to": [2, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 12], "texture": "#0"} + } + }, + { + "from": [3, 1, 3], + "to": [4, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [2, 2, 3], + "to": [3, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [13, 2, 3], + "to": [14, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + }, + { + "from": [12, 1, 3], + "to": [13, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 10], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "plate", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/lettuce_stage2.json b/src/main/resources/assets/dishes/models/block/lettuce_stage2.json index 958b116..00379d1 100644 --- a/src/main/resources/assets/dishes/models/block/lettuce_stage2.json +++ b/src/main/resources/assets/dishes/models/block/lettuce_stage2.json @@ -1,5 +1,5 @@ { - "credit": "made by Motschen", + "credit": "Made with Blockbench", "textures": { "0": "dishes:block/lettuce_stage2", "particle": "dishes:block/lettuce_stage2" @@ -40,6 +40,17 @@ "north": {"uv": [0, 1, 16, 16], "texture": "#0"}, "south": {"uv": [0, 1, 16, 16], "texture": "#0"} } + }, + { + "from": [6, 0, 6], + "to": [10, 1, 10], + "faces": { + "north": {"uv": [6, 13, 10, 15], "texture": "#0"}, + "east": {"uv": [6, 13, 10, 15], "texture": "#0"}, + "south": {"uv": [6, 13, 10, 15], "texture": "#0"}, + "west": {"uv": [6, 13, 10, 15], "texture": "#0"}, + "up": {"uv": [6, 8, 10, 12], "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/lettuce_stage3.json b/src/main/resources/assets/dishes/models/block/lettuce_stage3.json index c47fa22..fdc8504 100644 --- a/src/main/resources/assets/dishes/models/block/lettuce_stage3.json +++ b/src/main/resources/assets/dishes/models/block/lettuce_stage3.json @@ -1,5 +1,5 @@ { - "credit": "made by Motschen", + "credit": "Made with Blockbench", "textures": { "0": "dishes:block/lettuce_stage3", "particle": "dishes:block/lettuce_stage3" @@ -40,6 +40,17 @@ "north": {"uv": [0, 1, 16, 16], "texture": "#0"}, "south": {"uv": [0, 1, 16, 16], "texture": "#0"} } + }, + { + "from": [5, 0, 5], + "to": [11, 5, 11], + "faces": { + "north": {"uv": [5, 10, 11, 15], "texture": "#0"}, + "east": {"uv": [5, 8, 10, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 10, 11, 15], "rotation": 180, "texture": "#0"}, + "west": {"uv": [6, 6, 11, 12], "rotation": 270, "texture": "#0"}, + "up": {"uv": [5, 6, 11, 12], "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/dishes/models/block/pizzamargherita.json b/src/main/resources/assets/dishes/models/block/pizzamargherita.json new file mode 100644 index 0000000..6c050ab --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/pizzamargherita.json @@ -0,0 +1,6 @@ +{ + "parent": "dishes:block/pizzasalami", + "textures": { + "1": "dishes:block/pizza_margherita" + } +} diff --git a/src/main/resources/assets/dishes/models/block/pizzamargherita1.json b/src/main/resources/assets/dishes/models/block/pizzamargherita1.json new file mode 100644 index 0000000..6ffdf68 --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/pizzamargherita1.json @@ -0,0 +1,6 @@ +{ + "parent": "dishes:block/pizzasalami1", + "textures": { + "1": "dishes:block/pizza_margherita" + } +} diff --git a/src/main/resources/assets/dishes/models/block/pizzamargherita2.json b/src/main/resources/assets/dishes/models/block/pizzamargherita2.json new file mode 100644 index 0000000..f9765f2 --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/pizzamargherita2.json @@ -0,0 +1,6 @@ +{ + "parent": "dishes:block/pizzasalami2", + "textures": { + "1": "dishes:block/pizza_margherita" + } +} diff --git a/src/main/resources/assets/dishes/models/block/pizzamargherita3.json b/src/main/resources/assets/dishes/models/block/pizzamargherita3.json new file mode 100644 index 0000000..8420784 --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/pizzamargherita3.json @@ -0,0 +1,6 @@ +{ + "parent": "dishes:block/pizzasalami3", + "textures": { + "1": "dishes:block/pizza_margherita" + } +} diff --git a/src/main/resources/assets/dishes/models/block/pizzamargherita4.json b/src/main/resources/assets/dishes/models/block/pizzamargherita4.json new file mode 100644 index 0000000..9dcdaf3 --- /dev/null +++ b/src/main/resources/assets/dishes/models/block/pizzamargherita4.json @@ -0,0 +1,6 @@ +{ + "parent": "dishes:block/pizzasalami4", + "textures": { + "1": "dishes:block/pizza_margherita" + } +} diff --git a/src/main/resources/assets/dishes/models/item/birthday_cake.json b/src/main/resources/assets/dishes/models/item/birthday_cake.json deleted file mode 100644 index 7d5089e..0000000 --- a/src/main/resources/assets/dishes/models/item/birthday_cake.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "dishes:block/birthday_cake" -} diff --git a/src/main/resources/assets/dishes/models/item/borscht.json b/src/main/resources/assets/dishes/models/item/borscht.json new file mode 100644 index 0000000..e2a1e7d --- /dev/null +++ b/src/main/resources/assets/dishes/models/item/borscht.json @@ -0,0 +1,3 @@ +{ + "parent": "dishes:block/borscht" +} diff --git a/src/main/resources/assets/dishes/models/item/bowl.json b/src/main/resources/assets/dishes/models/item/bowl.json new file mode 100644 index 0000000..9305422 --- /dev/null +++ b/src/main/resources/assets/dishes/models/item/bowl.json @@ -0,0 +1,3 @@ +{ + "parent": "dishes:block/bowl" +} diff --git a/src/main/resources/assets/dishes/models/item/flag_america.json b/src/main/resources/assets/dishes/models/item/flag_uk.json similarity index 56% rename from src/main/resources/assets/dishes/models/item/flag_america.json rename to src/main/resources/assets/dishes/models/item/flag_uk.json index de42a88..eb11ed2 100644 --- a/src/main/resources/assets/dishes/models/item/flag_america.json +++ b/src/main/resources/assets/dishes/models/item/flag_uk.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "dishes:item/flags/america" + "layer0": "dishes:item/flags/uk" } } diff --git a/src/main/resources/assets/dishes/models/item/flag_britain.json b/src/main/resources/assets/dishes/models/item/flag_ukraine.json similarity index 56% rename from src/main/resources/assets/dishes/models/item/flag_britain.json rename to src/main/resources/assets/dishes/models/item/flag_ukraine.json index 3ca511e..5d4f6c0 100644 --- a/src/main/resources/assets/dishes/models/item/flag_britain.json +++ b/src/main/resources/assets/dishes/models/item/flag_ukraine.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "dishes:item/flags/britain" + "layer0": "dishes:item/flags/ukraine" } } diff --git a/src/main/resources/assets/dishes/models/item/flag_usa.json b/src/main/resources/assets/dishes/models/item/flag_usa.json new file mode 100644 index 0000000..6c449e4 --- /dev/null +++ b/src/main/resources/assets/dishes/models/item/flag_usa.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "dishes:item/flags/usa" + } +} diff --git a/src/main/resources/assets/dishes/models/item/ice_cream_glowberry.json b/src/main/resources/assets/dishes/models/item/ice_cream_glowberry.json new file mode 100644 index 0000000..2355ef6 --- /dev/null +++ b/src/main/resources/assets/dishes/models/item/ice_cream_glowberry.json @@ -0,0 +1,7 @@ +{ + "credit": "made by Motschen", + "parent": "dishes:item/ice_cream_vanilla", + "textures": { + "1": "dishes:item/ice_cream_glowberry" + } +} diff --git a/src/main/resources/assets/dishes/models/item/ice_cream_vanilla.json b/src/main/resources/assets/dishes/models/item/ice_cream_vanilla.json index 9386ace..5724d4d 100644 --- a/src/main/resources/assets/dishes/models/item/ice_cream_vanilla.json +++ b/src/main/resources/assets/dishes/models/item/ice_cream_vanilla.json @@ -1,5 +1,5 @@ { - "credit": "made by Motschen", + "credit": "Made with Blockbench", "parent": "block/block", "textures": { "0": "dishes:item/ice_cream_waffle", @@ -128,7 +128,6 @@ "east": {"uv": [0, 0, 7.5, 3], "texture": "#0"}, "south": {"uv": [0, 0, 7.5, 3], "texture": "#0"}, "west": {"uv": [0, 0, 7.5, 3], "texture": "#0"}, - "up": {"uv": [0.5, 0.5, 7, 7], "texture": "#0"}, "down": {"uv": [0.5, 0.5, 7, 7], "texture": "#0"} } }, @@ -215,12 +214,11 @@ "to": [8.5, 18, 8.5], "rotation": {"angle": 0, "axis": "y", "origin": [13, 23, 13]}, "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { @@ -228,12 +226,11 @@ "to": [11.5, 18.5, 10], "rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 15]}, "faces": { - "north": {"uv": [0, 0, 4, 4.5], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 4.5], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 4.5], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 4.5], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { @@ -241,12 +238,7 @@ "to": [11.5, 14, 11], "rotation": {"angle": 0, "axis": "y", "origin": [16, 22, 15]}, "faces": { - "north": {"uv": [0, 0, 7, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 7, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 6, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 7, 6], "texture": "#1"}, - "down": {"uv": [0, 0, 7, 6], "texture": "#1"} + "up": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { @@ -254,12 +246,11 @@ "to": [10.7, 17.5, 8.4], "rotation": {"angle": 22.5, "axis": "y", "origin": [15, 23, 13]}, "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"} } } ], @@ -278,4 +269,4 @@ "translation": [0, -0.75, 0] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/dishes/models/item/pizzamargherita.json b/src/main/resources/assets/dishes/models/item/pizzamargherita.json new file mode 100644 index 0000000..27d3da1 --- /dev/null +++ b/src/main/resources/assets/dishes/models/item/pizzamargherita.json @@ -0,0 +1,3 @@ +{ + "parent": "dishes:block/pizzamargherita" +} diff --git a/src/main/resources/assets/dishes/textures/block/flame.png b/src/main/resources/assets/dishes/textures/block/flame.png deleted file mode 100644 index d912be3..0000000 Binary files a/src/main/resources/assets/dishes/textures/block/flame.png and /dev/null differ diff --git a/src/main/resources/assets/dishes/textures/block/pizza_cheese.png b/src/main/resources/assets/dishes/textures/block/pizza_cheese.png new file mode 100644 index 0000000..b875a42 Binary files /dev/null and b/src/main/resources/assets/dishes/textures/block/pizza_cheese.png differ diff --git a/src/main/resources/assets/dishes/textures/block/pizza_margherita.png b/src/main/resources/assets/dishes/textures/block/pizza_margherita.png new file mode 100644 index 0000000..1aa641e Binary files /dev/null and b/src/main/resources/assets/dishes/textures/block/pizza_margherita.png differ diff --git a/src/main/resources/assets/dishes/textures/block/pizza_top.png b/src/main/resources/assets/dishes/textures/block/pizza_top.png index 4a8f867..bdb07fa 100644 Binary files a/src/main/resources/assets/dishes/textures/block/pizza_top.png and b/src/main/resources/assets/dishes/textures/block/pizza_top.png differ diff --git a/src/main/resources/assets/dishes/textures/block/tomato_stage1.png b/src/main/resources/assets/dishes/textures/block/tomato_stage1.png index cf43916..963ca08 100644 Binary files a/src/main/resources/assets/dishes/textures/block/tomato_stage1.png and b/src/main/resources/assets/dishes/textures/block/tomato_stage1.png differ diff --git a/src/main/resources/assets/dishes/textures/block/tomato_stage2.png b/src/main/resources/assets/dishes/textures/block/tomato_stage2.png index 4954d07..b20313a 100644 Binary files a/src/main/resources/assets/dishes/textures/block/tomato_stage2.png and b/src/main/resources/assets/dishes/textures/block/tomato_stage2.png differ diff --git a/src/main/resources/assets/dishes/textures/block/tomato_stage3.png b/src/main/resources/assets/dishes/textures/block/tomato_stage3.png index 493bbb6..7b0d321 100644 Binary files a/src/main/resources/assets/dishes/textures/block/tomato_stage3.png and b/src/main/resources/assets/dishes/textures/block/tomato_stage3.png differ diff --git a/src/main/resources/assets/dishes/textures/entity/ice_cream_seller.pdn b/src/main/resources/assets/dishes/textures/entity/ice_cream_seller.pdn deleted file mode 100644 index 846ae80..0000000 Binary files a/src/main/resources/assets/dishes/textures/entity/ice_cream_seller.pdn and /dev/null differ diff --git a/src/main/resources/assets/dishes/textures/item/flags/america.png b/src/main/resources/assets/dishes/textures/item/flags/america.png deleted file mode 100644 index b5bcf67..0000000 Binary files a/src/main/resources/assets/dishes/textures/item/flags/america.png and /dev/null differ diff --git a/src/main/resources/assets/dishes/textures/item/flags/britain.png b/src/main/resources/assets/dishes/textures/item/flags/britain.png deleted file mode 100644 index 09b4bdd..0000000 Binary files a/src/main/resources/assets/dishes/textures/item/flags/britain.png and /dev/null differ diff --git a/src/main/resources/assets/dishes/textures/item/flags/germany.png b/src/main/resources/assets/dishes/textures/item/flags/germany.png index 985085b..48c74fb 100644 Binary files a/src/main/resources/assets/dishes/textures/item/flags/germany.png and b/src/main/resources/assets/dishes/textures/item/flags/germany.png differ diff --git a/src/main/resources/assets/dishes/textures/item/flags/italy.png b/src/main/resources/assets/dishes/textures/item/flags/italy.png index 5699172..ecb11b0 100644 Binary files a/src/main/resources/assets/dishes/textures/item/flags/italy.png and b/src/main/resources/assets/dishes/textures/item/flags/italy.png differ diff --git a/src/main/resources/assets/dishes/textures/item/flags/uk.png b/src/main/resources/assets/dishes/textures/item/flags/uk.png new file mode 100644 index 0000000..aee7e5a Binary files /dev/null and b/src/main/resources/assets/dishes/textures/item/flags/uk.png differ diff --git a/src/main/resources/assets/dishes/textures/item/flags/ukraine.png b/src/main/resources/assets/dishes/textures/item/flags/ukraine.png new file mode 100644 index 0000000..02384d7 Binary files /dev/null and b/src/main/resources/assets/dishes/textures/item/flags/ukraine.png differ diff --git a/src/main/resources/assets/dishes/textures/item/flags/usa.png b/src/main/resources/assets/dishes/textures/item/flags/usa.png new file mode 100644 index 0000000..09ce4ab Binary files /dev/null and b/src/main/resources/assets/dishes/textures/item/flags/usa.png differ diff --git a/src/main/resources/assets/dishes/textures/item/ice_cream_glowberry.png b/src/main/resources/assets/dishes/textures/item/ice_cream_glowberry.png new file mode 100644 index 0000000..7eb94c5 Binary files /dev/null and b/src/main/resources/assets/dishes/textures/item/ice_cream_glowberry.png differ diff --git a/src/main/resources/assets/dishes/textures/item/ice_cream_glowberry_e.png b/src/main/resources/assets/dishes/textures/item/ice_cream_glowberry_e.png new file mode 100644 index 0000000..7eb94c5 Binary files /dev/null and b/src/main/resources/assets/dishes/textures/item/ice_cream_glowberry_e.png differ diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/american.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/american.json index abb90bd..23c9334 100644 --- a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/american.json +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/american.json @@ -1,5 +1,5 @@ { "name": "Amerikanische Gerichte", "description": "Essen aus den USA", - "icon": "dishes:flag_america" -} \ No newline at end of file + "icon": "dishes:flag_usa" +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/british.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/british.json index 2434292..39ad0a6 100644 --- a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/british.json +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/british.json @@ -1,5 +1,5 @@ { "name": "Britische Gerichte", "description": "Essen aus dem Vereinigten Königreich", - "icon": "dishes:flag_britain" -} \ No newline at end of file + "icon": "dishes:flag_uk" +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/ukrainian.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/ukrainian.json new file mode 100644 index 0000000..5aa3231 --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/categories/ukrainian.json @@ -0,0 +1,5 @@ +{ + "name": "Ukrainische Gerichte", + "description": "Essen aus der Ukraine", + "icon": "dishes:flag_ukraine" +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/birthday_cake.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/birthday_cake.json deleted file mode 100644 index f063380..0000000 --- a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/birthday_cake.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Geburtstagskuchen", - "icon": "dishes:birthday_cake", - "category": "dishes:sweets", - "pages": [ - { - "type": "spotlight", - "item": "dishes:birthday_cake", - "title": "Geburtstagskuchen", - "link_recipe": false, - "text": "Happy Birthday!" - }, - { - "type": "crafting", - "recipe": "dishes:birthday_cake" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/borscht.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/borscht.json new file mode 100644 index 0000000..8b2cc16 --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/borscht.json @@ -0,0 +1,18 @@ +{ + "name": "Borschtsch", + "icon": "dishes:borscht", + "category": "dishes:ukrainian", + "pages": [ + { + "type": "spotlight", + "item": "dishes:borscht", + "title": "Borschtsch", + "link_recipe": false, + "text": "Traditionelle ukrainische Rote-Beete-Suppe, die meist mit Sour Cream serviert wird." + }, + { + "type": "crafting", + "recipe": "dishes:borscht" + } + ] +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/bowl.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/bowl.json new file mode 100644 index 0000000..4525f92 --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/bowl.json @@ -0,0 +1,18 @@ +{ + "name": "Schüssel", + "icon": "dishes:bowl", + "category": "dishes:general", + "pages": [ + { + "type": "spotlight", + "item": "dishes:bowl", + "title": "Schüssel", + "link_recipe": false, + "text": "Eine Schüssel." + }, + { + "type": "crafting", + "recipe": "dishes:bowl" + } + ] +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/ice_cream_glowberry.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/ice_cream_glowberry.json new file mode 100644 index 0000000..0be0f26 --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/ice_cream_glowberry.json @@ -0,0 +1,14 @@ +{ + "name": "Süßbeereis", + "icon": "dishes:ice_cream_sweetberry", + "category": "dishes:sweets", + "pages": [ + { + "type": "spotlight", + "item": "dishes:ice_cream_sweetberry", + "title": "Süßbeereis", + "link_recipe": false, + "text": "Wer mag Eiscreme bitte nicht? Erhältlich beim Eiscreme-Händler." + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/ice_cream_sweetberry.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/ice_cream_sweetberry.json index 0be0f26..25d4784 100644 --- a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/ice_cream_sweetberry.json +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/ice_cream_sweetberry.json @@ -1,14 +1,14 @@ { - "name": "Süßbeereis", - "icon": "dishes:ice_cream_sweetberry", + "name": "Leuchtbeereis", + "icon": "dishes:ice_cream_glowberry", "category": "dishes:sweets", "pages": [ { "type": "spotlight", - "item": "dishes:ice_cream_sweetberry", - "title": "Süßbeereis", + "item": "dishes:ice_cream_glowberry", + "title": "Leuchtbeereis", "link_recipe": false, "text": "Wer mag Eiscreme bitte nicht? Erhältlich beim Eiscreme-Händler." } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/pizzamargherita.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/pizzamargherita.json new file mode 100644 index 0000000..710b03c --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/de_de/entries/cooking_guide/pizzamargherita.json @@ -0,0 +1,18 @@ +{ + "name": "Pizza Margherita", + "icon": "dishes:pizzamargherita", + "category": "dishes:italian", + "pages": [ + { + "type": "spotlight", + "item": "dishes:pizzamargherita", + "title": "Pizza Margherita", + "link_recipe": false, + "text": "Benannt nach Margherita von Savoy (Königin Italiens von 1878 bis 1900)" + }, + { + "type": "crafting", + "recipe": "dishes:pizzamargherita" + } + ] +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/american.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/american.json index 04009d2..b150502 100644 --- a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/american.json +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/american.json @@ -1,5 +1,5 @@ { "name": "American Dishes", "description": "Food from the USA", - "icon": "dishes:flag_america" -} \ No newline at end of file + "icon": "dishes:flag_usa" +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/british.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/british.json index d39796a..c88dc52 100644 --- a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/british.json +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/british.json @@ -1,5 +1,5 @@ { "name": "British Dishes", "description": "Food from the United Kingdom", - "icon": "dishes:flag_britain" -} \ No newline at end of file + "icon": "dishes:flag_uk" +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/ukrainian.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/ukrainian.json new file mode 100644 index 0000000..7227b44 --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/categories/ukrainian.json @@ -0,0 +1,5 @@ +{ + "name": "Ukrainian Dishes", + "description": "Food from Ukraine", + "icon": "dishes:flag_ukraine" +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/birthday_cake.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/birthday_cake.json deleted file mode 100644 index 2b5e5f8..0000000 --- a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/birthday_cake.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Birthday Cake", - "icon": "dishes:birthday_cake", - "category": "dishes:sweets", - "pages": [ - { - "type": "spotlight", - "item": "dishes:birthday_cake", - "title": "Birthday Cake", - "link_recipe": false, - "text": "Happy Birthday!" - }, - { - "type": "crafting", - "recipe": "dishes:birthday_cake" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/borscht.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/borscht.json new file mode 100644 index 0000000..66205a4 --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/borscht.json @@ -0,0 +1,18 @@ +{ + "name": "Borscht", + "icon": "dishes:borscht", + "category": "dishes:ukrainian", + "pages": [ + { + "type": "spotlight", + "item": "dishes:borscht", + "title": "Borscht", + "link_recipe": false, + "text": "Traditional Ukrainian beetroot soup usually served with sour cream." + }, + { + "type": "crafting", + "recipe": "dishes:borscht" + } + ] +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/bowl.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/bowl.json new file mode 100644 index 0000000..b76a64f --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/bowl.json @@ -0,0 +1,18 @@ +{ + "name": "Bowl", + "icon": "dishes:bowl", + "category": "dishes:general", + "pages": [ + { + "type": "spotlight", + "item": "dishes:bowl", + "title": "Bowl", + "link_recipe": false, + "text": "A bowl." + }, + { + "type": "crafting", + "recipe": "dishes:bowl" + } + ] +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/ice_cream_glowberry.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/ice_cream_glowberry.json new file mode 100644 index 0000000..9441dc8 --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/ice_cream_glowberry.json @@ -0,0 +1,14 @@ +{ + "name": "Ice Cream Glow Berry", + "icon": "dishes:ice_cream_glowberry", + "category": "dishes:sweets", + "pages": [ + { + "type": "spotlight", + "item": "dishes:ice_cream_glowberry", + "title": "Ice Cream Glow Berry", + "link_recipe": false, + "text": "Who doesn't love ice cream? Sold by the Ice Cream trader." + } + ] +} diff --git a/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/pizzamargherita.json b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/pizzamargherita.json new file mode 100644 index 0000000..f728593 --- /dev/null +++ b/src/main/resources/data/dishes/patchouli_books/cooking_guide/en_us/entries/cooking_guide/pizzamargherita.json @@ -0,0 +1,18 @@ +{ + "name": "Pizza Margherita", + "icon": "dishes:pizzamargherita", + "category": "dishes:italian", + "pages": [ + { + "type": "spotlight", + "item": "dishes:pizzamargherita", + "title": "Pizza Margherita", + "link_recipe": false, + "text": "Named after Margherita of Savoy (Queen of Italy from 1878 until 1900)" + }, + { + "type": "crafting", + "recipe": "dishes:pizzamargherita" + } + ] +} diff --git a/src/main/resources/data/dishes/recipes/birthday_cake.json b/src/main/resources/data/dishes/recipes/birthday_cake.json deleted file mode 100644 index 70fdc57..0000000 --- a/src/main/resources/data/dishes/recipes/birthday_cake.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:diamond" - }, - { - "item": "minecraft:cake" - } - ], - "result": { - "item": "dishes:birthday_cake", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/dishes/recipes/borscht.json b/src/main/resources/data/dishes/recipes/borscht.json new file mode 100644 index 0000000..2b93a9a --- /dev/null +++ b/src/main/resources/data/dishes/recipes/borscht.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:beetroot", + "item_h": "minecraft:beetroot" + }, + { + "item": "minecraft:milk_bucket", + "item_h": "minecraft:milk_bucket" + }, + { + "item": "dishes:bowl", + "item_h": "dishes:bowl" + } + ], + "result": { + "item": "dishes:borscht", + "count": 1 + } +} diff --git a/src/main/resources/data/dishes/recipes/bowl.json b/src/main/resources/data/dishes/recipes/bowl.json new file mode 100644 index 0000000..a08e2b2 --- /dev/null +++ b/src/main/resources/data/dishes/recipes/bowl.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "# #", + " _ " + ], + "key": { + "#": { + "item": "minecraft:quartz_stairs" + }, + "_": { + "item": "minecraft:quartz_slab" + } + }, + "result": { + "item": "dishes:bowl", + "count": 1 + } +} diff --git a/src/main/resources/data/dishes/recipes/pizzamargherita.json b/src/main/resources/data/dishes/recipes/pizzamargherita.json new file mode 100644 index 0000000..08799da --- /dev/null +++ b/src/main/resources/data/dishes/recipes/pizzamargherita.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TP ", + "#_#" + ], + "key": { + "#": { + "item": "dishes:flour" + }, + "T": { + "item": "dishes:tomato" + }, + "P": { + "item": "dishes:cheese_slice" + }, + "_": { + "item": "dishes:pizzabox" + } + }, + "result": { + "item": "dishes:pizzamargherita", + "count": 1 + } +} diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 0000000..6e75291 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "dishes:salt_ore" + ] +} diff --git a/src/main/resources/dishes.mixins.json b/src/main/resources/dishes.mixins.json deleted file mode 100644 index fa606c4..0000000 --- a/src/main/resources/dishes.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "package": "eu.midnightdust.motschen.dishes.mixin", - "compatibilityLevel": "JAVA_8", - "mixins": [ - "GenerationSettingsAccessorMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8dc5c02..37dc47f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -4,7 +4,7 @@ "version": "${version}", "name": "Delicious Dishes", - "description": "Adds many cool new dishes with 3d models and animations!", + "description": "Adds many cool new dishes with 3D models and animations!", "authors": [ "Motschen", "TeamMidnightDust" @@ -24,22 +24,15 @@ ], "client": [ "eu.midnightdust.motschen.dishes.DishesClient" - ], - "modmenu": [ - "eu.midnightdust.motschen.dishes.config.ModMenuIntegration" ] }, - "mixins": [ - "dishes.mixins.json" - ], - "depends": { - "fabricloader": ">=0.7.2", + "midnightlib": "*", "fabric": "*" }, "suggests": { - "simplystrawberrys": "*", + "decorative": "*", "patchouli": "*" } }