From da5918e46cf14f6d7a4c223a61ca74be0f7090f9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 Dec 2019 23:37:36 -0600 Subject: [PATCH] First pass: Restore GoG, clean up some lexicon stuff --- build.gradle | 4 + garden_of_glass/.gitignore | 25 +++ garden_of_glass/README.MD | 14 ++ garden_of_glass/build.gradle | 82 +++++++++ .../gradle/wrapper/gradle-wrapper.properties | 5 + garden_of_glass/gradlew | 172 ++++++++++++++++++ garden_of_glass/gradlew.bat | 84 +++++++++ .../vazkii/botania/common/GardenOfGlass.java | 8 + .../src/main/resources/META-INF/mods.toml | 20 ++ .../data/botania/recipes/blaze_block.json | 6 - .../data/botania/recipes}/cocoon.json | 6 - .../conversions}/blazeblock_deconstruct.json | 6 - .../botania/recipes/fertilizer_powder.json | 24 +++ .../data/botania/recipes}/mana_spreader.json | 6 - .../recipes}/end_portal_frame.json | 6 - .../recipes}/magma_cream_to_slime_ball.json | 6 - .../recipes}/pebble_to_cobblestone.json | 6 - .../recipes}/root_to_fertilizer.json | 6 - .../recipes}/root_to_sapling.json | 6 - .../src/main/resources/logo_gog.png | Bin 0 -> 21098 bytes .../src/main/resources/pack.mcmeta | 6 + .../data/botania/tags/items/dyes.json | 21 +++ .../client/core/handler/RenderLexicon.java | 2 +- .../botania/common/item/ItemLexicon.java | 8 +- .../vazkii/botania/common/lib/ModTags.java | 2 + .../vazkii/botania/data/ItemTagProvider.java | 9 + .../resources/assets/botania/lang/en_us.json | 3 - .../resources/assets/botania/lang/es_ar.json | 2 - .../resources/assets/botania/lang/es_es.json | 2 - .../resources/assets/botania/lang/fr_fr.json | 2 - .../resources/assets/botania/lang/ja_jp.json | 1 - .../resources/assets/botania/lang/ko_kr.json | 2 - .../resources/assets/botania/lang/nl_nl.json | 2 - .../resources/assets/botania/lang/pt_br.json | 2 - .../resources/assets/botania/lang/ru_ru.json | 2 - .../resources/assets/botania/lang/zh_cn.json | 2 - .../resources/assets/botania/lang/zh_tw.json | 2 - .../botania/patchouli_books/lexicon/book.json | 2 +- .../en_us/entries/basics/garden_of_glass.json | 10 +- .../data/botania/recipes/blaze_block.json | 9 - .../data/botania/recipes/cocoon.json | 9 - .../conversions/blazeblock_deconstruct.json | 9 - .../botania/recipes/fertilizer_powder.json | 9 - .../garden_of_glass/fertilizer_powder.json | 30 --- .../data/botania/recipes/mana_spreader.json | 9 - 45 files changed, 484 insertions(+), 165 deletions(-) create mode 100644 garden_of_glass/.gitignore create mode 100644 garden_of_glass/README.MD create mode 100644 garden_of_glass/build.gradle create mode 100644 garden_of_glass/gradle/wrapper/gradle-wrapper.properties create mode 100644 garden_of_glass/gradlew create mode 100644 garden_of_glass/gradlew.bat create mode 100644 garden_of_glass/src/main/java/vazkii/botania/common/GardenOfGlass.java create mode 100644 garden_of_glass/src/main/resources/META-INF/mods.toml rename src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json => garden_of_glass/src/main/resources/data/botania/recipes/blaze_block.json (68%) rename {src/main/resources/data/botania/recipes/garden_of_glass => garden_of_glass/src/main/resources/data/botania/recipes}/cocoon.json (76%) rename {src/main/resources/data/botania/recipes/garden_of_glass => garden_of_glass/src/main/resources/data/botania/recipes/conversions}/blazeblock_deconstruct.json (65%) create mode 100644 garden_of_glass/src/main/resources/data/botania/recipes/fertilizer_powder.json rename {src/main/resources/data/botania/recipes/garden_of_glass => garden_of_glass/src/main/resources/data/botania/recipes}/mana_spreader.json (92%) rename {src/main/resources/data/botania/recipes/garden_of_glass => garden_of_glass/src/main/resources/data/gardenofglass/recipes}/end_portal_frame.json (71%) rename {src/main/resources/data/botania/recipes/garden_of_glass => garden_of_glass/src/main/resources/data/gardenofglass/recipes}/magma_cream_to_slime_ball.json (69%) rename {src/main/resources/data/botania/recipes/garden_of_glass => garden_of_glass/src/main/resources/data/gardenofglass/recipes}/pebble_to_cobblestone.json (74%) rename {src/main/resources/data/botania/recipes/garden_of_glass => garden_of_glass/src/main/resources/data/gardenofglass/recipes}/root_to_fertilizer.json (62%) rename {src/main/resources/data/botania/recipes/garden_of_glass => garden_of_glass/src/main/resources/data/gardenofglass/recipes}/root_to_sapling.json (76%) create mode 100644 garden_of_glass/src/main/resources/logo_gog.png create mode 100644 garden_of_glass/src/main/resources/pack.mcmeta create mode 100644 src/generated/resources/data/botania/tags/items/dyes.json delete mode 100644 src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json diff --git a/build.gradle b/build.gradle index 48ffbb766..625741488 100644 --- a/build.gradle +++ b/build.gradle @@ -134,6 +134,10 @@ jar { processResources { // Exclude datagenerator .cache directory exclude '.cache' + + filesMatching('data/botania/patchouli_books/lexicon/book.json') { + expand(['buildNumber': config.build_number]) + } } task srcJar(type: Jar) { diff --git a/garden_of_glass/.gitignore b/garden_of_glass/.gitignore new file mode 100644 index 000000000..12f864471 --- /dev/null +++ b/garden_of_glass/.gitignore @@ -0,0 +1,25 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Files from Forge MDK +forge*changelog.txt diff --git a/garden_of_glass/README.MD b/garden_of_glass/README.MD new file mode 100644 index 000000000..2ff2a8f6d --- /dev/null +++ b/garden_of_glass/README.MD @@ -0,0 +1,14 @@ +Garden of Glass +--- + +This subdirectory is a separate mod workspace for Garden of Glass, Botania's skyblock mode. + +This mod is nothing more than a dressed-up datapack. It contains recipe and other overrides in its /data, but otherwise has no code. + +The code side of GoG lives in Botania itself. + +Yes, this *could* be a proper Gradle subproject, but it's too small to be worth the effort to figure that out. + +So to test, simply `gradlew build` then copy it to your main Botania workspace's mods/ folder and run from there. + +Note that since nothing touches vanilla code, there's no need for a deobf JAR. diff --git a/garden_of_glass/build.gradle b/garden_of_glass/build.gradle new file mode 100644 index 000000000..7a47132dd --- /dev/null +++ b/garden_of_glass/build.gradle @@ -0,0 +1,82 @@ +buildscript { + repositories { + maven { url = 'https://files.minecraftforge.net/maven' } + jcenter() + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + } +} +apply plugin: 'net.minecraftforge.gradle' +// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. +apply plugin: 'eclipse' +apply plugin: 'maven-publish' + +def parseConfig(File config) { + if(config.exists()){ + config.withReader { + def prop = new Properties() + prop.load(it) + return (new ConfigSlurper().parse(prop)) + } + } else { + return null + } +} + +ext.config = parseConfig(file('../build.properties')) + +version = '1.0' +group = 'vazkii.botania' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = 'gardenofglass' + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. + +minecraft { + mappings channel: 'snapshot', version: "${config.mc_mappings}" + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + runs { + // No run configurations: Build this and run in a Botania workspace to debug + } +} + +dependencies { + minecraft "net.minecraftforge:forge:${config.mc_version}-${config.forge_version}" +} + +jar { + manifest { + attributes([ + "Specification-Title": project.name, + "Specification-Vendor": project.name, + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor" : project.name, + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +// Example configuration to allow publishing using the maven-publish task +// we define a custom artifact that is sourced from the reobfJar output task +// and then declare that to be published +// Note you'll need to add a repository here +def reobfFile = file("$buildDir/reobfJar/output.jar") +def reobfArtifact = artifacts.add('default', reobfFile) { + type 'jar' + builtBy 'reobfJar' +} +publishing { + publications { + mavenJava(MavenPublication) { + artifact reobfArtifact + } + } + repositories { + maven { + url "file:///${project.projectDir}/mcmodsrepo" + } + } +} \ No newline at end of file diff --git a/garden_of_glass/gradle/wrapper/gradle-wrapper.properties b/garden_of_glass/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..949819d28 --- /dev/null +++ b/garden_of_glass/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/garden_of_glass/gradlew b/garden_of_glass/gradlew new file mode 100644 index 000000000..cccdd3d51 --- /dev/null +++ b/garden_of_glass/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, 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" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/garden_of_glass/gradlew.bat b/garden_of_glass/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/garden_of_glass/gradlew.bat @@ -0,0 +1,84 @@ +@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= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/garden_of_glass/src/main/java/vazkii/botania/common/GardenOfGlass.java b/garden_of_glass/src/main/java/vazkii/botania/common/GardenOfGlass.java new file mode 100644 index 000000000..d78b7de33 --- /dev/null +++ b/garden_of_glass/src/main/java/vazkii/botania/common/GardenOfGlass.java @@ -0,0 +1,8 @@ +package vazkii.botania.common; + +import net.minecraftforge.fml.common.Mod; + +@Mod("gardenofglass") +public class GardenOfGlass +{ +} diff --git a/garden_of_glass/src/main/resources/META-INF/mods.toml b/garden_of_glass/src/main/resources/META-INF/mods.toml new file mode 100644 index 000000000..830837e75 --- /dev/null +++ b/garden_of_glass/src/main/resources/META-INF/mods.toml @@ -0,0 +1,20 @@ +modLoader="javafml" #mandatory +loaderVersion="[28,)" +issueTrackerURL="https://github.com/Vazkii/Botania/issues" #optional +displayURL="https://botaniamod.net" #optional +logoFile="logo_gog.png" #optional +credits="" #optional +authors="Vazkii, wiiv, williewillus" #optional + +[[mods]] +modId="gardenofglass" +version="${file.jarVersion}" +displayName="Garden of Glass" +description=''' +An extension to Botania that adds skyblock like gameplay.''' + +[[dependencies.gardenofglass]] + modId="botania" + mandatory=true + ordering="AFTER" + side="BOTH" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json b/garden_of_glass/src/main/resources/data/botania/recipes/blaze_block.json similarity index 68% rename from src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json rename to garden_of_glass/src/main/resources/data/botania/recipes/blaze_block.json index 7d884ed1a..e591d947e 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json +++ b/garden_of_glass/src/main/resources/data/botania/recipes/blaze_block.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "botania:blaze_block" }, diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json b/garden_of_glass/src/main/resources/data/botania/recipes/cocoon.json similarity index 76% rename from src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json rename to garden_of_glass/src/main/resources/data/botania/recipes/cocoon.json index 7148f540c..59e84d20e 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json +++ b/garden_of_glass/src/main/resources/data/botania/recipes/cocoon.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "botania:cocoon" }, diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json b/garden_of_glass/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json similarity index 65% rename from src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json rename to garden_of_glass/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json index 8ee9d0441..d1dec822e 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json +++ b/garden_of_glass/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "minecraft:blaze_powder", "count": 9 diff --git a/garden_of_glass/src/main/resources/data/botania/recipes/fertilizer_powder.json b/garden_of_glass/src/main/resources/data/botania/recipes/fertilizer_powder.json new file mode 100644 index 000000000..e5208903e --- /dev/null +++ b/garden_of_glass/src/main/resources/data/botania/recipes/fertilizer_powder.json @@ -0,0 +1,24 @@ +{ + "result": { + "item": "botania:fertilizer", + "count": 3 + }, + "ingredients": [ + { + "item": "minecraft:bone_meal" + }, + { + "tag": "botania:dyes" + }, + { + "tag": "botania:dyes" + }, + { + "tag": "botania:dyes" + }, + { + "tag": "botania:dyes" + } + ], + "type": "minecraft:crafting_shapeless" +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json b/garden_of_glass/src/main/resources/data/botania/recipes/mana_spreader.json similarity index 92% rename from src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json rename to garden_of_glass/src/main/resources/data/botania/recipes/mana_spreader.json index b0eea535b..3ffd9a8a6 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json +++ b/garden_of_glass/src/main/resources/data/botania/recipes/mana_spreader.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "botania:mana_spreader" }, diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/end_portal_frame.json similarity index 71% rename from src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json rename to garden_of_glass/src/main/resources/data/gardenofglass/recipes/end_portal_frame.json index d3b003de4..9409783b2 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/end_portal_frame.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "minecraft:end_portal_frame" }, diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/magma_cream_to_slime_ball.json similarity index 69% rename from src/main/resources/data/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json rename to garden_of_glass/src/main/resources/data/gardenofglass/recipes/magma_cream_to_slime_ball.json index 617f8b114..b51fb10d7 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/magma_cream_to_slime_ball.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "minecraft:slime_ball" }, diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/pebble_to_cobblestone.json similarity index 74% rename from src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json rename to garden_of_glass/src/main/resources/data/gardenofglass/recipes/pebble_to_cobblestone.json index 4b8d221f1..a7455a852 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/pebble_to_cobblestone.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "minecraft:cobblestone" }, diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_fertilizer.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/root_to_fertilizer.json similarity index 62% rename from src/main/resources/data/botania/recipes/garden_of_glass/root_to_fertilizer.json rename to garden_of_glass/src/main/resources/data/gardenofglass/recipes/root_to_fertilizer.json index 507f067f1..ef36e2773 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_fertilizer.json +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/root_to_fertilizer.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "botania:fertilizer" }, diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/root_to_sapling.json similarity index 76% rename from src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json rename to garden_of_glass/src/main/resources/data/gardenofglass/recipes/root_to_sapling.json index e0e48ecf0..343c96aa2 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json +++ b/garden_of_glass/src/main/resources/data/gardenofglass/recipes/root_to_sapling.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], "result": { "item": "minecraft:oak_sapling" }, diff --git a/garden_of_glass/src/main/resources/logo_gog.png b/garden_of_glass/src/main/resources/logo_gog.png new file mode 100644 index 0000000000000000000000000000000000000000..bbccce646e627abd2fdbfb9399147384d21602b6 GIT binary patch literal 21098 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.SUCCESS, stack); } - @OnlyIn(Dist.CLIENT) public static String getEdition() { - String version = getBook().version; - try { - return MathHelper.numberToOrdinal(Integer.parseInt(version)); - } catch (NumberFormatException e) { - return I18n.format("botaniamisc.devEdition"); - } + return getBook().contents.getSubtitle(); } public static ITextComponent getTitle(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index c74eb7ea6..60a76cf0b 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -57,6 +57,8 @@ public class ModTags { public static final Tag DISPOSABLE = tag("disposable"); public static final Tag SEMI_DISPOSABLE = tag("semi_disposable"); + public static final Tag DYES = tag("dyes"); + public static final Tag PETALS = tag("petals"); public static final Tag PETALS_BLACK = tag("petals/black"); public static final Tag PETALS_BLUE = tag("petals/blue"); diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index e93551cf2..bf95ab724 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -2,11 +2,17 @@ package vazkii.botania.data; import net.minecraft.data.DataGenerator; import net.minecraft.data.ItemTagsProvider; +import net.minecraft.item.DyeColor; +import net.minecraft.item.Item; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; +import java.util.Arrays; +import java.util.Comparator; public class ItemTagProvider extends ItemTagsProvider { public ItemTagProvider(DataGenerator generatorIn) { @@ -25,6 +31,9 @@ public class ItemTagProvider extends ItemTagsProvider { this.copy(ModTags.Blocks.FLOATING_FLOWERS, ModTags.Items.FLOATING_FLOWERS); this.copy(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS, ModTags.Items.DOUBLE_MYSTICAL_FLOWERS); this.copy(ModTags.Blocks.MYSTICAL_FLOWERS, ModTags.Items.MYSTICAL_FLOWERS); + + Tag.Builder builder = getBuilder(ModTags.Items.DYES); + Arrays.stream(DyeColor.values()).map(ModItems::getDye).sorted(Comparator.comparing(Item::getRegistryName)).forEach(builder::add); } @Nonnull diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index bde0e579a..143e4b828 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -39,9 +39,6 @@ "botaniamisc.creativePool0": "Creative Mana Pool, has infinite Mana", "botaniamisc.creativePool1": "Worthy of an Egoist", "botaniamisc.toolRank": "%s\u00a77 Rank", - "botaniamisc.edition": "%s Edition", - "_comment_edition": "^ Leave this empty for no edition display", - "botaniamisc.devEdition": "Writer's", "botaniamisc.lexiconcover0": "The official guide for", "botaniamisc.lexiconcover1": "all your Botania needs!", "botaniamisc.lexiconcover2": "A Book by Vazkii", diff --git a/src/main/resources/assets/botania/lang/es_ar.json b/src/main/resources/assets/botania/lang/es_ar.json index 0e22249b2..6efe7602e 100644 --- a/src/main/resources/assets/botania/lang/es_ar.json +++ b/src/main/resources/assets/botania/lang/es_ar.json @@ -31,8 +31,6 @@ "botaniamisc.creativePool0": "Pileta de Maná de Creativo. Tiene Maná infinito.", "botaniamisc.creativePool1": "Propio de un Egoista", "botaniamisc.toolRank": "%s&7 Rank", - "botaniamisc.edition": "%s Edition", - "botaniamisc.devEdition": "Writer's", "botaniamisc.lexiconcover0": "Tu guía para todas", "botaniamisc.lexiconcover1": "tus necesidades botánicas", "botaniamisc.lexiconcover2": "del autor de bestsellers", diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index 49d3e2064..4040acd76 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -35,8 +35,6 @@ "botaniamisc.creativePool0": "Pila de maná de creativo. Tiene maná infinito.", "botaniamisc.creativePool1": "Digno de un egoísta", "botaniamisc.toolRank": "Rango %s&7", - "botaniamisc.edition": "Edición %sª", - "botaniamisc.devEdition": "Del escritor", "botaniamisc.lexiconcover0": "Tu guía para todas", "botaniamisc.lexiconcover1": "tus necesidades botánicas", "botaniamisc.lexiconcover2": "de la autora de bestsellers", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index 1b626619d..840e27962 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -34,8 +34,6 @@ "botaniamisc.creativePool0": "Bassin de mana créatif, possède du mana à l'infini", "botaniamisc.creativePool1": "Digne d'un égoïste", "botaniamisc.toolRank": "%s&7 rang", - "botaniamisc.edition": "%s édition", - "botaniamisc.devEdition": "L'auteur est", "botaniamisc.lexiconcover0": "Votre guide pour tout", "botaniamisc.lexiconcover1": "vos besoins botaniques", "botaniamisc.lexiconcover2": "De l'auteur à succès", diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index a52364aed..7cc601037 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -33,7 +33,6 @@ "botaniamisc.creativePool0": "クリエイティブ用マナプール.無限にマナを保持する", "botaniamisc.creativePool1": "エゴイスト向け", "botaniamisc.toolRank": "ランク %s$(7)", - "botaniamisc.edition": "%s 版", "botaniamisc.lexiconcover0": "公式ガイドブック", "botaniamisc.lexiconcover1": "ボタニアのすべてがここに!", "botaniamisc.lexiconcover2": "Vazkii 著", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index 2426502c9..1eebd71bc 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -35,8 +35,6 @@ "botaniamisc.creativePool0": "크리에이티브 모드를 위한 마나 풀로써, 용량이 무한대입니다.", "botaniamisc.creativePool1": "이기주의자에게 잘 어울립니다.", "botaniamisc.toolRank": "%s&7 랭크", - "botaniamisc.edition": "%s 제본판", - "botaniamisc.devEdition": "글쓴이", "botaniamisc.lexiconcover0": "당신이 궁금해하는", "botaniamisc.lexiconcover1": "식물학의 모든것", "botaniamisc.lexiconcover2": "저자의 베스트셀러", diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index e6879c203..653de7204 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -35,8 +35,6 @@ "botaniamisc.creativePool1": "Waardig voor een egoïst", "botaniamisc.toolRank": "%s&7 Rang", - "botaniamisc.edition": "%s Editie", - "botaniamisc.devEdition": "Schrijver's", "botaniamisc.lexiconcover0": "Uw gids voor alle", "botaniamisc.lexiconcover1": "Botanische benodigdheden", "botaniamisc.lexiconcover2": "Van best verkopende auteur", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index 8437c2bce..7ba0a94c3 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -33,8 +33,6 @@ "botaniamisc.creativePool0": "Poço de Mana Criativo, possui Mana infinita", "botaniamisc.creativePool1": "Perfeito para egoístas", "botaniamisc.toolRank": "Rank %s&7", - "botaniamisc.edition": "%sª Edição", - "botaniamisc.devEdition": "Escritor", "botaniamisc.lexiconcover0": "O guia oficial para", "botaniamisc.lexiconcover1": "suas dúvidas em Botania!", "botaniamisc.lexiconcover2": "Um livro por Vazkii", diff --git a/src/main/resources/assets/botania/lang/ru_ru.json b/src/main/resources/assets/botania/lang/ru_ru.json index 183b55e65..f35d2b231 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.json +++ b/src/main/resources/assets/botania/lang/ru_ru.json @@ -38,8 +38,6 @@ "botaniamisc.creativePool0": "Творческий бассейн маны (бесконечная мана)", "botaniamisc.creativePool1": "Достоин эгоиста", "botaniamisc.toolRank": "Ранг: %s&7", - "botaniamisc.edition": "%s издание", - "botaniamisc.devEdition": "Писательское издание", "botaniamisc.lexiconcover0": "Руководство по всем", "botaniamisc.lexiconcover1": "ботаническим вопросам", "botaniamisc.lexiconcover2": "от Vazkii", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index 172f8d7a4..4218be02a 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -37,8 +37,6 @@ "botaniamisc.creativePool0": "创造模式魔力池,拥有无限魔力", "botaniamisc.creativePool1": "创造模式独享", "botaniamisc.toolRank": "%s&7 级", - "botaniamisc.edition": "第 %s 版", - "botaniamisc.devEdition": "作者的", "botaniamisc.lexiconcover0": "官方权威指南", "botaniamisc.lexiconcover1": "植物魔法所需", "botaniamisc.lexiconcover2": "由Vazkii执笔编纂", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index 7ea4af709..e4cd0118d 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -34,8 +34,6 @@ "botaniamisc.creativePool0": "創造模式瑪那池,擁有無限瑪那", "botaniamisc.creativePool1": "創造模式獨享", "botaniamisc.toolRank": "%s&7 級", - "botaniamisc.edition": "第 %s 版", - "botaniamisc.devEdition": "作者的", "botaniamisc.lexiconcover0": "囊括植物魔法之中", "botaniamisc.lexiconcover1": "一切內容的官方指南", "botaniamisc.lexiconcover2": "A Book by Vazkii", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/book.json b/src/main/resources/data/botania/patchouli_books/lexicon/book.json index ba624371c..511225ab4 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/book.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/book.json @@ -1,7 +1,7 @@ { "name": "item.botania.lexicon", "landing_text": "Landing", - "version": 1, + "version": "${buildNumber}", "book_texture": "patchouli:textures/gui/book_green.png", "model": "botania:lexicon", "open_sound": "botania:lexiconopen", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json index 81dc5e65f..52c666792 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/garden_of_glass.json @@ -20,17 +20,17 @@ { "type": "crafting", "text": "botania.page.gardenOfGlass3", - "recipe": "botania:garden_of_glass/root_to_sapling" + "recipe": "gardenofglass:root_to_sapling" }, { "type": "crafting", "text": "botania.page.gardenOfGlass4", - "recipe": "botania:garden_of_glass/root_to_fertilizer" + "recipe": "gardenofglass:root_to_fertilizer" }, { "type": "crafting", "text": "botania.page.gardenOfGlass5", - "recipe": "botania:garden_of_glass/pebble_to_cobblestone" + "recipe": "gardenofglass:pebble_to_cobblestone" }, { "type": "text", @@ -44,7 +44,7 @@ { "type": "crafting", "text": "botania.page.gardenOfGlass8", - "recipe": "botania:garden_of_glass/magma_cream_to_slime_ball" + "recipe": "gardenofglass:magma_cream_to_slime_ball" }, { "type": "mana_infusion", @@ -62,7 +62,7 @@ { "type": "crafting", "text": "botania.page.gardenOfGlass12", - "recipe": "botania:garden_of_glass/end_portal_frame" + "recipe": "gardenofglass:end_portal_frame" } ], "extra_recipe_mappings": { diff --git a/src/main/resources/data/botania/recipes/blaze_block.json b/src/main/resources/data/botania/recipes/blaze_block.json index 8fe3467cf..4f42bf384 100644 --- a/src/main/resources/data/botania/recipes/blaze_block.json +++ b/src/main/resources/data/botania/recipes/blaze_block.json @@ -1,13 +1,4 @@ { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - } - ], "result": { "item": "botania:blaze_block" }, diff --git a/src/main/resources/data/botania/recipes/cocoon.json b/src/main/resources/data/botania/recipes/cocoon.json index 4801eba2a..0b56ed314 100644 --- a/src/main/resources/data/botania/recipes/cocoon.json +++ b/src/main/resources/data/botania/recipes/cocoon.json @@ -1,13 +1,4 @@ { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - } - ], "result": { "item": "botania:cocoon" }, diff --git a/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json index 255975427..5dc28e7bc 100644 --- a/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json @@ -1,13 +1,4 @@ { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - } - ], "result": { "item": "minecraft:blaze_rod", "count": 9 diff --git a/src/main/resources/data/botania/recipes/fertilizer_powder.json b/src/main/resources/data/botania/recipes/fertilizer_powder.json index 2311db921..6e3746cd3 100644 --- a/src/main/resources/data/botania/recipes/fertilizer_powder.json +++ b/src/main/resources/data/botania/recipes/fertilizer_powder.json @@ -1,13 +1,4 @@ { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - } - ], "result": { "item": "botania:fertilizer" }, diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json b/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json deleted file mode 100644 index 7ca38f1ea..000000000 --- a/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - ], - "result": { - "item": "botania:fertilizer", - "count": 3 - }, - "ingredients": [ - { - "item": "minecraft:bone_meal" - }, - { - "tag": "botania:floral_powder" - }, - { - "tag": "botania:floral_powder" - }, - { - "tag": "botania:floral_powder" - }, - { - "tag": "botania:floral_powder" - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/mana_spreader.json b/src/main/resources/data/botania/recipes/mana_spreader.json index e45d3b7f4..7d60f0496 100644 --- a/src/main/resources/data/botania/recipes/mana_spreader.json +++ b/src/main/resources/data/botania/recipes/mana_spreader.json @@ -1,13 +1,4 @@ { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:mod_loaded", - "modid": "gardenofglass" - } - } - ], "result": { "item": "botania:mana_spreader" },