mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 12:42:50 +00:00
First pass: Restore GoG, clean up some lexicon stuff
This commit is contained in:
1 parent
a641aed1b2
commit
da5918e46c
45 files changed
+484
-165
No files matched your search
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
@@ -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.
|
||||
@@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
Vendored
+172
@@ -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" "$@"
|
||||
Vendored
+84
@@ -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
|
||||
@@ -0,0 +1,8 @@
|
||||
package vazkii.botania.common;
|
||||
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
|
||||
@Mod("gardenofglass")
|
||||
public class GardenOfGlass
|
||||
{
|
||||
}
|
||||
@@ -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"
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "botania:blaze_block"
|
||||
},
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "botania:cocoon"
|
||||
},
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "minecraft:blaze_powder",
|
||||
"count": 9
|
||||
@@ -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"
|
||||
}
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "botania:mana_spreader"
|
||||
},
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "minecraft:end_portal_frame"
|
||||
},
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "minecraft:slime_ball"
|
||||
},
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "minecraft:cobblestone"
|
||||
},
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "botania:fertilizer"
|
||||
},
|
||||
-6
@@ -1,10 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "minecraft:oak_sapling"
|
||||
},
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"pack": {
|
||||
"description": "Garden of Glass pack",
|
||||
"pack_format": 4
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"botania:black_dye",
|
||||
"botania:blue_dye",
|
||||
"botania:brown_dye",
|
||||
"botania:cyan_dye",
|
||||
"botania:gray_dye",
|
||||
"botania:green_dye",
|
||||
"botania:light_blue_dye",
|
||||
"botania:light_gray_dye",
|
||||
"botania:lime_dye",
|
||||
"botania:magenta_dye",
|
||||
"botania:orange_dye",
|
||||
"botania:pink_dye",
|
||||
"botania:purple_dye",
|
||||
"botania:red_dye",
|
||||
"botania:white_dye",
|
||||
"botania:yellow_dye"
|
||||
]
|
||||
}
|
||||
@@ -122,7 +122,7 @@ public class RenderLexicon {
|
||||
|
||||
GlStateManager.translatef(0F, 10F, 0F);
|
||||
GlStateManager.scalef(0.6F, 0.6F, 0.6F);
|
||||
font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), 0, 0, 0xA07100);
|
||||
font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + ItemLexicon.getEdition(), 0, 0, 0xA07100);
|
||||
|
||||
if(quote == -1)
|
||||
quote = mc.world.rand.nextInt(QUOTES.length);
|
||||
|
||||
@@ -98,14 +98,8 @@ public class ItemLexicon extends ItemMod implements IElvenItem {
|
||||
return new ActionResult<>(ActionResultType.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) {
|
||||
|
||||
@@ -57,6 +57,8 @@ public class ModTags {
|
||||
public static final Tag<Item> DISPOSABLE = tag("disposable");
|
||||
public static final Tag<Item> SEMI_DISPOSABLE = tag("semi_disposable");
|
||||
|
||||
public static final Tag<Item> DYES = tag("dyes");
|
||||
|
||||
public static final Tag<Item> PETALS = tag("petals");
|
||||
public static final Tag<Item> PETALS_BLACK = tag("petals/black");
|
||||
public static final Tag<Item> PETALS_BLUE = tag("petals/blue");
|
||||
|
||||
@@ -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<Item> builder = getBuilder(ModTags.Items.DYES);
|
||||
Arrays.stream(DyeColor.values()).map(ModItems::getDye).sorted(Comparator.comparing(Item::getRegistryName)).forEach(builder::add);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
"botaniamisc.creativePool0": "クリエイティブ用マナプール.無限にマナを保持する",
|
||||
"botaniamisc.creativePool1": "エゴイスト向け",
|
||||
"botaniamisc.toolRank": "ランク %s$(7)",
|
||||
"botaniamisc.edition": "%s 版",
|
||||
"botaniamisc.lexiconcover0": "公式ガイドブック",
|
||||
"botaniamisc.lexiconcover1": "ボタニアのすべてがここに!",
|
||||
"botaniamisc.lexiconcover2": "Vazkii 著",
|
||||
|
||||
@@ -35,8 +35,6 @@
|
||||
"botaniamisc.creativePool0": "크리에이티브 모드를 위한 마나 풀로써, 용량이 무한대입니다.",
|
||||
"botaniamisc.creativePool1": "이기주의자에게 잘 어울립니다.",
|
||||
"botaniamisc.toolRank": "%s&7 랭크",
|
||||
"botaniamisc.edition": "%s 제본판",
|
||||
"botaniamisc.devEdition": "글쓴이",
|
||||
"botaniamisc.lexiconcover0": "당신이 궁금해하는",
|
||||
"botaniamisc.lexiconcover1": "식물학의 모든것",
|
||||
"botaniamisc.lexiconcover2": "저자의 베스트셀러",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -38,8 +38,6 @@
|
||||
"botaniamisc.creativePool0": "Творческий бассейн маны (бесконечная мана)",
|
||||
"botaniamisc.creativePool1": "Достоин эгоиста",
|
||||
"botaniamisc.toolRank": "Ранг: %s&7",
|
||||
"botaniamisc.edition": "%s издание",
|
||||
"botaniamisc.devEdition": "Писательское издание",
|
||||
"botaniamisc.lexiconcover0": "Руководство по всем",
|
||||
"botaniamisc.lexiconcover1": "ботаническим вопросам",
|
||||
"botaniamisc.lexiconcover2": "от Vazkii",
|
||||
|
||||
@@ -37,8 +37,6 @@
|
||||
"botaniamisc.creativePool0": "创造模式魔力池,拥有无限魔力",
|
||||
"botaniamisc.creativePool1": "创造模式独享",
|
||||
"botaniamisc.toolRank": "%s&7 级",
|
||||
"botaniamisc.edition": "第 %s 版",
|
||||
"botaniamisc.devEdition": "作者的",
|
||||
"botaniamisc.lexiconcover0": "官方权威指南",
|
||||
"botaniamisc.lexiconcover1": "植物魔法所需",
|
||||
"botaniamisc.lexiconcover2": "由Vazkii执笔编纂",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
+5
-5
@@ -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": {
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:not",
|
||||
"value": {
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "botania:blaze_block"
|
||||
},
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:not",
|
||||
"value": {
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "botania:cocoon"
|
||||
},
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:not",
|
||||
"value": {
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "minecraft:blaze_rod",
|
||||
"count": 9
|
||||
|
||||
@@ -1,13 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:not",
|
||||
"value": {
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "botania:fertilizer"
|
||||
},
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
@@ -1,13 +1,4 @@
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "forge:not",
|
||||
"value": {
|
||||
"type": "forge:mod_loaded",
|
||||
"modid": "gardenofglass"
|
||||
}
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"item": "botania:mana_spreader"
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user