update 2.8.x deps

Great Renaming, Part 2 - Items (#107 )
Great Renaming, Part 1 - Blocks & deobfParams (#106 )
2026-10-26 14:24:22 +00:00 · 2025-10-19 19:46:26 +02:00 · 2025-10-19 16:54:28 +02:00 · 2025-10-19 16:54:06 +02:00 · 2025-10-19 16:53:43 +02:00 · 2025-10-19 16:53:16 +02:00
448 changed files with 9498 additions and 6708 deletions
@@ -0,0 +1,62 @@
+name: Report Bug
+description: "Report a bug."
+body:
+  - type: markdown
+    attributes:
+      value: "A bug/crash report with sufficient information and logs to reproduce and track down."
+  - type: input
+    id: discord
+    attributes:
+      label: Your GTNH Discord Username
+      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
+      placeholder: "Example: Fake#1234"
+  - type: input
+    id: version
+    attributes:
+      label: Mod Version
+      description: "What version of the Mod are you using?"
+      placeholder: "Example: 1.0.0"
+    validations:
+      required: true
+  - type: textarea
+    id: report
+    attributes:
+      label: Bug Report
+      description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
+      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
+    validations:
+      required: true
+  - type: dropdown
+    id: java
+    attributes:
+      label: Java Version
+      description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
+      options:
+        - Java 8
+        - Java 9
+        - Java 11
+        - Java 17
+        - Java 19
+        - Java 20
+        - Java 21
+        - Other (Please Specify)
+    validations:
+      required: true
+  - type: textarea
+    id: modlist
+    attributes:
+      label: Mod List or GTNH Pack Version
+      description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log).  If using GTNH please indicate pack version and any changed mods, not the entire modlist."
+      placeholder: "List of mods or GTNH Pack version goes here"
+    validations:
+      required: true
+  - type: checkboxes
+    id: final
+    attributes:
+      label: Final Checklist
+      description: Certify that you read things
+      options:
+        - label: "I have searched the issues and haven't found a similar issue."
+          required: true
+
+
@@ -0,0 +1,28 @@
+name: Feature Request
+description: "Request a feature."
+body:
+  - type: markdown
+    attributes:
+      value: "Please use this form to request features. We ask you check if it was already requested though"
+  - type: input
+    id: discord
+    attributes:
+      label: Your GTNH Discord Username
+      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
+      placeholder: "Example: Wumpus#1234"
+  - type: textarea
+    id: request
+    attributes:
+      label: Feature Request
+      description: "Relevant information, as well as relevant images"
+      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
+    validations:
+      required: true
+  - type: checkboxes
+    id: final
+    attributes:
+      label: Final Checklist
+      description: Certify that you read things
+      options:
+        - label: "I have searched the issues and haven't found a similar issue."
+          required: true
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-RUNDIR="run"
-CRASH="crash-reports"
-SERVERLOG="server.log"
-
-if [[ -d $RUNDIR/$CRASH ]]; then
-  echo "Crash reports detected:"
-  cat $RUNDIR/$CRASH/crash*.txt
-  exit 1
-fi
-
-if grep --quiet "Fatal errors were detected" $SERVERLOG; then
-  echo "Fatal errors detected:"
-  cat server.log
-  exit 1
-fi
-
-if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
-  echo "Server force stopped:"
-  cat server.log
-  exit 1
-fi
-
-if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
-  echo "Server didn't finish startup:"
-  cat server.log
-  exit 1
-fi
-
-echo "No crash reports detected"
-exit 0
-
@@ -26,7 +26,13 @@ whitelist.json
 *.iml
 *.ipr
 *.iws
-src/main/resources/mixins.*.json
+src/main/resources/mixins.*([!.]).json
 *.bat
 *.DS_Store
 !gradlew.bat
+.factorypath
+addon.local.gradle
+addon.local.gradle.kts
+addon.late.local.gradle
+addon.late.local.gradle.kts
+layout.json
@@ -1,17 +1,18 @@
 // Add your dependencies here

 dependencies {
-    compile('com.github.GTNewHorizons:Baubles:1.0.1.14:dev')
-
-    compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:api') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.2.7-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.27:api') {transitive=false}
-    compile('com.github.GTNewHorizons:GTNHLib:0.0.4:dev')
+    api('com.github.GTNewHorizons:Baubles-Expanded:2.1.16-GTNH:dev')
+    api('com.github.GTNewHorizons:GTNHLib:0.6.40:dev')

+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.8:dev') {transitive=false}
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:api') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.9-GTNH:api') {transitive=false}
    compileOnly('curse.maven:cofh-lib-220333:2388748')
    compileOnly('curse.maven:minefactory-reloaded-66672:2366150')
+    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
+
+    compileOnly("com.github.GTNewHorizons:StructureLib:1.4.23:dev")
 }
+
@@ -1,72 +1,194 @@
+# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
+# LOCAL to test local config updates.
+gtnh.settings.blowdryerTag = 0.2.0
+
+# Human-readable mod name, available for mcmod.info population.
 modName = Botania

-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
+# Conventionally lowercase.
 modId = Botania

+# Root package of the mod, used to find various classes in other properties,
+# mcmod.info substitution, enabling assertions in run tasks, etc.
 modGroup = vazkii.botania

-# WHY is there no version field?
-# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
-# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+# Whether to use modGroup as the maven publishing group.
+# When false, com.github.GTNewHorizons is used.
+useModGroupForPublishing = false

-# Will update your build.gradle automatically whenever an update is available
+# Updates your build.gradle and settings.gradle automatically whenever an update is available.
 autoUpdateBuildScript = false

+# Version of Minecraft to target
 minecraftVersion = 1.7.10
+
+# Version of Minecraft Forge to target
 forgeVersion = 10.13.4.1614

-# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
-# restart Minecraft in development. Choose this dependent on your mod:
-# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
-# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
+channel = stable
+
+# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
+mappingsVersion = 12
+
+# Defines other MCP mappings for dependency deobfuscation.
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+
+# Select a default username for testing your mod. You can always override this per-run by running
+# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer

-# Define a source file of your project with:
+# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
+# See https://github.com/bsideup/jabel for details on how this works.
+enableModernJavaSyntax = true
+
+# Enables injecting missing generics into the decompiled source code for a better coding experience.
+# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
+enableGenericInjection = true
+
+# Generate a class with a String field for the mod version named as defined below.
+# If generateGradleTokenClass is empty or not missing, no such class will be generated.
+# If gradleTokenVersion is empty or missing, the field will not be present in the class.
+generateGradleTokenClass = vazkii.botania.common.Tags
+
+# Name of the token containing the project's current version to generate/replace.
+gradleTokenVersion = VERSION
+
+# [DEPRECATED]
+# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
 # public static final String VERSION = "GRADLETOKEN_VERSION";
 # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...])
-# Leave these properties empty to skip individual token replacements
-replaceGradleTokenInFile = LibMisc.java
-gradleTokenModId =
-gradleTokenModName =
-gradleTokenVersion = GRADLETOKEN_VERSION
-gradleTokenGroupName =
+# version in @Mod([...], version = VERSION, [...]).
+# Leave these properties empty to skip individual token replacements.
+# replaceGradleTokenInFile =

 # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
 # leave this property empty.
-# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
 apiPackage = api

 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
-# Example value: mymodid_at.cfg
+# There can be multiple files in a space-separated list.
+# Example value: mymodid_at.cfg nei_at.cfg
 accessTransformersFile = botania_at.cfg

 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
+
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
+# Adds some debug arguments like verbose output and class export.
+usesMixinDebug = false
+
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
+
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
 mixinsPackage =
+
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only
-# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
 coreModClass =
+
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
 containsMixinsAndOrCoreModOnly = false

-# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
-# responsibility check the licence and request permission for distribution, if required.
+# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
+forceEnableMixins = false
+
+# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
+# responsibility to check the license and request permission for distribution if required.
 usesShadowedDependencies = false

-# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
+# their own classes, making the minimization unreliable.
+minimizeShadowedDependencies = true
+
+# If disabled, won't rename the shadowed classes.
+relocateShadowedDependencies = true
+
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+includeWellKnownRepositories = true
+
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
+# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
+# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
+# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
+usesMavenPublishing = true
+
+# Maven repository to publish the mod to.
+# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
+
+# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
+#
+# The project's ID on Modrinth. Can be either the slug or the ID.
+# Leave this empty if you don't want to publish to Modrinth.
+modrinthProjectId =
+
+# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
+# Syntax: scope1-type1:name1;scope2-type2:name2;...
+# Where scope can be one of [required, optional, incompatible, embedded],
+#       type can be one of [project, version],
+#       and the name is the Modrinth project or version slug/id of the other mod.
+# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
+modrinthRelations =
+
+# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
+#
+# The project's numeric ID on CurseForge. You can find this in the About Project box.
+# Leave this empty if you don't want to publish on CurseForge.
+curseForgeProjectId =
+
+# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
+# Syntax: type1:name1;type2:name2;...
+# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
+#       and the name is the CurseForge project slug of the other mod.
+# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
+curseForgeRelations =
+
+# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
 # projects. New projects should not use this parameter.
-#customArchiveBaseName =
+# customArchiveBaseName =

-# Optional parameter to prevent the source code from being published
-# noPublishedSources =
+# Optional parameter to have the build automatically fail if an illegal version is used.
+# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
+# The check is ONLY performed if the version is a git tag.
+# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
+# versionPattern =

-# Uncomment this to disable spotless checks
+# Uncomment to prevent the source code from being published.
+# noPublishedSources = true
+
+# Uncomment this to disable Spotless checks.
 # This should only be uncommented to keep it easier to sync with upstream/other forks.
 # That is, if there is no other active fork/upstream, NEVER change this.
 disableSpotless = true
+
+# Uncomment this to disable Checkstyle checks (currently wildcard import check).
+# disableCheckstyle = true
+
+# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
+# (force use delegated build).
+# This is meant to be set in $HOME/.gradle/gradle.properties.
+# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
+# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
+# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
+# ideaOverrideBuildType = idea
+
+# Whether IDEA should run spotless checks when pressing the Build button.
+# This is meant to be set in $HOME/.gradle/gradle.properties.
+# ideaCheckSpotlessOnBuild = true
+
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -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.
@@ -15,80 +15,115 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
-##
-##  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/HEAD/platforms/jvm/plugins-application/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_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # 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,92 +132,120 @@ 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.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        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
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((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*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        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

+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+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" "$@"
@@ -13,8 +13,10 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,10 +27,14 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 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"

@@ -37,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+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.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

@@ -51,48 +57,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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
@@ -1,22 +1,2 @@
 repositories {
-    maven {
-        name 'GTNH Maven'
-        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-        allowInsecureProtocol
-    }
-    maven {
-        name 'ic2'
-        url 'https://maven.ic2.player.to/'
-        url 'https://maven2.ic2.player.to/'
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        url 'https://cursemaven.com'
-    }
-    maven {
-        url 'https://jitpack.io'
-    }
 }
@@ -1,11 +1,23 @@
+
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name "GTNH Maven"
+            url "https://nexus.gtnewhorizons.com/repository/public/"
+            mavenContent {
+                includeGroup("com.gtnewhorizons")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
 plugins {
-    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.44'
 }

-apply plugin: 'com.diffplug.blowdryerSetup'

-blowdryerSetup {
-// Pulls the spotless config from the example mod repository
-    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.4')
-    //devLocal '.' // Use this when testing config updates locally
-}
@@ -60,37 +60,37 @@ import cpw.mods.fml.common.Loader;

 public final class BotaniaAPI {

-	private static List<LexiconCategory> categories = new ArrayList<LexiconCategory>();
-	private static List<LexiconEntry> allEntries = new ArrayList<LexiconEntry>();
+	private static final List<LexiconCategory> categories = new ArrayList<>();
+	private static final List<LexiconEntry> allEntries = new ArrayList<>();

-	public static Map<String, KnowledgeType> knowledgeTypes = new HashMap<String, KnowledgeType>();
+	public static Map<String, KnowledgeType> knowledgeTypes = new HashMap<>();

-	public static Map<String, Brew> brewMap = new LinkedHashMap<String, Brew>();
+	public static Map<String, Brew> brewMap = new LinkedHashMap<>();
 	
-	public static List<String> disposableBlocks = new ArrayList<String>();
-	public static List<String> semiDisposableBlocks = new ArrayList<String>();
+	public static List<String> disposableBlocks = new ArrayList<>();
+	public static List<String> semiDisposableBlocks = new ArrayList<>();

-	public static List<RecipePetals> petalRecipes = new ArrayList<RecipePetals>();
-	public static List<RecipePureDaisy> pureDaisyRecipes = new ArrayList<RecipePureDaisy>();
-	public static List<RecipeManaInfusion> manaInfusionRecipes = new ArrayList<RecipeManaInfusion>();
-	public static List<RecipeRuneAltar> runeAltarRecipes = new ArrayList<RecipeRuneAltar>();
-	public static List<RecipeElvenTrade> elvenTradeRecipes = new ArrayList<RecipeElvenTrade>();
-	public static List<RecipeBrew> brewRecipes = new ArrayList<RecipeBrew>();
-	public static List<RecipeManaInfusion> miniFlowerRecipes = new ArrayList<RecipeManaInfusion>();
+	public static List<RecipePetals> petalRecipes = new ArrayList<>();
+	public static List<RecipePureDaisy> pureDaisyRecipes = new ArrayList<>();
+	public static List<RecipeManaInfusion> manaInfusionRecipes = new ArrayList<>();
+	public static List<RecipeRuneAltar> runeAltarRecipes = new ArrayList<>();
+	public static List<RecipeElvenTrade> elvenTradeRecipes = new ArrayList<>();
+	public static List<RecipeBrew> brewRecipes = new ArrayList<>();
+	public static List<RecipeManaInfusion> miniFlowerRecipes = new ArrayList<>();

-	private static BiMap<String, Class<? extends SubTileEntity>> subTiles = HashBiMap.<String, Class<? extends SubTileEntity>> create();
-	private static Map<Class<? extends SubTileEntity>, SubTileSignature> subTileSignatures = new HashMap<Class<? extends SubTileEntity>, SubTileSignature>();
-	public static Set<String> subtilesForCreativeMenu = new LinkedHashSet();
-	public static Map<String, String> subTileMods = new HashMap<String, String>();
-	public static BiMap<String, String> miniFlowers = HashBiMap.<String, String> create();
+	private static final BiMap<String, Class<? extends SubTileEntity>> subTiles = HashBiMap.create();
+	private static final Map<Class<? extends SubTileEntity>, SubTileSignature> subTileSignatures = new HashMap<>();
+	public static Set<String> subtilesForCreativeMenu = new LinkedHashSet<>();
+	public static Map<String, String> subTileMods = new HashMap<>();
+	public static BiMap<String, String> miniFlowers = HashBiMap.create();

-	public static Map<String, Integer> oreWeights = new HashMap<String, Integer>();
-	public static Map<String, Integer> oreWeightsNether = new HashMap<String, Integer>();
-	public static Map<Item, Block> seeds = new HashMap();
-	public static Set<Item> looniumBlacklist = new LinkedHashSet<Item>();
-	public static Set<Block> paintableBlocks = new LinkedHashSet<Block>();
-	public static Set<String> magnetBlacklist = new LinkedHashSet<String>();
-	public static Set<Class<? extends Entity>> gravityRodBlacklist = new LinkedHashSet<Class<? extends Entity>>();
+	public static Map<String, Integer> oreWeights = new HashMap<>();
+	public static Map<String, Integer> oreWeightsNether = new HashMap<>();
+	public static Map<Item, Block> seeds = new HashMap<>();
+	public static Set<Item> looniumBlacklist = new LinkedHashSet<>();
+	public static Set<Block> paintableBlocks = new LinkedHashSet<>();
+	public static Set<String> magnetBlacklist = new LinkedHashSet<>();
+	public static Set<Class<? extends Entity>> gravityRodBlacklist = new LinkedHashSet<>();

 	public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", 16, new int[] { 2, 6, 5, 2 }, 18);
 	public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20);
@@ -108,7 +108,7 @@ public final class BotaniaAPI {
 	public static KnowledgeType basicKnowledge;
 	public static KnowledgeType elvenKnowledge;

-	// This is here for completeness sake, but you shouldn't use it
+	// This is here for completeness’s sake, but you shouldn't use it
 	public static KnowledgeType relicKnowledge;

 	// All of these categories are initialized during botania's PreInit stage.
@@ -290,14 +290,14 @@ public final class BotaniaAPI {
 		return fallbackBrew;
 	}

-	/*
+	/**
 	 * Registers a Block as disposable using its Ore Dictionary Name.
 	 */
 	public static void registerDisposableBlock(String oreDictName) {
 		disposableBlocks.add(oreDictName);
 	}
 	
-	/*
+	/**
 	 * Registers a Block as semi disposable using its Ore Dictionary Name.
 	 * This means it will not be trashed when sneaking.
 	 */
@@ -313,19 +313,19 @@ public final class BotaniaAPI {
 		return paintable;
 	}

-	/*
+	/**
 	 * Blacklists an Entity from being affected by the Rod of the Shaded Mesa.
 	 * Pass in the class for the Entity, e.g. EntityCow.class
 	 */
-	public static void blacklistEntityFromGravityRod(Class entity) {
+	public static void blacklistEntityFromGravityRod(Class<? extends Entity> entity) {
 		gravityRodBlacklist.add(entity);
 	}
 	
-	/*
+	/**
 	 * Checks if the provided Entity is contained in the Blacklist.
 	 * Pass in the class for the Entity, e.g. entity.getClass()
 	 */
-	public static boolean isEntityBlacklistedFromGravityRod(Class entity) {
+	public static boolean isEntityBlacklistedFromGravityRod(Class<? extends Entity> entity) {
 		return gravityRodBlacklist.contains(entity);
 	}
 	
@@ -476,7 +476,7 @@ public final class BotaniaAPI {
 	/**
 	 * Registers a Brew Recipe (for the Botanical Brewery).
 	 * @param brew The brew in to be set in this recipe.
-	 * @inputs The items used in the recipe, no more than 6.
+	 * @param inputs The items used in the recipe, no more than 6.
 	 */
 	public static RecipeBrew registerBrewRecipe(Brew brew, Object... inputs) {
 		RecipeBrew recipe = new RecipeBrew(brew, inputs);
@@ -592,7 +592,7 @@ public final class BotaniaAPI {
 	 * https://gist.github.com/Vazkii/9493322
 	 */
 	public static void addOreWeightNether(String ore, int weight) {
-		if(ore.contains("Nether") && OreDictionary.getOres(ore.replace("Nether", "")).size() == 0)
+		if(ore.contains("Nether") && OreDictionary.getOres(ore.replace("Nether", "")).isEmpty())
 			return;

 		oreWeightsNether.put(ore, weight);
@@ -634,7 +634,7 @@ public final class BotaniaAPI {
 	 */
 	public static List<IRecipe> getLatestAddedRecipes(int x) {
 		List<IRecipe> list = CraftingManager.getInstance().getRecipeList();
-		List<IRecipe> newList = new ArrayList();
+		List<IRecipe> newList = new ArrayList<>();
 		for(int i = x - 1; i >= 0; i--)
 			newList.add(list.get(list.size() - 1 - i));

@@ -42,7 +42,7 @@ public class Brew {
 		this.name = name;
 		this.color = color;
 		this.cost = cost;
-		this.effects = new ArrayList(Arrays.asList(effects));
+		this.effects = new ArrayList<>(Arrays.asList(effects));
 	}

 	/**
@@ -29,9 +29,9 @@ import vazkii.botania.api.BotaniaAPI;

 public final class CorporeaHelper {

-	private static final List<IInventory> empty = Collections.unmodifiableList(new ArrayList());
-	private static final WeakHashMap<List<ICorporeaSpark>, List<IInventory>> cachedNetworks = new WeakHashMap();
-	private static final List<ICorporeaAutoCompleteController> autoCompleteControllers = new ArrayList<ICorporeaAutoCompleteController>();
+	private static final List<IInventory> empty = Collections.unmodifiableList(new ArrayList<>());
+	private static final WeakHashMap<List<ICorporeaSpark>, List<IInventory>> cachedNetworks = new WeakHashMap<>();
+	private static final List<ICorporeaAutoCompleteController> autoCompleteControllers = new ArrayList<>();

 	private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]");

@@ -64,7 +64,7 @@ public final class CorporeaHelper {
 				return cache;
 		}

-		List<IInventory> inventories = new ArrayList();
+		List<IInventory> inventories = new ArrayList<>();
 		if(network != null)
 			for(ICorporeaSpark otherSpark : network)
 				if(otherSpark != null) {
@@ -125,7 +125,7 @@ public final class CorporeaHelper {
 	 * called instead if the context for this exists to avoid having to get the value again.
 	 */
 	public static Map<IInventory, Integer> getInventoriesWithItemInNetwork(ItemStack stack,List<IInventory> inventories, boolean checkNBT) {
-		Map<IInventory, Integer> countMap = new HashMap<IInventory, Integer>();
+		Map<IInventory, Integer> countMap = new HashMap<>();
 		List<IWrappedInventory> wrappedInventories = BotaniaAPI.internalHandler.wrapInventory(inventories);
 		for (IWrappedInventory inv : wrappedInventories) {
 			CorporeaRequest request = new CorporeaRequest(stack, checkNBT, -1);
@@ -166,14 +166,14 @@ public final class CorporeaHelper {
 	 * purposes of counting huge amounts.
 	 */
 	public static List<ItemStack> requestItem(Object matcher, int itemCount, ICorporeaSpark spark, boolean checkNBT, boolean doit) {
-		List<ItemStack> stacks = new ArrayList<ItemStack>();
+		List<ItemStack> stacks = new ArrayList<>();
 		CorporeaRequestEvent event = new CorporeaRequestEvent(matcher, itemCount, spark, checkNBT, doit);
 		if(MinecraftForge.EVENT_BUS.post(event))
 			return stacks;

 		List<IInventory> inventories = getInventoriesOnNetwork(spark);
 		List<IWrappedInventory> inventoriesW = BotaniaAPI.internalHandler.wrapInventory(inventories);
-		Map<ICorporeaInterceptor, ICorporeaSpark> interceptors = new HashMap<ICorporeaInterceptor, ICorporeaSpark>();
+		Map<ICorporeaInterceptor, ICorporeaSpark> interceptors = new HashMap<>();

 		CorporeaRequest request = new CorporeaRequest(matcher, checkNBT, itemCount);
 		for(IWrappedInventory inv : inventoriesW) {
@@ -39,12 +39,12 @@ public class DummyManaNetwork implements IManaNetwork {

 	@Override
 	public List<TileSignature> getAllCollectorsInWorld(World world) {
-		return new ArrayList();
+		return new ArrayList<>();
 	}

 	@Override
 	public List<TileSignature> getAllPoolsInWorld(World world) {
-		return new ArrayList();
+		return new ArrayList<>();
 	}

 }
@@ -20,7 +20,7 @@ public final class VanillaPacketDispatcher {

 	public static void dispatchTEToNearbyPlayers(TileEntity tile) {
 		World world = tile.getWorldObj();
-		List players = world.playerEntities;
+		List<?> players = world.playerEntities;
 		for(Object player : players)
 			if(player instanceof EntityPlayerMP) {
 				EntityPlayerMP mp = (EntityPlayerMP) player;
@@ -0,0 +1,13 @@
+package vazkii.botania.api.item;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+/**
+ * An item that implements this will allow some custom render. This will be called while the item is in the inventory,
+ * armor slot or bauble slots.
+ */
+public interface IInWorldRenderable
+{
+    public void renderInWorld(EntityPlayer player, ItemStack stack);
+}
@@ -20,7 +20,7 @@ public class LexiconCategory implements Comparable<LexiconCategory> {
 	private static int count = 0;

 	public final String unlocalizedName;
-	public final List<LexiconEntry> entries = new ArrayList<LexiconEntry>();
+	public final List<LexiconEntry> entries = new ArrayList<>();
 	private final int sortingId;
 	private ResourceLocation icon;
 	private int priority = 5;
@@ -27,11 +27,11 @@ public class LexiconEntry implements Comparable<LexiconEntry> {

 	private KnowledgeType type = BotaniaAPI.basicKnowledge;

-	public List<LexiconPage> pages = new ArrayList<LexiconPage>();
+	public List<LexiconPage> pages = new ArrayList<>();
 	private boolean priority = false;
 	private ItemStack icon = null;
 	
-	private List<ItemStack> extraDisplayedRecipes = new ArrayList();
+	private List<ItemStack> extraDisplayedRecipes = new ArrayList<>();

 	/**
 	 * @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display.
@@ -126,12 +126,12 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
 	}

 	public List<ItemStack> getDisplayedRecipes() {
-		ArrayList<ItemStack> list = new ArrayList();
+		ArrayList<ItemStack> list = new ArrayList<>();
 		for(LexiconPage page : pages) {
 			List<ItemStack> l = page.getDisplayedRecipes();

 			if(l != null) {
-				ArrayList<ItemStack> itemsAddedThisPage = new ArrayList();
+				ArrayList<ItemStack> itemsAddedThisPage = new ArrayList<>();

 				for(ItemStack s : l) {
 					addItem: {
@@ -23,7 +23,7 @@ import vazkii.botania.api.mana.IManaItem;
 */
 public final class LexiconRecipeMappings {

-	private static Map<String, EntryData> mappings = new HashMap();
+	private static Map<String, EntryData> mappings = new HashMap<>();

 	/**
 	 * Maps the given stack to the given page of the entry.
@@ -23,7 +23,7 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
 */
 public interface IMultiblockRenderHook {

-	public static Map<Block, IMultiblockRenderHook> renderHooks = new HashMap();
+	public static Map<Block, IMultiblockRenderHook> renderHooks = new HashMap<>();

 	public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, Block block, int meta, RenderBlocks renderBlocks, MultiblockComponent comp, float alpha);

@@ -15,10 +15,15 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;

+import cpw.mods.fml.common.FMLLog;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
+import org.apache.logging.log4j.Level;
+import vazkii.botania.api.lexicon.multiblock.compat.MultiblockCompatRegistry;
 import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
+import vazkii.botania.common.Botania;

 /**
 * This class describes a Mutiblock object. It's used to display a
@@ -27,22 +32,26 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
 */
 public class Multiblock {

-	public List<MultiblockComponent> components = new ArrayList();
-	public List<ItemStack> materials = new ArrayList();
+	public List<MultiblockComponent> components = new ArrayList<>();
+	public List<ItemStack> materials = new ArrayList<>();

 	public int minX, minY, minZ, maxX, maxY, maxZ, offX, offY, offZ;

-	public HashMap<List<Integer>, MultiblockComponent> locationCache = new HashMap<List<Integer>, MultiblockComponent>();
+	public HashMap<List<Integer>, MultiblockComponent> locationCache = new HashMap<>();

 	/**
 	 * Adds a multiblock component to this multiblock. The component's x y z
 	 * coords should be pivoted to the center of the structure.
 	 */
 	public void addComponent(MultiblockComponent component) {
-		if(getComponentForLocation(component.relPos.posX, component.relPos.posY, component.relPos.posZ) != null)
-			throw new IllegalArgumentException("Location in multiblock already occupied");
+		ChunkCoordinates pos = component.relPos;
+		if(getComponentForLocation(pos.posX, pos.posY, pos.posZ) != null) {
+			MultiblockComponent comp = getComponentForLocation(pos.posX, pos.posY, pos.posZ);
+			throw new IllegalArgumentException(
+					"Location in multiblock {x=" + pos.posX + " y=" + pos.posY + " z=" + pos.posZ + "} already occupied by block " + comp.getBlock().getLocalizedName());
+		}
 		components.add(component);
-		changeAxisForNewComponent(component.relPos.posX, component.relPos.posY, component.relPos.posZ);
+		changeAxisForNewComponent(pos.posX, pos.posY, pos.posZ);
 		calculateCostForNewComponent(component);
 		addComponentToLocationCache(component);
 	}
@@ -138,6 +147,28 @@ public class Multiblock {
 		return blocks;
 	}

+	public <T extends TileEntity> MultiblockSet makeSetRegisterStructure(
+			Class<T> controllerTileClass, Block controllerBlock, MultiblockComponent... extra
+	) {
+		registerStructure(controllerTileClass, controllerBlock, extra);
+		return makeSet();
+	}
+
+	public <T extends TileEntity> void registerStructure(
+			Class<T> controllerTileClass, Block controllerBlock, MultiblockComponent... extra
+	) {
+		if (Botania.structureLibLoaded) {
+			try {
+				MultiblockCompatRegistry.registerMultiblock(
+						this, controllerTileClass, controllerBlock, extra
+				);
+			} catch (Exception e) {
+				e.printStackTrace();
+				FMLLog.log(Level.ERROR, "Failed to load a Botania Multiblock into StructureLib.");
+			}
+		}
+	}
+
 	/**
 	 * Makes a MultiblockSet from this Multiblock and its rotations using
 	 * createRotations().
@@ -176,7 +207,7 @@ public class Multiblock {
 				pos.posX,
 				pos.posY,
 				pos.posZ
-				),  comp);
+		),  comp);
 	}

 	/**
@@ -0,0 +1,228 @@
+package vazkii.botania.api.lexicon.multiblock.compat;
+
+import com.gtnewhorizon.structurelib.alignment.constructable.IMultiblockInfoContainer;
+import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureUtility;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChunkCoordinates;
+import vazkii.botania.api.lexicon.multiblock.Multiblock;
+import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Only gets loaded if StructureLib is present inside the Modpack
+ */
+public class MultiblockCompatRegistry {
+
+    public static <T extends TileEntity> void registerMultiblock(
+            Multiblock mb, Class<T> controllerTileClass,
+            Block controllerBlock,
+            MultiblockComponent... extra
+    ) {
+        List<MultiblockComponent> components = mb.getComponents();
+        if (extra.length != 0) {
+            components = new ArrayList<>(components);
+            Collections.addAll(components, extra);
+        }
+
+        Map<Integer, RawStructureData> structureDataMap = new HashMap<>();
+        int min_x = Integer.MAX_VALUE, max_x = Integer.MIN_VALUE;
+        int min_y = Integer.MAX_VALUE, max_y = Integer.MIN_VALUE;
+        int min_z = Integer.MAX_VALUE, max_z = Integer.MIN_VALUE;
+
+        char ch = 'a';
+        for (MultiblockComponent component : components) {
+            int hash = getHash(component.getBlock(), component.getMeta());
+            ChunkCoordinates pos = component.getRelativePosition();
+            RawStructureData structureData = structureDataMap.get(hash);
+            if (structureData == null) {
+                List<ChunkCoordinates> coordinates = new ArrayList<>();
+                structureData = new RawStructureData(
+                        coordinates,
+                        component.getBlock(),
+                        component.getMeta(),
+                        ch++
+                );
+                structureDataMap.put(hash, structureData);
+            }
+            structureData.getPositions().add(pos);
+
+            min_x = Math.min(min_x, pos.posX); max_x = Math.max(max_x, pos.posX);
+            min_y = Math.min(min_y, pos.posY); max_y = Math.max(max_y, pos.posY);
+            min_z = Math.min(min_z, pos.posZ); max_z = Math.max(max_z, pos.posZ);
+        }
+
+        int x_size = max_x - min_x + 1;
+        int y_size = max_y - min_y + 1;
+        int z_size = max_z - min_z + 1;
+
+        //Data is saved in [z][y][x] format
+        String[][] stringData = new String[z_size][y_size];
+
+        char[] buffer = new char[x_size];
+        Arrays.fill(buffer, ' ');
+        //Since Strings and their content are immutable, this is fine.
+        String filledWithSpaces = new String(buffer);
+        for (int z = 0; z < z_size; z++) {
+            for (int y = 0; y < y_size; y++) {
+                stringData[z][y] = filledWithSpaces;
+            }
+        }
+
+        int controller_x = 0, controller_y = 0, controller_z = 0;
+        StringBuilder builder = new StringBuilder(x_size);
+        for (RawStructureData data : structureDataMap.values()) {
+            for (ChunkCoordinates pos : data.getPositions()) {
+                int x = pos.posX - min_x;
+                int z = pos.posZ - min_z;
+                //Data has to get flipped
+                int y = (stringData[z].length - 1) - (pos.posY - min_y);
+
+                if (data.getBlock() == controllerBlock) {
+                    controller_x = x;
+                    controller_y = y;
+                    controller_z = z;
+                }
+
+                String s = stringData[z][y];
+                builder.append(s);
+                builder.setCharAt(x, data.getBlockIdentifier());
+                stringData[z][y] = builder.toString();
+                builder.setLength(0);
+            }
+        }
+
+        StructureDefinition.Builder<? super T> structureBuilder = IStructureDefinition.builder()
+                .addShape("main", stringData);
+
+        for (RawStructureData data : structureDataMap.values()) {
+            structureBuilder.addElement(
+                    data.getBlockIdentifier(),
+                    StructureUtility.ofBlock(
+                            data.getBlock(),
+                            data.getMetadata()
+                    )
+            );
+        }
+
+        IMultiblockInfoContainer.registerTileClass(
+                controllerTileClass,
+                new BotaniaMultiblockInfoContainer<>(
+                        structureBuilder.build(),
+                        controller_x,
+                        controller_y,
+                        controller_z
+                )
+        );
+    }
+
+    private static int getHash(Block block, int metadata) {
+        return block.hashCode() * 31 + metadata;
+    }
+
+
+    private static class BotaniaMultiblockInfoContainer<T extends TileEntity> implements IMultiblockInfoContainer<T> {
+
+        private final IStructureDefinition<? super T> structure;
+        private final int x_offset, y_offset, z_offset;
+
+        public BotaniaMultiblockInfoContainer(
+                IStructureDefinition<? super T> structure,
+                int x_offset, int y_offset, int z_offset
+        ) {
+            this.structure = structure;
+            this.x_offset = x_offset;
+            this.y_offset = y_offset;
+            this.z_offset = z_offset;
+        }
+
+        @Override
+        public void construct(ItemStack stackSize, boolean hintsOnly, T tileEntity, ExtendedFacing aSide) {
+            structure.buildOrHints(
+                    tileEntity,
+                    stackSize,
+                    "main",
+                    tileEntity.getWorldObj(),
+                    noSideWay(aSide),
+                    tileEntity.xCoord,
+                    tileEntity.yCoord,
+                    tileEntity.zCoord,
+                    x_offset,
+                    y_offset,
+                    z_offset,
+                    hintsOnly
+            );
+        }
+
+        @Override
+        public int survivalConstruct(ItemStack stackSize, int elementBudge, ISurvivalBuildEnvironment env, T tileEntity, ExtendedFacing aSide) {
+            return structure.survivalBuild(
+                    tileEntity,
+                    stackSize,
+                    "main",
+                    tileEntity.getWorldObj(),
+                    noSideWay(aSide),
+                    tileEntity.xCoord,
+                    tileEntity.yCoord,
+                    tileEntity.zCoord,
+                    x_offset,
+                    y_offset,
+                    z_offset,
+                    elementBudge,
+                    env,
+                    false
+            );
+        }
+
+        @Override
+        public String[] getDescription(ItemStack stackSize) {
+            return new String[0];
+        }
+
+        private static ExtendedFacing noSideWay(ExtendedFacing aSide) {
+            return aSide.getDirection().offsetY != 0 ? ExtendedFacing.DEFAULT : aSide.getOppositeDirection();
+        }
+    }
+
+    private static class RawStructureData {
+        private final List<ChunkCoordinates> positions;
+        private final char identifier;
+        private final Block block;
+        private final int metadata;
+
+        public RawStructureData(List<ChunkCoordinates> positions, Block block, int metadata, char identifier) {
+            this.positions = positions;
+            this.identifier = identifier;
+            this.block = block;
+            this.metadata = metadata;
+        }
+
+        public Block getBlock() {
+            return block;
+        }
+
+        public int getMetadata() {
+            return metadata;
+        }
+
+        public List<ChunkCoordinates> getPositions() {
+            return positions;
+        }
+
+        public char getBlockIdentifier() {
+            return identifier;
+        }
+    }
+}
@@ -39,7 +39,7 @@ public class MultiblockComponent {
 	}

 	public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, TileEntity tileEntity) {
-		this(relPos, block, meta, block.hasTileEntity() == (tileEntity != null), tileEntity);
+		this(relPos, block, meta, block.hasTileEntity(0) == (tileEntity != null), tileEntity);
 	}

 	public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, boolean doFancyRender, TileEntity tileEntity) {
@@ -23,10 +23,9 @@ public final class SparkHelper {
 		return SparkHelper.getEntitiesAround(ISparkEntity.class, world, x, y, z);
 	}

-	public static <T> List<T> getEntitiesAround(Class<? extends T> clazz, World world, double x, double y, double z) {
+	public static <T> List<T> getEntitiesAround(Class<T> clazz, World world, double x, double y, double z) {
 		int r = SPARK_SCAN_RANGE;
-		List<T> entities = world.getEntitiesWithinAABB(clazz, AxisAlignedBB.getBoundingBox(x - r, y - r, z - r, x + r, y + r, z + r));
-		return entities;
+        return world.getEntitiesWithinAABB(clazz, AxisAlignedBB.getBoundingBox(x - r, y - r, z - r, x + r, y + r, z + r));
 	}

 }
@@ -28,7 +28,7 @@ public class RecipeBrew {
 	public RecipeBrew(Brew brew, Object... inputs) {
 		this.brew = brew;

-		List<Object> inputsToSet = new ArrayList();
+		List<Object> inputsToSet = new ArrayList<>();
 		for(Object obj : inputs) {
 			if(obj instanceof String || obj instanceof ItemStack)
 				inputsToSet.add(obj);
@@ -39,7 +39,7 @@ public class RecipeBrew {
 	}

 	public boolean matches(IInventory inv) {
-		List<Object> inputsMissing = new ArrayList(inputs);
+		List<Object> inputsMissing = new ArrayList<>(inputs);

 		for(int i = 0; i < inv.getSizeInventory(); i++) {
 			ItemStack stack = inv.getStackInSlot(i);
@@ -92,7 +92,7 @@ public class RecipeBrew {
 	}

 	public List<Object> getInputs() {
-		return new ArrayList(inputs);
+		return new ArrayList<>(inputs);
 	}

 	public Brew getBrew() {
@@ -14,7 +14,7 @@ public class RecipeElvenTrade {
 	public RecipeElvenTrade(ItemStack output, Object... inputs) {
 		this.output = output;

-		List<Object> inputsToSet = new ArrayList();
+		List<Object> inputsToSet = new ArrayList<>();
 		for(Object obj : inputs) {
 			if(obj instanceof String || obj instanceof ItemStack)
 				inputsToSet.add(obj);
@@ -25,8 +25,8 @@ public class RecipeElvenTrade {
 	}

 	public boolean matches(List<ItemStack> stacks, boolean remove) {
-		List<Object> inputsMissing = new ArrayList(inputs);
-		List<ItemStack> stacksToRemove = new ArrayList();
+		List<Object> inputsMissing = new ArrayList<>(inputs);
+		List<ItemStack> stacksToRemove = new ArrayList<>();

 		for(ItemStack stack : stacks) {
 			if(stack == null) {
@@ -43,11 +43,7 @@ public class RecipeElvenTrade {
 					List<ItemStack> validStacks = OreDictionary.getOres((String) input);
 					boolean found = false;
 					for(ItemStack ostack : validStacks) {
-						ItemStack cstack = ostack.copy();
-						if(cstack.getItemDamage() == Short.MAX_VALUE)
-							cstack.setItemDamage(stack.getItemDamage());
-
-						if(stack.isItemEqual(cstack)) {
+						if(OreDictionary.itemMatches(ostack, stack, false)) {
 							if(!stacksToRemove.contains(stack))
 								stacksToRemove.add(stack);
 							oredictIndex = j;
@@ -84,7 +80,7 @@ public class RecipeElvenTrade {
 	}

 	public List<Object> getInputs() {
-		return new ArrayList(inputs);
+		return new ArrayList<>(inputs);
 	}

 	public ItemStack getOutput() {
@@ -25,7 +25,7 @@ public class RecipePetals {
 	public RecipePetals(ItemStack output, Object... inputs) {
 		this.output = output;

-		List<Object> inputsToSet = new ArrayList();
+		List<Object> inputsToSet = new ArrayList<>();
 		for(Object obj : inputs) {
 			if(obj instanceof String || obj instanceof ItemStack)
 				inputsToSet.add(obj);
@@ -36,7 +36,7 @@ public class RecipePetals {
 	}

 	public boolean matches(IInventory inv) {
-		List<Object> inputsMissing = new ArrayList(inputs);
+		List<Object> inputsMissing = new ArrayList<>(inputs);

 		for(int i = 0; i < inv.getSizeInventory(); i++) {
 			ItemStack stack = inv.getStackInSlot(i);
@@ -86,7 +86,7 @@ public class RecipePetals {
 	}

 	public List<Object> getInputs() {
-		return new ArrayList(inputs);
+		return new ArrayList<>(inputs);
 	}

 	public ItemStack getOutput() {
@@ -10,10 +10,6 @@
 */
 package vazkii.botania.api.recipe;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
@@ -22,8 +18,6 @@ import vazkii.botania.api.subtile.SubTileEntity;

 public class RecipePureDaisy {

-	private static final Map<String, List<ItemStack>> oreMap = new HashMap();
-
 	Object input;
 	Block output;
 	int outputMeta;
@@ -53,21 +47,10 @@ public class RecipePureDaisy {
 		if(stack == null || stack.getItem() == null)
 			return false;

-		List<ItemStack> ores;
-		if(oreMap.containsKey(entry))
-			ores = oreMap.get(entry);
-		else {
-			ores = OreDictionary.getOres(entry);
-			oreMap.put(entry, ores);
-		}
-
-		for(ItemStack ostack : ores) {
-			ItemStack cstack = ostack.copy();
-			if(cstack.getItemDamage() == Short.MAX_VALUE)
-				cstack.setItemDamage(stack.getItemDamage());
-
-			if(stack.isItemEqual(cstack))
+		for(ItemStack ostack : OreDictionary.getOres(entry, false)) {
+			if(OreDictionary.itemMatches(ostack, stack, false)) {
 				return true;
+			}
 		}

 		return false;
@@ -21,7 +21,7 @@ public class WikiHooks {

 	private static final IWikiProvider FALLBACK_PROVIDER = new SimpleWikiProvider("FTB Wiki", "http://ftb.gamepedia.com/%s");

-	private static final Map<String, IWikiProvider> modWikis = new HashMap();
+	private static final Map<String, IWikiProvider> modWikis = new HashMap<>();

 	public static IWikiProvider getWikiFor(Block block) {
 		UniqueIdentifier mod = GameRegistry.findUniqueIdentifierFor(block);
@@ -25,12 +25,12 @@ import vazkii.botania.common.lib.LibBlockNames;

 public final class ModChallenges {

-	public static final EnumMap<EnumChallengeLevel, List<Challenge>> challenges = new EnumMap(EnumChallengeLevel.class);
-	public static final HashMap<String, Challenge> challengeLookup = new HashMap();
+	public static final EnumMap<EnumChallengeLevel, List<Challenge>> challenges = new EnumMap<>(EnumChallengeLevel.class);
+	public static final HashMap<String, Challenge> challengeLookup = new HashMap<>();

 	public static void init() {
 		for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants())
-			challenges.put(level, new ArrayList());
+			challenges.put(level, new ArrayList<>());

 		addChallenge(EnumChallengeLevel.EASY, "flowerFarm", new ItemStack(ModBlocks.flower, 1, 6));
 		addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.record_13));
@@ -29,6 +29,7 @@ import org.lwjgl.opengl.GL11;

 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider;
+import vazkii.botania.api.item.IInWorldRenderable;
 import vazkii.botania.api.item.IWireframeCoordinateListProvider;
 import vazkii.botania.api.wand.ICoordBoundItem;
 import vazkii.botania.api.wand.IWireframeAABBProvider;
@@ -36,6 +37,10 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;

 public final class BoundTileRenderer {

+	public static int getWireframeColor(){
+		return Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F);
+	}
+
 	@SubscribeEvent
 	public void onWorldRenderLast(RenderWorldLastEvent event) {
 		GL11.glPushMatrix();
@@ -49,7 +54,7 @@ public final class BoundTileRenderer {

 		EntityPlayer player = Minecraft.getMinecraft().thePlayer;
 		ItemStack stack = player.getCurrentEquippedItem();
-		int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F);
+		int color = getWireframeColor();
 		if(stack != null && stack.getItem() instanceof ICoordBoundItem) {
 			ChunkCoordinates coords = ((ICoordBoundItem) stack.getItem()).getBinding(stack);
 			if(coords != null)
@@ -82,6 +87,11 @@ public final class BoundTileRenderer {
 						renderBlockOutlineAt(coords, color, 5F);
 				}
 			}
+			if(stackInSlot != null && stackInSlot.getItem() instanceof IInWorldRenderable) {
+				IInWorldRenderable provider = (IInWorldRenderable) stackInSlot.getItem();
+				provider.renderInWorld(player,stackInSlot);
+			}
+
 		}

 		GL11.glEnable(GL11.GL_DEPTH_TEST);
@@ -78,7 +78,7 @@ public class ClientTickHandler {
 				if(player != null) {
 					ItemStack stack = player.getCurrentEquippedItem();
 					if(stack != null && stack.getItem() instanceof ItemTwigWand) {
-						List<TileSignature> list = new ArrayList(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld));
+						List<TileSignature> list = new ArrayList<>(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld));
 						for(TileSignature sig : list) {
 							if(!sig.remoteWorld)
 								continue;
@@ -68,7 +68,7 @@ public final class ContributorFancinessHandler {
 	}

 	public static void load(Properties props) {
-		flowerMap = new HashMap();
+		flowerMap = new HashMap<>();
 		for(String key : props.stringPropertyNames()) {
 			String value = props.getProperty(key);

@@ -39,10 +39,10 @@ public class CorporeaAutoCompleteHandler {

 	boolean isAutoCompleted = false;
 	String originalString = "";
-	List<CompletionData> completions = new ArrayList<CompletionData>();
+	List<CompletionData> completions = new ArrayList<>();
 	int position;

-	static TreeSet<String> itemNames = new TreeSet<String>(
+	static TreeSet<String> itemNames = new TreeSet<>(
 			new Comparator<String>() {
 				@Override
 				public int compare(String arg0, String arg1) {
@@ -55,7 +55,7 @@ public class CorporeaAutoCompleteHandler {
 	public static void updateItemList() {
 		itemNames.clear();
 		Iterator<Item> iterator = Item.itemRegistry.iterator();
-		ArrayList<ItemStack> curList = new ArrayList<ItemStack>();
+		ArrayList<ItemStack> curList = new ArrayList<>();

 		while(iterator.hasNext()) {
 			Item item = iterator.next();
@@ -144,9 +144,9 @@ public class CorporeaAutoCompleteHandler {
 	private ArrayList<CompletionData> getNames(String prefix) {
 		String s = prefix.trim();
 		if(s.isEmpty())
-			return new ArrayList();
+			return new ArrayList<>();
 				
-		TreeSet<CompletionData> result = new TreeSet<CompletionData>();
+		TreeSet<CompletionData> result = new TreeSet<>();
 		String[] words = s.split(" ");
 		int i = words.length - 1;
 		String curPrefix = words[i];
@@ -156,11 +156,11 @@ public class CorporeaAutoCompleteHandler {
 			if(i >= 0)
 				curPrefix = words[i] + " " + curPrefix;
 		}
-		return new ArrayList<CompletionData>(result);
+		return new ArrayList<>(result);
 	}

 	private List<CompletionData> getNamesStartingWith(String prefix) {
-		ArrayList<CompletionData> result = new ArrayList<CompletionData>();
+		ArrayList<CompletionData> result = new ArrayList<>();
 		int length = prefix.length();
 		SortedSet<String> after = itemNames.tailSet(prefix);
 		for(String str : after) {
@@ -35,7 +35,7 @@ public final class DebugHandler {
 	@SubscribeEvent
 	public void onDrawDebugText(RenderGameOverlayEvent.Text event) {
 		World world = Minecraft.getMinecraft().theWorld;
-		if(Minecraft.getMinecraft().gameSettings.showDebugInfo) {
+		if(Minecraft.getMinecraft().gameSettings.showDebugInfo && ConfigHandler.showF3Debug) {
 			event.left.add(null);
 			String version = LibMisc.VERSION;
 			if(version.contains("GRADLE"))
@@ -128,7 +128,7 @@ public final class HUDHandler {
 					renderCrystalCubeHUD(event.resolution, (TileCorporeaCrystalCube) tile);
 			}

-			if(!TileCorporeaIndex.getInputHandler().getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) {
+			if(!TileCorporeaIndex.InputHandler.getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) {
 				profiler.startSection("nearIndex");
 				renderNearIndexDisplay(event.resolution);
 				profiler.endSection();
@@ -2,6 +2,8 @@ package vazkii.botania.client.core.handler;

 import net.minecraft.client.settings.KeyBinding;
 import vazkii.botania.common.network.PacketHandler;
+import vazkii.botania.common.network.PacketLokiClear;
+import vazkii.botania.common.network.PacketLokiMirror;
 import vazkii.botania.common.network.PacketLokiToggle;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -13,10 +15,15 @@ import cpw.mods.fml.relauncher.SideOnly;

 public class KeyHandler {
    private static final KeyBinding keyToggleRingOfLoki= new KeyBinding("botaniamisc.toggleLoki", 0, "botaniamisc.keyCategory");
+    private static final KeyBinding keyRingOfLokiClear= new KeyBinding("botaniamisc.ringOfLokiClear", 0, "botaniamisc.keyCategory");
+    private static final KeyBinding keyRingOfLokiMirror= new KeyBinding("botaniamisc.ringOfLokiMirror", 0, "botaniamisc.keyCategory");

    public KeyHandler() {
        FMLCommonHandler.instance().bus().register(this);
        ClientRegistry.registerKeyBinding(keyToggleRingOfLoki);
+        ClientRegistry.registerKeyBinding(keyRingOfLokiClear);
+        ClientRegistry.registerKeyBinding(keyRingOfLokiMirror);
+
    }
    @SideOnly(Side.CLIENT)
    @SubscribeEvent
@@ -28,9 +35,22 @@ public class KeyHandler {
        if (keyToggleRingOfLoki.isPressed()){
            toggleRingLoki();
        }
+        if(keyRingOfLokiClear.isPressed()){
+            ringOfLokiClear();
+        }
+        if(keyRingOfLokiMirror.isPressed()){
+            toggleRingLokiMirroring();
+        }
    }

    private static void toggleRingLoki() {
        PacketHandler.INSTANCE.sendToServer(new PacketLokiToggle());
    }
+
+    private static void ringOfLokiClear() {
+        PacketHandler.INSTANCE.sendToServer(new PacketLokiClear());
+    }
+    private static void toggleRingLokiMirroring() {
+        PacketHandler.INSTANCE.sendToServer(new PacketLokiMirror());
+    }
 }
@@ -174,11 +174,11 @@ public class LightningHandler {

 	public static class LightningBolt {

-		public ArrayList<Segment> segments = new ArrayList<Segment>();
+		public ArrayList<Segment> segments = new ArrayList<>();
 		public Vector3 start;
 		public Vector3 end;
 		ChunkCoordinates target;
-		HashMap<Integer, Integer> splitparents = new HashMap<Integer, Integer>();
+		HashMap<Integer, Integer> splitparents = new HashMap<>();

 		public double length;
 		public int numsegments0;
@@ -195,7 +195,7 @@ public class LightningHandler {
 		private World world;
 		private Entity source;

-		public static ConcurrentLinkedQueue<LightningBolt> boltlist = new ConcurrentLinkedQueue<LightningBolt>();
+		public static ConcurrentLinkedQueue<LightningBolt> boltlist = new ConcurrentLinkedQueue<>();

 		public float speed = 1.5F;
 		public static final int fadetime = 20;
@@ -347,7 +347,7 @@ public class LightningHandler {
 				return;

 			ArrayList<Segment> oldsegments = segments;
-			segments = new ArrayList<Segment>();
+			segments = new ArrayList<>();

 			Segment prev = null;

@@ -428,7 +428,7 @@ public class LightningHandler {
 		}

 		private void calculateCollisionAndDiffs() {
-			HashMap<Integer, Integer> lastactivesegment = new HashMap<Integer, Integer>();
+			HashMap<Integer, Integer> lastactivesegment = new HashMap<>();

 			Collections.sort(segments, new SegmentSorter());

@@ -29,7 +29,7 @@ import vazkii.botania.common.item.ModItems;

 public final class RedStringRenderer {

-	public static final Queue<TileRedString> redStringTiles = new ArrayDeque();
+	public static final Queue<TileRedString> redStringTiles = new ArrayDeque<>();
 	static float sizeAlpha = 0F;

 	public static void renderAll() {
@@ -64,7 +64,7 @@ public final class TooltipAdditionDisplayHandler {
 					try {
 						tooltip = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips);
 					} catch(Exception e) {
-						tooltip = new ArrayList();
+						tooltip = new ArrayList<>();
 					}
 					int width = 0;
 					for(String s : tooltip)
@@ -14,6 +14,8 @@ import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;

+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import net.minecraft.client.renderer.OpenGlHelper;

 import org.apache.logging.log4j.Level;
@@ -33,6 +35,8 @@ public final class ShaderHelper {
 	private static final int VERT = ARBVertexShader.GL_VERTEX_SHADER_ARB;
 	private static final int FRAG = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB;

+	private static final Int2IntMap TIME_UNIFORM_LOCATIONS = new Int2IntOpenHashMap();
+
 	public static int pylonGlow = 0;
 	public static int enchanterRune = 0;
 	public static int manaPool = 0;
@@ -67,8 +71,8 @@ public final class ShaderHelper {
 		ARBShaderObjects.glUseProgramObjectARB(shader);

 		if(shader != 0) {
-			int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time");
-			ARBShaderObjects.glUniform1iARB(time, ClientTickHandler.ticksInGame);
+			int timeUniform = TIME_UNIFORM_LOCATIONS.computeIfAbsent(shader, s -> ARBShaderObjects.glGetUniformLocationARB(shader, "time"));
+			ARBShaderObjects.glUniform1iARB(timeUniform, ClientTickHandler.ticksInGame);

 			if(callback != null)
 				callback.call(shader);
@@ -124,7 +124,6 @@ import vazkii.botania.client.render.tile.RenderTileTerraPlate;
 import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu;
 import vazkii.botania.client.render.tile.RenderTileTinyPotato;
 import vazkii.botania.client.render.world.SkyblockRenderEvents;
-import vazkii.botania.common.Botania;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.TileAlfPortal;
 import vazkii.botania.common.block.tile.TileAltar;
@@ -384,7 +383,8 @@ public class ClientProxy extends CommonProxy {
 		super.setExtraReach(entity, reach);
 		Minecraft mc = Minecraft.getMinecraft();
 		EntityPlayer player = mc.thePlayer;
-		if(entity == player) {
+		// Player object might have changed, need to check the UUID.
+		if(entity.worldObj.isRemote && entity.getUniqueID().equals(player.getUniqueID())) {
 			if(!(mc.playerController instanceof IExtendedPlayerController)) {
 				GameType type = ReflectionHelper.getPrivateValue(PlayerControllerMP.class, mc.playerController, LibObfuscation.CURRENT_GAME_TYPE);
 				NetHandlerPlayClient net = ReflectionHelper.getPrivateValue(PlayerControllerMP.class, mc.playerController, LibObfuscation.NET_CLIENT_HANDLER);
@@ -31,8 +31,8 @@ public class FXSparkle extends EntityFX {

 	public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES);

-	public static Queue<FXSparkle> queuedRenders = new ArrayDeque();
-	public static Queue<FXSparkle> queuedCorruptRenders = new ArrayDeque();
+	public static Queue<FXSparkle> queuedRenders = new ArrayDeque<>();
+	public static Queue<FXSparkle> queuedCorruptRenders = new ArrayDeque<>();

 	// Queue values
 	float f;
@@ -31,8 +31,8 @@ public class FXWisp extends EntityFX {

 	public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE);

-	public static Queue<FXWisp> queuedRenders = new ArrayDeque();
-	public static Queue<FXWisp> queuedDepthIgnoringRenders = new ArrayDeque();
+	public static Queue<FXWisp> queuedRenders = new ArrayDeque<>();
+	public static Queue<FXWisp> queuedDepthIgnoringRenders = new ArrayDeque<>();

 	// Queue values
 	float f;
@@ -20,7 +20,7 @@ import cpw.mods.fml.client.config.GuiConfig;
 public class GuiBotaniaConfig extends GuiConfig {

 	public GuiBotaniaConfig(GuiScreen parentScreen) {
-		super(parentScreen, new ConfigElement(ConfigHandler.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), LibMisc.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath(ConfigHandler.config.toString()));
+		super(parentScreen, new ConfigElement<>(ConfigHandler.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), LibMisc.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath(ConfigHandler.config.toString()));
 	}

 }
@@ -27,7 +27,7 @@ public class SlotLocked extends Slot {
 	}

 	@Override
-	public boolean isItemValid(ItemStack p_75214_1_) {
+	public boolean isItemValid(ItemStack stack) {
 		return false;
 	}

@@ -1,99 +0,0 @@
-/**
- * This class was created by <Vazkii>. It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- * 
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- * 
- * File Created @ [Mar 16, 2015, 6:42:40 PM (GMT)]
- */
-package vazkii.botania.client.gui.bag;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import vazkii.botania.client.gui.SlotLocked;
-
-public class ContainerFlowerBag extends Container {
-
-	InventoryFlowerBag flowerBagInv;
-
-	public ContainerFlowerBag(EntityPlayer player) {
-		int i;
-		int j;
-
-		int slot = player.inventory.currentItem;
-		IInventory playerInv = player.inventory;
-		flowerBagInv = new InventoryFlowerBag(player, slot);
-
-		for(i = 0; i < 2; ++i)
-			for(j = 0; j < 8; ++j) {
-				int k = j + i * 8;
-				addSlotToContainer(new SlotFlower(flowerBagInv, k, 17 + j * 18, 26 + i * 18, k));
-			}
-
-		for(i = 0; i < 3; ++i)
-			for(j = 0; j < 9; ++j)
-				addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-
-		for(i = 0; i < 9; ++i) {
-			if(player.inventory.currentItem == i)
-				addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142));
-			else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142));
-		}
-
-	}
-
-	@Override
-	public boolean canInteractWith(EntityPlayer player) {
-		boolean can = flowerBagInv.isUseableByPlayer(player);
-		if(!can)
-			onContainerClosed(player);
-
-		return can;
-	}
-
-	@Override
-	public void onContainerClosed(EntityPlayer player) {
-		super.onContainerClosed(player);
-		flowerBagInv.pushInventory();
-	}
-
-	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) {
-		ItemStack itemstack = null;
-		Slot slot = (Slot)inventorySlots.get(p_82846_2_);
-
-		if(slot != null && slot.getHasStack()) {
-			ItemStack itemstack1 = slot.getStack();
-			itemstack = itemstack1.copy();
-
-			if(p_82846_2_ < 16) {
-				if(!mergeItemStack(itemstack1, 16, 52, true))
-					return null;
-			} else {
-				int i = itemstack.getItemDamage();
-				if(i < 16) {
-					Slot slot1 = (Slot)inventorySlots.get(i);
-					if(slot1.isItemValid(itemstack) && !mergeItemStack(itemstack1, i, i + 1, true))
-						return null;
-				}
-			}
-
-			if(itemstack1.stackSize == 0)
-				slot.putStack((ItemStack)null);
-			else slot.onSlotChanged();
-
-			if(itemstack1.stackSize == itemstack.stackSize)
-				return null;
-
-			slot.onPickupFromSlot(p_82846_1_, itemstack1);
-		}
-
-		return itemstack;
-	}
-
-}
@@ -1,74 +0,0 @@
-/**
- * This class was created by <Vazkii>. It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- * 
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- * 
- * File Created @ [Mar 16, 2015, 6:42:43 PM (GMT)]
- */
-package vazkii.botania.client.gui.bag;
-
-import java.util.List;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-
-import org.lwjgl.opengl.GL11;
-
-import vazkii.botania.client.lib.LibResources;
-import vazkii.botania.common.block.ModBlocks;
-
-public class GuiFlowerBag extends GuiContainer {
-
-	private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_FLOWER_BAG);
-
-	public GuiFlowerBag(EntityPlayer player) {
-		super(new ContainerFlowerBag(player));
-	}
-
-	@Override
-	protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
-		String s = StatCollector.translateToLocal("item.botania:flowerBag.name");
-		fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752);
-		fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752);
-	}
-
-	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		mc.getTextureManager().bindTexture(texture);
-		int k = (width - xSize) / 2;
-		int l = (height - ySize) / 2;
-		drawTexturedModalRect(k, l, 0, 0, xSize, ySize);
-
-		List<Slot> slotList = inventorySlots.inventorySlots;
-		for(Slot slot : slotList)
-			if(slot instanceof SlotFlower) {
-				SlotFlower slotf = (SlotFlower) slot;
-				if(!slotf.getHasStack()) {
-					ItemStack stack = new ItemStack(ModBlocks.flower, 0, slotf.color);
-					int x = guiLeft + slotf.xDisplayPosition;
-					int y = guiTop + slotf.yDisplayPosition;
-					RenderHelper.enableGUIStandardItemLighting();
-					RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y);
-					RenderHelper.disableStandardItemLighting();
-					mc.fontRenderer.drawStringWithShadow("0", x + 11, y + 9, 0xFF6666);
-				}
-			}
-	}
-
-	@Override
-	protected boolean checkHotbarKeys(int p_146983_1_) {
-		return false;
-	}
-
-}
@@ -1,160 +0,0 @@
-/**
- * This class was created by <Vazkii>. It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- * 
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- * 
- * File Created @ [Mar 16, 2015, 6:42:56 PM (GMT)]
- */
-package vazkii.botania.client.gui.bag;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import vazkii.botania.common.item.ItemFlowerBag;
-import vazkii.botania.common.item.ModItems;
-import vazkii.botania.common.lib.LibItemNames;
-
-public class InventoryFlowerBag implements IInventory {
-
-	private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16];
-
-	EntityPlayer player;
-	int slot;
-	ItemStack[] stacks = null;
-
-	boolean invPushed = false;
-	ItemStack storedInv = null;
-
-	public InventoryFlowerBag(EntityPlayer player, int slot) {
-		this.player = player;
-		this.slot = slot;
-	}
-
-	public static boolean isFlowerBag(ItemStack stack) {
-		return stack != null && stack.getItem() == ModItems.flowerBag;
-	}
-
-	ItemStack getStack() {
-		ItemStack stack = player.inventory.getStackInSlot(slot);
-		if(stack != null)
-			storedInv = stack;
-		return stack;
-	}
-
-	ItemStack[] getInventory() {
-		if(stacks != null)
-			return stacks;
-
-		ItemStack stack = getStack();
-		if(isFlowerBag(getStack())) {
-			stacks = ItemFlowerBag.loadStacks(stack);
-			return stacks;
-		}
-
-		return FALLBACK_INVENTORY;
-	}
-
-	public void pushInventory() {
-		if(invPushed)
-			return;
-
-		ItemStack stack = getStack();
-		if(stack == null)
-			stack = storedInv;
-
-		if(stack != null) {
-			ItemStack[] inv = getInventory();
-			ItemFlowerBag.setStacks(stack, inv);
-		}
-
-		invPushed = true;
-	}
-
-	@Override
-	public int getSizeInventory() {
-		return 16;
-	}
-
-	@Override
-	public ItemStack getStackInSlot(int i) {
-		return getInventory()[i];
-	}
-
-	@Override
-	public ItemStack decrStackSize(int i, int j) {
-		ItemStack[] inventorySlots = getInventory();
-		if (inventorySlots[i] != null) {
-			ItemStack stackAt;
-
-			if (inventorySlots[i].stackSize <= j) {
-				stackAt = inventorySlots[i];
-				inventorySlots[i] = null;
-				return stackAt;
-			} else {
-				stackAt = inventorySlots[i].splitStack(j);
-
-				if (inventorySlots[i].stackSize == 0)
-					inventorySlots[i] = null;
-
-				return stackAt;
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	public ItemStack getStackInSlotOnClosing(int i) {
-		return getStackInSlot(i);
-	}
-
-	@Override
-	public void setInventorySlotContents(int i, ItemStack itemstack) {
-		ItemStack[] inventorySlots = getInventory();
-		inventorySlots[i] = itemstack;
-	}
-
-	@Override
-	public int getInventoryStackLimit() {
-		return isFlowerBag(getStack()) ? 64 : 0;
-	}
-
-	@Override
-	public boolean isUseableByPlayer(EntityPlayer entityplayer) {
-		return isFlowerBag(getStack());
-	}
-
-	@Override
-	public boolean isItemValidForSlot(int i, ItemStack itemstack) {
-		return isFlowerBag(getStack());
-	}
-
-	@Override
-	public boolean hasCustomInventoryName() {
-		return false;
-	}
-
-	@Override
-	public void openInventory() {
-		// NO-OP
-	}
-
-	@Override
-	public void closeInventory() {
-		// NO-OP
-	}
-
-	@Override
-	public String getInventoryName() {
-		return LibItemNames.FLOWER_BAG;
-	}
-
-	@Override
-	public void markDirty() {
-		// NO-OP
-	}
-
-}
@@ -1,39 +0,0 @@
-/**
- * This class was created by <Vazkii>. It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- * 
- * Botania is Open Source and distributed under the
- * Botania License: http://botaniamod.net/license.php
- * 
- * File Created @ [Mar 16, 2015, 7:20:05 PM (GMT)]
- */
-package vazkii.botania.client.gui.bag;
-
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import vazkii.botania.common.block.ModBlocks;
-
-public class SlotFlower extends Slot {
-
-	InventoryFlowerBag inv;
-	int color;
-
-	public SlotFlower(InventoryFlowerBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) {
-		super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_);
-		this.color = color;
-		inv = p_i1824_1_;
-	}
-
-	@Override
-	public void onSlotChange(ItemStack oldStack, ItemStack newStack) {
-		inv.setInventorySlotContents(color, newStack);
-	}
-
-	@Override
-	public boolean isItemValid(ItemStack stack) {
-		return stack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && stack.getItemDamage() == color;
-	}
-
-}
@@ -0,0 +1,89 @@
+package vazkii.botania.client.gui.bags;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import vazkii.botania.client.gui.SlotLocked;
+
+public abstract class ContainerMagicPlantBag extends Container {
+
+    protected InventoryMagicPlantBag magicPlantInv;
+    public ContainerMagicPlantBag(EntityPlayer player) {
+        int i;
+        int j;
+
+        IInventory playerInv = player.inventory;
+
+        addMagicPlantSlots(player);
+
+        for(i = 0; i < 3; ++i) {
+            for(j = 0; j < 9; ++j) {
+                addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
+            }
+        }
+
+
+        for(i = 0; i < 9; ++i) {
+            if(player.inventory.currentItem == i) {
+                addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142));
+            }
+            else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142));
+        }
+    }
+
+    public abstract void  addMagicPlantSlots(EntityPlayer player);
+
+    @Override
+    public boolean canInteractWith(EntityPlayer player) {
+        boolean can = magicPlantInv.isUseableByPlayer(player);
+        if(!can)
+            onContainerClosed(player);
+
+        return can;
+    }
+
+    @Override
+    public void onContainerClosed(EntityPlayer player) {
+        super.onContainerClosed(player);
+        magicPlantInv.pushInventory();
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+        ItemStack itemstack = null;
+        Slot slot = (Slot)inventorySlots.get(index);
+
+        if(slot != null && slot.getHasStack()) {
+            ItemStack itemstack1 = slot.getStack();
+            itemstack = itemstack1.copy();
+
+            if(index < 16) {
+                if(!mergeItemStack(itemstack1, 16, 52, true))
+                    return null;
+            } else {
+                int i = itemstack.getItemDamage();
+                if(i < 16) {
+                    Slot slot1 = (Slot)inventorySlots.get(i);
+                    if(slot1.isItemValid(itemstack) && !mergeItemStack(itemstack1, i, i + 1, true))
+                        return null;
+                }
+            }
+
+            if(itemstack1.stackSize == 0)
+                slot.putStack((ItemStack)null);
+            else slot.onSlotChanged();
+
+            if(itemstack1.stackSize == itemstack.stackSize)
+                return null;
+
+            slot.onPickupFromSlot(player, itemstack1);
+        }
+
+        return itemstack;
+    }
+
+}
+
+
@@ -0,0 +1,65 @@
+package vazkii.botania.client.gui.bags;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import org.lwjgl.opengl.GL11;
+
+public abstract class GuiMagicPlantBag extends GuiContainer {
+
+    private final ResourceLocation texture;
+    public GuiMagicPlantBag(ContainerMagicPlantBag container, ResourceLocation texture) {
+        super(container);
+        this.texture = texture;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
+        String s = StatCollector.translateToLocal(getLocalizedNameKey());
+        fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752);
+        fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        mc.getTextureManager().bindTexture(texture);
+        int k = (width - xSize) / 2;
+        int l = (height - ySize) / 2;
+        drawTexturedModalRect(k, l, 0, 0, xSize, ySize);
+
+        List<Slot> slotList = inventorySlots.inventorySlots;
+        for(Slot slot : slotList)
+            if(slot instanceof SlotMagicPlant) {
+                SlotMagicPlant slotf = (SlotMagicPlant) slot;
+                if(!slotf.getHasStack()) {
+                    ItemStack stack = new ItemStack(itemTypeAllowed(), 0, slotf.color);
+                    int x = guiLeft + slotf.xDisplayPosition;
+                    int y = guiTop + slotf.yDisplayPosition;
+                    RenderHelper.enableGUIStandardItemLighting();
+                    RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y);
+                    RenderHelper.disableStandardItemLighting();
+                    mc.fontRenderer.drawStringWithShadow("0", x + 11, y + 9, 0xFF6666);
+                }
+            }
+    }
+
+    @Override
+    protected boolean checkHotbarKeys(int keyCode) {
+        return false;
+    }
+
+    protected abstract Block itemTypeAllowed();
+
+    protected abstract String getLocalizedNameKey();
+}
@@ -0,0 +1,148 @@
+package vazkii.botania.client.gui.bags;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import vazkii.botania.common.item.bag.ItemBagBase;
+
+public abstract class InventoryMagicPlantBag implements IInventory {
+
+    private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16];
+
+    EntityPlayer player;
+    int slot;
+    ItemStack[] stacks = null;
+
+    boolean invPushed = false;
+    ItemStack storedInv = null;
+
+    public InventoryMagicPlantBag(EntityPlayer player, int slot) {
+        this.player = player;
+        this.slot = slot;
+    }
+
+    ItemStack getStack() {
+        ItemStack stack = player.inventory.getStackInSlot(slot);
+        if(stack != null)
+            storedInv = stack;
+        return stack;
+    }
+
+
+    public void pushInventory() {
+        if(invPushed)
+            return;
+
+        ItemStack stack = getStack();
+        if(stack == null)
+            stack = storedInv;
+
+        if(stack != null) {
+            ItemStack[] inv = getInventory();
+            ItemBagBase.setStacks(stack, inv);
+        }
+
+        invPushed = true;
+    }
+
+    ItemStack[] getInventory() {
+        if(stacks != null)
+            return stacks;
+
+        ItemStack stack = getStack();
+        if(isMagicPlantBag(getStack())) {
+            stacks = ItemBagBase.loadStacks(stack);
+            return stacks;
+        }
+
+        return FALLBACK_INVENTORY;
+    }
+
+    @Override
+    public int getSizeInventory() {
+        return 16;
+    }
+
+    @Override
+    public ItemStack getStackInSlot(int slotIn) {
+        return getInventory()[slotIn];
+    }
+
+    @Override
+    public ItemStack decrStackSize(int index, int count) {
+        ItemStack[] inventorySlots = getInventory();
+        if (inventorySlots[index] != null) {
+            ItemStack stackAt;
+
+            if (inventorySlots[index].stackSize <= count) {
+                stackAt = inventorySlots[index];
+                inventorySlots[index] = null;
+                return stackAt;
+            } else {
+                stackAt = inventorySlots[index].splitStack(count);
+
+                if (inventorySlots[index].stackSize == 0)
+                    inventorySlots[index] = null;
+
+                return stackAt;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public ItemStack getStackInSlotOnClosing(int index) {
+        return getStackInSlot(index);
+    }
+
+    @Override
+    public void setInventorySlotContents(int index, ItemStack stack) {
+        ItemStack[] inventorySlots = getInventory();
+        inventorySlots[index] = stack;
+    }
+
+    @Override
+    public String getInventoryName() {
+        return getBagName();
+    }
+
+    @Override
+    public boolean hasCustomInventoryName() {
+        return false;
+    }
+
+    @Override
+    public int getInventoryStackLimit() {
+        return isMagicPlantBag(getStack()) ? 64 : 0;
+    }
+
+    @Override
+    public void markDirty() {
+        // NO-OP
+    }
+
+    @Override
+    public boolean isUseableByPlayer(EntityPlayer player) {
+        return isMagicPlantBag(getStack());
+    }
+
+    @Override
+    public void openInventory() {
+        // NO-OP
+    }
+
+    @Override
+    public void closeInventory() {
+        // NO-OP
+    }
+
+    @Override
+    public boolean isItemValidForSlot(int index, ItemStack stack) {
+        return isMagicPlantBag(getStack());
+    }
+
+    protected abstract String getBagName();
+
+    public abstract boolean isMagicPlantBag(ItemStack stack);
+}
@@ -0,0 +1,31 @@
+
+package vazkii.botania.client.gui.bags;
+
+import net.minecraft.block.Block;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public abstract class SlotMagicPlant extends Slot {
+
+    InventoryMagicPlantBag inv;
+    int color;
+
+    public SlotMagicPlant(InventoryMagicPlantBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) {
+        super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_);
+        this.color = color;
+        inv = p_i1824_1_;
+    }
+
+    @Override
+    public void onSlotChange(ItemStack oldStack, ItemStack newStack) {
+        inv.setInventorySlotContents(color, newStack);
+    }
+
+    @Override
+    public boolean isItemValid(ItemStack stack) {
+        return stack.getItem() == Item.getItemFromBlock(getValidBlock()) && stack.getItemDamage() == color;
+    }
+
+    protected abstract Block getValidBlock();
+}
@@ -0,0 +1,23 @@
+package vazkii.botania.client.gui.bags.flowerBag;
+
+import net.minecraft.entity.player.EntityPlayer;
+import vazkii.botania.client.gui.bags.ContainerMagicPlantBag;
+
+public class ContainerFlowerBag extends ContainerMagicPlantBag {
+    public ContainerFlowerBag(EntityPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void addMagicPlantSlots(EntityPlayer player) {
+        int slot = player.inventory.currentItem;
+        magicPlantInv = new InventoryFlowerBag(player, slot);
+
+        for(int i = 0; i < 2; ++i) {
+            for (int j = 0; j < 8; ++j) {
+                int k = j + i * 8;
+                addSlotToContainer(new SlotFlower(magicPlantInv, k, 17 + j * 18, 26 + i * 18, k));
+            }
+        }
+    }
+}
@@ -0,0 +1,27 @@
+package vazkii.botania.client.gui.bags.flowerBag;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ResourceLocation;
+import vazkii.botania.client.gui.bags.GuiMagicPlantBag;
+import vazkii.botania.client.lib.LibResources;
+import vazkii.botania.common.block.ModBlocks;
+
+public class GuiFlowerBag extends GuiMagicPlantBag {
+
+    private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_FLOWER_BAG);
+
+    public GuiFlowerBag(EntityPlayer player) {
+        super(new ContainerFlowerBag(player), texture);
+    }
+
+    @Override
+    protected Block itemTypeAllowed() {
+        return ModBlocks.flower;
+    }
+
+    @Override
+    protected String getLocalizedNameKey() {
+        return "item.botania:flowerBag.name";
+    }
+}
@@ -0,0 +1,23 @@
+package vazkii.botania.client.gui.bags.flowerBag;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import vazkii.botania.client.gui.bags.InventoryMagicPlantBag;
+import vazkii.botania.common.item.ModItems;
+import vazkii.botania.common.lib.LibItemNames;
+
+public class InventoryFlowerBag extends InventoryMagicPlantBag {
+    public InventoryFlowerBag(EntityPlayer player, int slot) {
+        super(player, slot);
+    }
+
+    @Override
+    public boolean isMagicPlantBag(ItemStack stack) {
+        return stack != null && stack.getItem() == ModItems.flowerBag;
+    }
+
+    @Override
+    protected String getBagName() {
+        return LibItemNames.FLOWER_BAG;
+    }
+}
@@ -0,0 +1,18 @@
+package vazkii.botania.client.gui.bags.flowerBag;
+
+import net.minecraft.block.Block;
+import vazkii.botania.client.gui.bags.InventoryMagicPlantBag;
+import vazkii.botania.client.gui.bags.SlotMagicPlant;
+import vazkii.botania.common.block.ModBlocks;
+
+public class SlotFlower extends SlotMagicPlant {
+    public SlotFlower(InventoryMagicPlantBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) {
+        super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_, color);
+    }
+
+    @Override
+    protected Block getValidBlock() {
+        return ModBlocks.flower;
+    }
+
+}
@@ -0,0 +1,23 @@
+package vazkii.botania.client.gui.bags.shroomBag;
+
+import net.minecraft.entity.player.EntityPlayer;
+import vazkii.botania.client.gui.bags.ContainerMagicPlantBag;
+
+public class ContainerShroomBag extends ContainerMagicPlantBag {
+    public ContainerShroomBag(EntityPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void addMagicPlantSlots(EntityPlayer player) {
+        int slot = player.inventory.currentItem;
+        magicPlantInv = new InventoryShroomBag(player, slot);
+
+        for(int i = 0; i < 2; ++i) {
+            for (int j = 0; j < 8; ++j) {
+                int k = j + i * 8;
+                addSlotToContainer(new SlotShroom(magicPlantInv, k, 17 + j * 18, 26 + i * 18, k));
+            }
+        }
+    }
+}
@@ -0,0 +1,27 @@
+package vazkii.botania.client.gui.bags.shroomBag;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ResourceLocation;
+import vazkii.botania.client.gui.bags.GuiMagicPlantBag;
+import vazkii.botania.client.lib.LibResources;
+import vazkii.botania.common.block.ModBlocks;
+
+public class GuiShroomBag extends GuiMagicPlantBag {
+
+    private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_SHROOM_BAG);
+
+    public GuiShroomBag(EntityPlayer player) {
+        super(new ContainerShroomBag(player), texture);
+    }
+
+    @Override
+    protected Block itemTypeAllowed() {
+        return ModBlocks.mushroom;
+    }
+
+    @Override
+    protected String getLocalizedNameKey() {
+        return "item.botania:shroomBag.name";
+    }
+}
@@ -0,0 +1,23 @@
+package vazkii.botania.client.gui.bags.shroomBag;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import vazkii.botania.client.gui.bags.InventoryMagicPlantBag;
+import vazkii.botania.common.item.ModItems;
+import vazkii.botania.common.lib.LibItemNames;
+
+public class InventoryShroomBag extends InventoryMagicPlantBag {
+    public InventoryShroomBag(EntityPlayer player, int slot) {
+        super(player, slot);
+    }
+
+    @Override
+    public boolean isMagicPlantBag(ItemStack stack) {
+        return stack != null && stack.getItem() == ModItems.shroomBag;
+    }
+
+    @Override
+    protected String getBagName() {
+        return LibItemNames.SHROOM_BAG;
+    }
+}
@@ -0,0 +1,18 @@
+package vazkii.botania.client.gui.bags.shroomBag;
+
+import net.minecraft.block.Block;
+import vazkii.botania.client.gui.bags.InventoryMagicPlantBag;
+import vazkii.botania.client.gui.bags.SlotMagicPlant;
+import vazkii.botania.common.block.ModBlocks;
+
+public class SlotShroom extends SlotMagicPlant {
+    public SlotShroom(InventoryMagicPlantBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) {
+        super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_, color);
+    }
+
+    @Override
+    protected Block getValidBlock() {
+        return ModBlocks.mushroom;
+    }
+
+}
@@ -89,16 +89,16 @@ public class ContainerBaubleBox extends Container {
 	}

 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) {
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
 		ItemStack itemstack = null;
-		Slot slot = (Slot)inventorySlots.get(p_82846_2_);
+		Slot slot = (Slot)inventorySlots.get(index);

 		if(slot != null && slot.getHasStack()) {
 			ItemStack itemstack1 = slot.getStack();
 			itemstack = itemstack1.copy();

-			System.out.println(p_82846_2_ + " " + itemstack);
-			if(p_82846_2_ < 28) {
+			System.out.println(index + " " + itemstack);
+			if(index < 28) {
 				if(!mergeItemStack(itemstack1, 28, 64, true))
 					return null;
 			} else {
@@ -113,7 +113,7 @@ public class ContainerBaubleBox extends Container {
 			if(itemstack1.stackSize == itemstack.stackSize)
 				return null;

-			slot.onPickupFromSlot(p_82846_1_, itemstack1);
+			slot.onPickupFromSlot(player, itemstack1);
 		}

 		return itemstack;
@@ -29,12 +29,12 @@ public class GuiBaubleBox extends InventoryEffectRenderer {
 	}

 	@Override
-	protected boolean checkHotbarKeys(int p_146983_1_) {
+	protected boolean checkHotbarKeys(int keyCode) {
 		return false;
 	}

 	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+	protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.getTextureManager().bindTexture(texture);
 		int k = (width - xSize) / 2;
@@ -47,7 +47,7 @@ public class GuiBaubleBox extends InventoryEffectRenderer {
 				drawTexturedModalRect(k+slot.xDisplayPosition, l+slot.yDisplayPosition, 200, 0, 16, 16);
 		}

-		GuiInventory.func_147046_a(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - p_146976_2_, guiTop + 45 - 30 - p_146976_3_, mc.thePlayer);
+		GuiInventory.func_147046_a(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - mouseX, guiTop + 45 - 30 - mouseY, mc.thePlayer);
 	}

 }
@@ -57,7 +57,7 @@ public class ContainerCraftingHalo extends ContainerWorkbench {
 	}

 	@Override
-	public boolean canInteractWith(EntityPlayer p_75145_1_) {
+	public boolean canInteractWith(EntityPlayer player) {
 		return true;
 	}
 }
@@ -28,13 +28,13 @@ public class GuiCraftingHalo extends GuiContainer {
 	}

 	@Override
-	protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
+	protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
 		fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 4210752);
 		fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752);
 	}

 	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+	protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.getTextureManager().bindTexture(craftingTableGuiTextures);
 		int k = (width - xSize) / 2;
@@ -70,7 +70,7 @@ public class GuiLexicon extends GuiScreen {
 	public static GuiLexicon currentOpenLexicon = new GuiLexicon();
 	public static ItemStack stackUsed;

-	public static HashMap<String, String> notes = new HashMap();
+	public static HashMap<String, String> notes = new HashMap<>();

 	private static final String TAG_TYPE = "type";

@@ -79,11 +79,11 @@ public class GuiLexicon extends GuiScreen {
 	public static final int BOOKMARK_START = 1337;
 	public static final int NOTES_BUTTON_ID = 1336; // random button tho
 	public static final int MAX_BOOKMARK_COUNT = 8;
-	public static List<GuiLexicon> bookmarks = new ArrayList();
-	public static List<String> bookmarkKeys = new ArrayList();
+	public static List<GuiLexicon> bookmarks = new ArrayList<>();
+	public static List<String> bookmarkKeys = new ArrayList<>();
 	boolean bookmarksNeedPopulation = false;

-	public static Queue<LexiconEntry> tutorial = new ArrayDeque();
+	public static Queue<LexiconEntry> tutorial = new ArrayDeque<>();

 	public static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_LEXICON);
 	public static final ResourceLocation textureToff = new ResourceLocation(LibResources.GUI_TOFF);
@@ -130,7 +130,7 @@ public class GuiLexicon extends GuiScreen {
 	}

 	public void onInitGui() {
-		allCategories = new ArrayList(BotaniaAPI.getAllCategories());
+		allCategories = new ArrayList<>(BotaniaAPI.getAllCategories());
 		Collections.sort(allCategories);

 		lastTime = ClientTickHandler.ticksInGame;
@@ -284,7 +284,7 @@ public class GuiLexicon extends GuiScreen {
 		boolean unicode = fontRendererObj.getUnicodeFlag();
 		fontRendererObj.setUnicodeFlag(true);

-		PageText.renderText(x + 5, y - 3, 92, 120, 0, noteDisplay);
+		PageText.renderText(x + 5, y - 3, 92, 0, noteDisplay);
 		fontRendererObj.setUnicodeFlag(unicode);
 	}

@@ -483,7 +483,7 @@ public class GuiLexicon extends GuiScreen {
 	}

 	void populateBookmarks() {
-		List remove = new ArrayList();
+		List<GuiButton> remove = new ArrayList<>();
 		List<GuiButton> buttons = buttonList;
 		for(GuiButton button : buttons)
 			if(button.id >= BOOKMARK_START)
@@ -20,7 +20,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;

 public class GuiLexiconHistory extends GuiLexiconIndex {

-	public static List<LexiconEntry> history = new ArrayList();
+	public static List<LexiconEntry> history = new ArrayList<>();

 	public GuiLexiconHistory() {
 		super(null);
@@ -57,7 +57,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 	LexiconEntry currentEntry;
 	float infoTime;

-	List<LexiconEntry> entriesToDisplay = new ArrayList();
+	List<LexiconEntry> entriesToDisplay = new ArrayList<>();

 	public GuiLexiconIndex() {
 		parent = new GuiLexicon();
@@ -37,7 +37,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon {
 		GL11.glColor4f(1F, 1F, 1F, 1F);
 		drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11);

-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.achievements"));

 		int tooltipY = (tooltip.size() - 1) * 10;
@@ -24,7 +24,7 @@ public class GuiButtonBookmark extends GuiButtonLexicon {
 		field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height;
 		int k = getHoverState(field_146123_n);

-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		if(displayString.equals("+"))
 			tooltip.add(StatCollector.translateToLocal("botaniamisc.clickToAdd"));
 		else {
@@ -52,7 +52,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon {
 		}


-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		tooltip.add(EnumChatFormatting.AQUA + StatCollector.translateToLocal(challenge.unlocalizedName));

 		int tooltipY = (tooltip.size() - 1) * 10;
@@ -33,7 +33,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon {
 		field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height;
 		int k = getHoverState(field_146123_n);

-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		tooltip.add(StatCollector.translateToLocal("botaniamisc.challengeInfo"));

 		int tooltipY = (tooltip.size() + 1) * 5;
@@ -37,7 +37,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon {
 		GL11.glColor4f(1F, 1F, 1F, 1F);
 		drawTexturedModalRect(xPosition, yPosition, k == 2 ? 131 : 120, 180, 11, 11);

-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.challenges"));

 		int tooltipY = (tooltip.size() - 1) * 10;
@@ -46,7 +46,7 @@ public class GuiButtonDoot extends GuiButtonLexicon {
 		GL11.glDisable(GL11.GL_LIGHTING);


-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		tooltip.add(EnumChatFormatting.LIGHT_PURPLE + "Happy Birthday Vazkii!");
 		tooltip.add(EnumChatFormatting.GRAY + "doot doot");

@@ -34,7 +34,7 @@ public class GuiButtonHistory extends GuiButtonLexicon {
 		field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height;
 		int k = getHoverState(field_146123_n);

-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		tooltip.add(StatCollector.translateToLocal("botaniamisc.historyLong"));
 		tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.historyDesc"));

@@ -17,13 +17,13 @@ import net.minecraft.util.ResourceLocation;

 public class GuiButtonLexicon extends GuiButton {

-	public GuiButtonLexicon(int p_i1021_1_, int p_i1021_2_, int p_i1021_3_, int p_i1021_4_, int p_i1021_5_, String p_i1021_6_) {
-		super(p_i1021_1_, p_i1021_2_, p_i1021_3_, p_i1021_4_, p_i1021_5_, p_i1021_6_);
+	public GuiButtonLexicon(int stateName, int id, int p_i1021_3_, int p_i1021_4_, int p_i1021_5_, String p_i1021_6_) {
+		super(stateName, id, p_i1021_3_, p_i1021_4_, p_i1021_5_, p_i1021_6_);
 	}

 	@Override
-	public void func_146113_a(SoundHandler p_146113_1_)  {
-		p_146113_1_.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F));
+	public void func_146113_a(SoundHandler soundHandlerIn)  {
+		soundHandlerIn.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F));
 	}

 }
@@ -40,7 +40,7 @@ public class GuiButtonNotes extends GuiButtonLexicon {
 		GL11.glColor4f(1F, 1F, 1F, 1F);
 		drawTexturedModalRect(xPosition, yPosition, k == 2 ? 130 : 120, 191, 10, 11);

-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		if(GuiLexicon.notesEnabled)
 			tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.hideNotes"));
 		else {
@@ -37,7 +37,7 @@ public class GuiButtonOptions extends GuiButtonLexicon {
 		GL11.glColor4f(1F, 1F, 1F, 1F);
 		drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 180, 11, 11);

-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		for(int i = 0; i < 3; i++)
 			tooltip.add((i == 0 ? EnumChatFormatting.RED : EnumChatFormatting.GRAY) + StatCollector.translateToLocal("botaniamisc.lexiconOptions" + i));

@@ -44,7 +44,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon {
 		GL11.glColor4f(1F, 1F, 1F, 1F);
 		drawTexturedModalRect(xPosition, yPosition, red ? 153 : 142, 180, 11, 11);

-		List<String> tooltip = new ArrayList();
+		List<String> tooltip = new ArrayList<>();
 		String version = PersistentVariableHelper.lastBotaniaVersion;
 		for(int i = 0; i < 6; i++) {
 			tooltip.add(EnumChatFormatting.GRAY + String.format(StatCollector.translateToLocal("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7"));
@@ -16,7 +16,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.MathHelper;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.guihook.GuiContainerManager;
@@ -39,11 +38,11 @@ public class NEIInputHandler implements IContainerInputHandler {
 		    	if(stack != null && stack.getItem() != null) {
 		    		int count = 1;
 		    		int max = stack.getMaxStackSize();
-		    		if(gui.isShiftKeyDown()) {
+		    		if(GuiScreen.isShiftKeyDown()) {
 		    			count = max;
-		    			if(gui.isCtrlKeyDown())
+		    			if(GuiScreen.isCtrlKeyDown())
 		    				count /= 4;
-		    		} else if(gui.isCtrlKeyDown())
+		    		} else if(GuiScreen.isCtrlKeyDown())
 		    			count = max / 2;
 		    		
 		    		if(count > 0) {
@@ -25,7 +25,7 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler {

 	public class CachedBreweryRecipe extends CachedRecipe {

-		public List<PositionedStack> inputs = new ArrayList<PositionedStack>();
+		public List<PositionedStack> inputs = new ArrayList<>();
 		public PositionedStack output;
 		public int mana;

@@ -28,7 +28,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler {

 	public class CachedElvenTradeRecipe extends CachedRecipe {

-		public List<PositionedStack> inputs = new ArrayList<PositionedStack>();
+		public List<PositionedStack> inputs = new ArrayList<>();
 		public PositionedStack output;

 		public CachedElvenTradeRecipe(RecipeElvenTrade recipe) {
@@ -19,7 +19,7 @@ public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler {

 	public class CachedFloatingFlowerRecipe extends CachedRecipe {

-		public List<PositionedStack> inputs = new ArrayList<PositionedStack>();
+		public List<PositionedStack> inputs = new ArrayList<>();
 		public PositionedStack output;

 		public CachedFloatingFlowerRecipe(ItemStack floatingFlower, ItemStack specialFlower, ItemStack output) {
@@ -18,36 +18,19 @@ import java.util.List;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
-import net.minecraftforge.oredict.OreDictionary;
-
-import org.lwjgl.opengl.GL11;

 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.KnowledgeType;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.lexicon.LexiconRecipeMappings;
-import vazkii.botania.api.recipe.RecipeManaInfusion;
-import vazkii.botania.client.core.handler.HUDHandler;
-import vazkii.botania.client.integration.nei.recipe.RecipeHandlerManaPool.CachedManaPoolRecipe;
 import vazkii.botania.client.lib.LibResources;
-import vazkii.botania.client.render.tile.RenderTilePool;
-import vazkii.botania.common.block.ModBlocks;
-import vazkii.botania.common.block.tile.mana.TilePool;
-import vazkii.botania.common.core.helper.InventoryHelper;
 import vazkii.botania.common.item.ModItems;
-import vazkii.botania.common.lexicon.LexiconData;
-import vazkii.botania.common.lexicon.page.PageRecipe;
 import vazkii.botania.common.lexicon.page.PageText;
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
-import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe;
-import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;

 public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler {

@@ -55,7 +38,7 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler {

 		public LexiconEntry entry;
 		public PositionedStack item;
-		public List<PositionedStack> otherStacks = new ArrayList<PositionedStack>();
+		public List<PositionedStack> otherStacks = new ArrayList<>();

 		public CachedLexicaBotaniaRecipe(ItemStack stack, LexiconEntry entry) {
 			otherStacks.add(new PositionedStack(new ItemStack(ModItems.lexicon), 51, 5));
@@ -2,9 +2,11 @@ package vazkii.botania.client.integration.nei.recipe;

 import java.awt.Rectangle;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;

+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
@@ -20,7 +22,6 @@ import vazkii.botania.client.render.tile.RenderTilePool;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.mana.TilePool;
 import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
@@ -29,9 +30,9 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler {

 	public class CachedManaPoolRecipe extends CachedRecipe {

-		public List<PositionedStack> inputs = new ArrayList<PositionedStack>();
+		public List<PositionedStack> inputs = new ArrayList<>();
 		public PositionedStack output;
-		public List<PositionedStack> otherStacks = new ArrayList<PositionedStack>();
+		public List<PositionedStack> otherStacks = new ArrayList<>();
 		public int mana;

 		public CachedManaPoolRecipe(RecipeManaInfusion recipe) {
@@ -49,6 +50,7 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler {
 				otherStacks.add(new PositionedStack(new ItemStack(ModBlocks.conjurationCatalyst), 10, 37));

 			output = new PositionedStack(recipe.getOutput(), 101, 37);
+			// This value is where the mana bar is stored initially
 			mana = recipe.getManaToConsume();
 		}

@@ -94,9 +96,16 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler {
 		super.drawBackground(recipe);
 		GL11.glEnable(GL11.GL_BLEND);
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
+		// Mana infusion is the mana pool, super weird.
 		GuiDraw.changeTexture(LibResources.GUI_MANA_INFUSION_OVERLAY);
 		GuiDraw.drawTexturedModalRect(45, 20, 38, 35, 92, 50);
-		HUDHandler.renderManaBar(32, 80, 0x0000FF, 0.75F, ((CachedManaPoolRecipe) arecipes.get(recipe)).mana, TilePool.MAX_MANA / 10);
+		// Below is where the mana bar actually drawn.
+		int tempMana = ((CachedManaPoolRecipe) arecipes.get(recipe)).mana;
+		HUDHandler.renderManaBar(32, 80, 0x0000FF, 0.75F, GuiScreen.isShiftKeyDown() ? tempMana : tempMana * 10, TilePool.MAX_MANA / 10);
+		FontRenderer font = Minecraft.getMinecraft().fontRenderer;
+		String size = GuiScreen.isShiftKeyDown() ? "1x " : "10x ";
+		String localized = StatCollector.translateToLocal("botaniamisc.neiratio");
+		font.drawString(size + localized, 84 - font.getStringWidth(size + localized) / 2, 71, 0x000000);
 		RenderTilePool.forceMana = true;
 	}

@@ -25,7 +25,7 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler {

 	public class CachedPetalApothecaryRecipe extends CachedRecipe {

-		public List<PositionedStack> inputs = new ArrayList<PositionedStack>();
+		public List<PositionedStack> inputs = new ArrayList<>();
 		public PositionedStack output;

 		public CachedPetalApothecaryRecipe(RecipePetals recipe, boolean addCenterItem) {
@@ -2,7 +2,6 @@ package vazkii.botania.client.integration.nei.recipe;

 import java.awt.Rectangle;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;

 import net.minecraft.block.Block;
@@ -19,7 +18,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper;
 import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
 import vazkii.botania.common.lib.LibBlockNames;
 import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;

@@ -27,9 +25,9 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler {

 	public class CachedPureDaisyRecipe extends CachedRecipe {

-		public List<PositionedStack> inputs = new ArrayList<PositionedStack>();
+		public List<PositionedStack> inputs = new ArrayList<>();
 		public PositionedStack output;
-		public List<PositionedStack> otherStacks = new ArrayList<PositionedStack>();
+		public List<PositionedStack> otherStacks = new ArrayList<>();

 		public CachedPureDaisyRecipe(RecipePureDaisy recipe) {
 			if(recipe == null)
@@ -44,6 +44,7 @@ public final class LibResources {
 	public static final String GUI_NEI_BLANK = PREFIX_GUI + "neiBlank.png";
 	public static final String GUI_NEI_BREWERY = PREFIX_GUI + "neiBrewery.png";
 	public static final String GUI_FLOWER_BAG = PREFIX_GUI + "flowerBag.png";
+	public static final String GUI_SHROOM_BAG = PREFIX_GUI + "shroomBag.png";
 	public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "baubleBox.png";
 	public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png";
 	public static final String GUI_STENCIL = PREFIX_GUI + "stencil.png";
@@ -17,10 +17,10 @@ import net.minecraft.client.model.ModelRenderer;

 public class ModelPump extends ModelBase{

-	private ArrayList<ModelRenderer> parts = new ArrayList<ModelRenderer>();
+	private ArrayList<ModelRenderer> parts = new ArrayList<>();

-	private ArrayList<ModelRenderer> innerRing = new ArrayList<ModelRenderer>();
-	private ArrayList<ModelRenderer> outerRing = new ArrayList<ModelRenderer>();
+	private ArrayList<ModelRenderer> innerRing = new ArrayList<>();
+	private ArrayList<ModelRenderer> outerRing = new ArrayList<>();

 	public ModelPump() {
 		textureWidth = 64;
@@ -40,11 +40,11 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti
 	}

 	// Copied from RenderBlocks
-	public static boolean renderCrossedSquares(IBlockAccess blockAccess, Block par1Block, int par2, int par3, int par4, RenderBlocks render) {
+	public static boolean renderCrossedSquares(IBlockAccess blockAccess, Block block, int x, int y, int z, RenderBlocks render) {
 		Tessellator tessellator = Tessellator.instance;
-		tessellator.setBrightness(par1Block.getMixedBrightnessForBlock(blockAccess, par2, par3, par4));
+		tessellator.setBrightness(block.getMixedBrightnessForBlock(blockAccess, x, y, z));
 		float f = 1.0F;
-		int l = par1Block.colorMultiplier(blockAccess, par2, par3, par4);
+		int l = block.colorMultiplier(blockAccess, x, y, z);
 		float f1 = (l >> 16 & 255) / 255.0F;
 		float f2 = (l >> 8 & 255) / 255.0F;
 		float f3 = (l & 255) / 255.0F;
@@ -59,12 +59,12 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti
 		}

 		tessellator.setColorOpaque_F(f * f1, f * f2, f * f3);
-		double d1 = par2;
-		double d2 = par3;
-		double d0 = par4;
+		double d1 = x;
+		double d2 = y;
+		double d0 = z;
 		long sh;

-		sh = par2 * 3129871 ^ par4 * 116129781L ^ par3;
+		sh = x * 3129871 ^ z * 116129781L ^ y;
 		sh = sh * sh * 42317861L + sh * 11L;
 		d1 += ((sh >> 16 & 15L) / 15.0F - 0.5D) * 0.3D;
 		d2 += (sh >> 32 & 15L) / 15.0F * -0.15D;
@@ -72,8 +72,8 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti


 		// Only change here, to use xyz rather than side/meta
-		IIcon icon = render.getBlockIcon(par1Block, blockAccess, par2, par3, par4, 0);
-		drawCrossedSquares(blockAccess, par1Block, icon, par2, par3, par4, d1, d2, d0, 1.0F, render);
+		IIcon icon = render.getBlockIcon(block, blockAccess, x, y, z, 0);
+		drawCrossedSquares(blockAccess, block, icon, x, y, z, d1, d2, d0, 1.0F, render);

 		return true;
 	}
@@ -10,7 +10,8 @@
 */
 package vazkii.botania.client.render.tile;

-import java.awt.*;
+
+import java.awt.Color;
 import java.util.Random;

 import net.minecraft.client.Minecraft;
@@ -46,7 +46,7 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer {
 			if(gaia)
 				resourcelocation = minecraft.thePlayer.getLocationSkin();
 			else if(gameProfile != null) {
-				Map map = minecraft.func_152342_ad().func_152788_a(gameProfile);
+				Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> map = minecraft.func_152342_ad().func_152788_a(gameProfile);

 				if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) {
 					resourcelocation = minecraft.func_152342_ad().func_152792_a((MinecraftProfileTexture)map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN);
@@ -22,7 +22,14 @@ public final class SkyblockRenderEvents {
 	@SubscribeEvent
 	public void onRender(RenderWorldLastEvent event) {
 		World world = Minecraft.getMinecraft().theWorld;
-		if(ConfigHandler.enableFancySkybox && world.provider.dimensionId == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))) {
+
+		boolean renderFancySkybox = ConfigHandler.enableFancySkybox && (
+				(ConfigHandler.enableFancySkyboxInNormalWorlds && (world.provider.dimensionId == 0) ) ||
+				(ConfigHandler.enableFancySkyboxInDimension && ConfigHandler.fancySkyboxDimensions.contains(world.provider.dimensionId)) ||
+				(WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))
+		);
+
+		if(renderFancySkybox) {
 			if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer))
 				world.provider.setSkyRenderer(new SkyblockSkyRenderer());
 		}
@@ -52,7 +52,6 @@ public class SkyblockSkyRenderer extends IRenderHandler {
 			return;

 		int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST);
-		int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); // Horizon line. We don't have it here
 		int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST);

 		GL11.glDisable(GL11.GL_TEXTURE_2D);
@@ -181,8 +180,6 @@ public class SkyblockSkyRenderer extends IRenderHandler {
 		GL11.glRotatef(220F, 1F, 0F, 0F);
 		GL11.glColor4f(1F, 1F, 1F, a);
 		int angles = 90;
-		float s = 3F;
-		float m = 1F;
 		float y = 2F;
 		float y0 = 0F;
 		float uPer = 1F / 360F;
@@ -42,6 +42,7 @@ public class Botania {
 	public static boolean coloredLightsLoaded = false;
 	public static boolean etFuturumLoaded = false;
 	public static boolean storageDrawersLoaded = false;
+	public static boolean structureLibLoaded = false;

 	public static ILightHelper lightHelper;

@@ -61,6 +62,7 @@ public class Botania {
 		coloredLightsLoaded = Loader.isModLoaded("easycoloredlights");
 		etFuturumLoaded = Loader.isModLoaded("etfuturum");
 		storageDrawersLoaded = Loader.isModLoaded("StorageDrawers");
+		structureLibLoaded = Loader.isModLoaded("structurelib");
 		
 		lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla();
 		proxy.preInit(event);
@@ -5,8 +5,7 @@ import vazkii.botania.api.recipe.IFlowerComponent;

 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;

 public class CustomBotaniaAPI {
-    public static Map<Item, IFlowerComponent> extraFlowerComponents = new HashMap<Item, IFlowerComponent>();
+    public static Map<Item, IFlowerComponent> extraFlowerComponents = new HashMap<>();
 }
Author	SHA1	Message	Date
Martin Robertz	754ef24ce8	update 2.8.x deps	2025-10-19 19:46:26 +02:00
Nikolay S.	872db4ec55	Great Renaming, Part 2 - Items (#107 )	2025-10-19 16:54:28 +02:00
Nikolay S.andglowredman	af9b0db103	Great Renaming, Part 1 - Blocks & `deobfParams` (#106 ) Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com>	2025-10-19 16:54:06 +02:00
koolkrafter5	93cef522ab	Merge #104 to master (#105 )	2025-10-19 16:53:43 +02:00
DarkShadow44andMartin Robertz	ee5da94abb	Fix reach ring (#95 ) Co-authored-by: Martin Robertz <dream-master@gmx.net>	2025-10-19 16:53:16 +02:00
Nikolay S.andMartin Robertz	27c6fe3b2c	Activate Generic Injection (#100 ) Co-authored-by: Martin Robertz <dream-master@gmx.net>	2025-10-19 16:52:56 +02:00
Martin Robertz	e4b5b2c2ff	update	2025-09-26 17:50:27 +02:00
ABKQPOandghostflyby	8350bd9dc7	Modify line-breaking method for rendering fonts in PageText (#101 ) Co-authored-by: ghostflyby <ghostflyby+git@outlook.com>	2025-09-26 20:09:24 +08:00
Martin Robertz	5dc4882038	update	2025-09-07 19:41:11 +02:00
koolkrafter5	9404223f53	Revert "Prevent overenchanting (#98 )" (#99 )	2025-09-07 05:19:10 -04:00
Caedis	9157df8e3b	Prevent overenchanting (#98 )	2025-09-06 12:59:34 -04:00
Martin Robertz	143b8286d8	update	2025-09-03 16:57:01 +02:00
sisyphussy	825758d639	Add Botania Multiblocks to StructureLib (#93 )	2025-09-03 15:09:02 +02:00
Martin Robertz	f4f7485a12	update	2025-08-28 09:22:54 +02:00
LewisSaber	a0d7b4dde8	fix unbreaking not affecting instant repair (#94 )	2025-08-27 15:44:43 +02:00
Matthew Bentham	d3f4b99d23	Fix WAILA not displaying quartz pillar block name when placed on its side (#97 )	2025-08-22 04:07:24 -05:00
boubou19andAlexdoru	96521a399b	Restore methods so other addons work again (#92 ) Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com>	2025-07-22 15:22:13 +00:00
koolkrafter5	c5ceef1a78	Improve Null Checking for Petal Apothecary (#91 )	2025-07-20 19:40:03 +02:00
boubou19andAlexdoru	c72988e435	Faster load (#89 ) Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com>	2025-07-17 05:10:15 +02:00
koolkrafter5	26a8bd6a26	Fix achievement text typo (#88 )	2025-07-13 05:36:01 +02:00
Martin Robertz	23e4f6760d	update	2025-06-08 11:55:28 +02:00
Nikolay S.	72da2272d1	Fix the rest of the lang file mistakes in Botania (#84 )	2025-06-06 20:57:18 +00:00
Nikolay S.	36deb60855	Add missing equals sign (#83 )	2025-06-06 20:31:18 +00:00
Maya	c387a30be8	update	2025-05-25 19:38:30 -06:00
brandynandMaya	bcf96ed130	Add configurable F3 Debug (#78 ) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>	2025-05-25 19:38:18 -06:00
Martin Robertz	7b767d52c5	update	2025-05-16 18:32:31 +02:00
Caedis	e812d33caf	Replace Baubles with Baubles Expanded (#81 )	2025-05-13 19:09:33 -05:00
Martin Robertz	a0ba2f2d6a	update	2025-03-04 10:08:44 +01:00
miozune	10f4e05d37	Update build (#76 )	2025-03-02 15:54:17 +00:00
Dream Master	2b586edcf2	update	2025-01-15 12:01:33 +01:00
Shadow1590Shadow1590Maya	36dfeea862	Reach ring rewrite (#67 ) Co-authored-by: Shadow1590 <> Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>	2025-01-14 23:50:10 -06:00
glowredmanandMartin Robertz	e8fb04df37	Small Cleanup (#68 ) Co-authored-by: Martin Robertz <dream-master@gmx.net>	2025-01-13 00:13:56 -06:00
Martin Robertz	f5a21fe41e	update	2024-12-27 10:06:52 +01:00
sh4dow Martin Robertz Maya	5b81cbe85e	backported item filter for Rannuncarpus (#60 ) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>	2024-12-26 22:29:04 -06:00
Martin Robertz	af57a9fa05	update	2024-12-23 18:30:44 +01:00
FabbozandMartin Robertz	f323fe2ac0	AgricarnationCompatibility (#62 ) Co-authored-by: Martin Robertz <dream-master@gmx.net>	2024-12-22 19:16:26 +00:00
Martin Robertz	903619e38c	update	2024-12-10 20:34:40 +01:00
Raven Szewczyk	7f838cd24c	Fix music disk use in the GT electric jukebox by adding metadata (#66 )	2024-12-10 12:57:33 +01:00
Martin Robertz	512aa4eddb	update	2024-12-07 18:32:14 +01:00
Shadow1590andShadow1590	13d5384687	Fix reach ring (#64 ) Co-authored-by: Shadow1590 <>	2024-12-07 18:02:23 +01:00
Maya	909cc503c5	add issue templates	2024-11-11 04:13:52 -06:00
Kogepan229andMartin Robertz	12f260d494	Fix mamapool NPE (#57 ) Co-authored-by: Martin Robertz <dream-master@gmx.net>	2024-08-18 12:51:30 +00:00
Martin Robertz	0872239905	update	2024-08-18 11:28:11 +02:00
AlexSocol	54508ae852	Update TileCraftCrate.java (#54 ) Added ability for Crafty Crate to repair damaged items	2024-08-15 20:29:46 +02:00
Martin Robertz	952f9b89ab	update	2024-06-02 23:12:36 +02:00
Alastors	67b44ca6f8	shift nei mana pool (#53 )	2024-06-02 14:06:59 +02:00
Jason Mitchell	ff36cef1f2	cuz more safer (#51 )	2024-05-18 14:44:53 -07:00
Martin Robertz	d5c4e9217b	update	2024-05-06 18:28:40 +02:00
LuluTheDog	6610499e7c	Added GoG Skybox support for all dimensions (#42 ) * Added GoG Skybox support for all dimensions - Added a boolean to toggle the feature to the config - Added an int array to contain the dimension you would like to recieve the Skybox -Changed the GoG Skybox render check to include above changes Basically this allows you to display the Garden of Glass in any dimension you wish, instead of just in the overworld. I like to use this to have the skybox in my personal void dimension. * Changed dimension ID to HashSet - Changed the dimension ID handling from int[] to a HashSet of Integers -Added loadPropIntSet() Im sorry if there is better ways to handle the loading of the IDs from the file, this is what i was able to come up with, if theres a way to directly save a set to file please do tell	2024-05-06 18:27:49 +02:00
Martin Robertz	ebcca54ad4	update	2024-03-24 13:12:23 +01:00
Abdiel Kavash	89237f644a	Optimize Alf Portal logic (#49 )	2024-03-24 08:17:05 +01:00
Martin Robertz	052041f846	update	2024-03-08 18:24:33 +01:00
Glease	8f1d0abbeb	fix elv portal treating lexicon as illegal item (#47 )	2024-03-07 11:04:18 +01:00
Martin Robertz	d179ee57e9	update	2024-02-21 13:27:26 +01:00
Батьків Нестор-Євген Васильович	1e2c85f898	Bug fix and small refactor (#45 )	2024-02-21 13:26:57 +01:00
Батьків Нестор-Євген Васильович	f1900cd9b3	The ring of ikoL awakens! (#43 ) * moving master block dont reset structure * Add mirroring * opsie * Mirror look * Mirror final round * refractor + new hud message * Cost balancing * Fck you idea, you are not my homie now Thanks idea, love you * Thanks Raven * This should be it	2024-02-18 10:57:54 +01:00
Martin Robertz	398af04ea5	update	2024-02-18 10:50:52 +01:00
Jason Mitchell	d5beca8e52	Reduce number of item copies. Backport from 1.12 https://github.com/VazkiiMods/Botania/commit/8595d27f4181f11006586442e42e03988a329c58 (#44 )	2024-02-17 16:07:32 -08:00
Raven Szewczyk	db3e5b6388	[ci skip] upgraded build system	2024-02-04 19:57:14 +00:00
Martin Robertz	177cb6af04	update bs+deps	2024-01-29 18:44:42 +01:00
Jason Mitchell	0c89751e53	Keep a cache of time uniforms instead of querying them every time (#41 )	2024-01-29 18:42:27 +01:00
Martin Robertz	98cb2bb68c	update bs+deps	2024-01-17 21:57:17 +01:00
Батьків Нестор-Євген Васильович	7d615a0ceb	Clarify some misunderstanding (#39 )	2024-01-17 21:56:24 +01:00
Martin Robertz	d2be71b4e3	update bs+deps	2024-01-11 23:00:07 +01:00
Raven Szewczyk	d03a0c697c	[ci skip] upgraded build system	2024-01-08 21:24:18 +00:00
Martin Robertz	e8da80454b	update bs+deps	2023-11-05 12:50:35 +01:00
Hubry	272075dd51	Fix Alfheim portal storing items not used in recipes (VazkiiMods/Botania#2721 ) * Fix VazkiiMods/Botania#2403 (Alfheim portal storing items not used in recipes) Possibly mitigates VazkiiMods/Botania#2669, as recipe checks are a bit simplified to not create stack copies posting capability events and the portal will not check items with no uses more than once. * Don't teleport bread, Bord.	2023-11-04 19:24:45 +08:00
Martin Robertz	56bd18670f	update bs+deps	2023-10-30 08:30:07 +01:00
Ryan Nasers	29f0c6af40	This fixes Botania creative tab breaking and shouldn't affect the ring itself (#34 ) * This fixes creative tab breaking and shouldn't affect the ring itself * Adding change suggest by OneEyeMaker, placed check for tag compound inside of isRingEnabled and isRingBreaking methods. * Forgot that bit. :)	2023-10-29 21:23:06 +01:00
Ryan Nasers	5ed33dfa4f	Adding mushroom bag and minor refactor (#33 ) * Refactors flower bag into a generic bag * Adds a mushroom bag	2023-10-29 21:20:52 +01:00
Dream-MasterXXL	7a74dabcea	fix wildcard imports	2023-10-09 23:18:50 +02:00
Dream-MasterXXL	68518a7858	update bs+deps	2023-10-09 22:56:33 +02:00
LewisSaber	f83cd1ab0b	Made letter purple instead of dark blue	2023-10-06 20:57:28 +02:00
LewisSaber	5595d0377c	I love you combuster	2023-10-06 20:57:28 +02:00
LewisSaber	6c4d37a345	compressed 2 keybinds, added tooltip	2023-10-06 20:57:28 +02:00
LewisSaber	77e14f3c8a	I love identation I love identation I love identation I love identation I love identation I love identation I love identation	2023-10-06 20:57:28 +02:00
LewisSaber	71e00772b7	identation	2023-10-06 20:57:28 +02:00
LewisSaber	cf60696c68	Add keybind to clear selected blocks also stop selected blocks from drawing with ring turned off	2023-10-06 20:57:28 +02:00
Martin Robertz	d24f3facfe	update gradle	2023-09-16 20:06:16 +02:00
Батьків Нестор-Євген Васильович	5cdf19daac	Add Breaking To Ring Of Loki (#31 ) Add Breaking to Ring of Loki	2023-09-16 20:00:47 +02:00
Pyromanc3r	93e6a1f7ba	Updated Russian localization (#30 ) * Updated Russian localization The mod is now fully translated * перевод подправлен * доп. правки * доп. правки2	2023-07-22 17:05:54 +02:00
梅天佑	1039b52854	Fixes a dupe with the crafting halos adds a check that will be redundant for 99% of items (#29)	2023-05-17 22:17:37 +02:00
quentin452	33a26a5059	Fix tps lag in orespawn dimensions caused by the onSpawn methods (#28 ) * Fix tps lag introduced by onSpawn methods Especially in Orespawn dimensions like unstable dimension theses methods destroys tps before Tested in my modpack spark profiler before : ~ 13 ms https://spark.lucko.me/6KkG1Tq4Su spark profiler after : ~ 8.5 ms https://spark.lucko.me/6m2vv9Hb1X However, originals versions may be more appropriate in some situations where you need to find all players in a given area rather than the closest player. * Revert "Fix tps lag introduced by onSpawn methods" This reverts commit `76a23a28db`. * Fix tps lags in orespawn dimension	2023-05-05 20:02:07 +02:00
Dane Strandboge	5ba45cb86d	Fix Lexica Botania handling of GT tools (#27 ) * fix tool handling in lexicon, improve oredict display * update buildscript * fix missed wrapper update, manually fix formatting (since no spotless)	2023-05-01 22:38:21 +02:00
Батьків Нестор-Євген Васильович	2f47326c7f	Fix ring of loki range (#26 ) Moves the player closer to the target in question so that some items' range safety checks will pass with the ring's extended reach.	2023-04-28 20:16:35 +02:00
Батьків Нестор-Євген Васильович	876b18328d	Ring of loki improvement (#25 ) * fix deps * make ring trigger block activation * remove runtime dep * AdReSs ReVieW	2023-04-24 20:24:17 +02:00
Martin Robertz	391406e1de	update gradle+BS	2023-03-17 19:34:41 +01:00
Zereff06	dfaa6dde5a	Mobs not spawning on blocks (#23 ) and config to disable this	2023-02-06 21:31:32 +01:00
Raven Szewczyk	c14b5d4ddb	[ci skip] upgraded build system	2023-01-31 09:51:31 +00:00
Jason Mitchell	c90e492a66	[ci skip] Update buildscript to RetroFuturaGradle	2023-01-29 10:49:19 -08:00
AlexCatze	8a5fa6c441	Make flowers enabled by default (#22 ) PR like #21 but for flowers. This will helpful to players, who using this fork of botania outside of any modpacks. This will not affect GTNH modpack(and other modpacks) because they are alredy have Botania.cfg. Also in config descripton sayed that this option should be 2 by default: "The quantity of Botania flower patches to generate in the world, defaults to 2, the lower the number the less patches generate.".	2023-01-03 18:11:43 +01:00
AlexCatze	3caf8954ad	Make default recipes enabled by default (#21 ) As said in description of this option, this is expert option. And, i think, recipes should be enabled by default for non-expert users. Modpack author will disable it, if needed. But it will be hard for common user to adress why there are no recipes.	2023-01-01 13:32:32 +01:00
Maxim	09ccf50fde	Fix accidental double toggle of ring of loki (#20 )	2022-12-30 00:17:34 +01:00