Cache frequent Enum#values() calls (#107)

Co-authored-by: Teteros <[email protected]>
Co-authored-by: Martin Robertz <[email protected]>

.gitignore

@@ -30,3 +30,4 @@ src/main/resources/mixins.*.json
 *.bat
 *.DS_Store
 !gradlew.bat
+layout.json

dependencies.gradle

@@ -2,10 +2,10 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta4:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.33-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta68a:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.70-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly('curse.maven:craftguide-75557:2459320')
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = Forestry
 modGroup = forestry
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# 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 modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
 
 # 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.
@@ -80,7 +104,7 @@ apiPackage = api
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # There can be multiple files in a space-separated list.
 # Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile =
+accessTransformersFile = forestry_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
@@ -96,7 +120,9 @@ 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!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -151,7 +177,7 @@ modrinthProjectId =
 #       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: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# 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.
@@ -172,6 +198,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # 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.
@@ -201,3 +233,6 @@ curseForgeRelations =
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f636c800fdb3f9ae33f019dfa048ba72/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0ef34dd9312b12d61ba1b8e66126d140/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 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.
@@ -86,8 +86,7 @@ done
 # 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
-' "$PWD" ) || exit
+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
@@ -115,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
 # 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" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -206,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * 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 \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20'
 }
 
 

src/main/java/forestry/api/apiculture/EnumBeeChromosome.java

@@ -84,7 +84,12 @@ public enum EnumBeeChromosome implements IChromosomeType {
      */
     EFFECT(IAlleleBeeEffect.class);
 
-    Class<? extends IAllele> clss;
+    final Class<? extends IAllele> clss;
+
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumBeeChromosome[] VALUES = values();
 
     EnumBeeChromosome(Class<? extends IAllele> clss) {
         this.clss = clss;

src/main/java/forestry/api/apiculture/EnumBeeType.java

@@ -17,9 +17,12 @@ public enum EnumBeeType implements ISpeciesType {
     LARVAE,
     NONE;
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
     public static final EnumBeeType[] VALUES = values();
 
-    String name;
+    private final String name;
 
     EnumBeeType() {
         this.name = this.toString().toLowerCase(Locale.ENGLISH);
@@ -28,4 +31,8 @@ public enum EnumBeeType implements ISpeciesType {
     public String getName() {
         return name;
     }
+
+    public static EnumBeeType fromOrdinal(int ordinal) {
+        return VALUES[ordinal];
+    }
 }

src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java

@@ -73,9 +73,14 @@ public enum EnumTreeChromosome implements IChromosomeType {
     /**
      * Determines if the tree can burn.
      */
-    FIREPROOF(IAlleleBoolean.class),;
+    FIREPROOF(IAlleleBoolean.class);
 
-    Class<? extends IAllele> clss;
+    final Class<? extends IAllele> clss;
+
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumTreeChromosome[] VALUES = values();
 
     EnumTreeChromosome(Class<? extends IAllele> clss) {
         this.clss = clss;

src/main/java/forestry/api/core/EnumHumidity.java

@@ -17,9 +17,14 @@ public enum EnumHumidity {
     NORMAL("Normal"),
     DAMP("Damp");
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumHumidity[] VALUES = values();
+
     public final String name;
 
-    private EnumHumidity(String name) {
+    EnumHumidity(String name) {
         this.name = name;
     }
 

src/main/java/forestry/api/core/EnumTemperature.java

@@ -27,10 +27,15 @@ public enum EnumTemperature {
     HOT("Hot", "habitats/desert"),
     HELLISH("Hellish", "habitats/nether");
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumTemperature[] VALUES = values();
+
     public final String name;
     public final String iconIndex;
 
-    private EnumTemperature(String name, String iconIndex) {
+    EnumTemperature(String name, String iconIndex) {
         this.name = name;
         this.iconIndex = iconIndex;
     }

src/main/java/forestry/api/core/IClimateControlled.java

@@ -12,11 +12,15 @@ public interface IClimateControlled {
 
     /**
      * Change the temperature, but not lower than boundaryDown or higher than boundaryUp.
+     *
+     * When used in an alveary the change applies a 20x stronger effect
      */
     void addTemperatureChange(float change, float boundaryDown, float boundaryUp);
 
     /**
      * Change the humidity, but not lower than boundaryDown or higher than boundaryUp.
+     *
+     * When used in an alveary the change applies a 20x stronger effect
      */
     void addHumidityChange(float change, float boundaryDown, float boundaryUp);
 }

src/main/java/forestry/api/farming/FarmDirection.java

@@ -16,6 +16,11 @@ public enum FarmDirection {
 
     private final ForgeDirection forgeDirection;
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final FarmDirection[] VALUES = values();
+
     FarmDirection(ForgeDirection forgeDirection) {
         this.forgeDirection = forgeDirection;
     }
@@ -25,17 +30,16 @@ public enum FarmDirection {
     }
 
     public static FarmDirection getFarmDirection(ForgeDirection forgeDirection) {
-        switch (forgeDirection) {
-            case NORTH:
-                return NORTH;
-            case EAST:
-                return EAST;
-            case SOUTH:
-                return SOUTH;
-            case WEST:
-                return WEST;
-            default:
-                return null;
-        }
+        return switch (forgeDirection) {
+            case NORTH -> NORTH;
+            case EAST -> EAST;
+            case SOUTH -> SOUTH;
+            case WEST -> WEST;
+            default -> null;
+        };
+    }
+
+    public static FarmDirection fromOrdinal(int ordinal) {
+        return VALUES[ordinal];
     }
 }

src/main/java/forestry/api/fuels/RainSubstrate.java

@@ -9,33 +9,37 @@ import net.minecraft.item.ItemStack;
 
 public class RainSubstrate {
 
+    public enum WeatherState {
+        CLEAR,
+        RAIN,
+        STORM
+    }
+
     /**
      * Rain substrate capable of activating the rainmaker.
      */
     public ItemStack item;
     /**
-     * Duration of the rain shower triggered by this substrate in Minecraft ticks.
+     * Duration of the weather event triggered by this substrate in Minecraft ticks.
      */
     public int duration;
     /**
      * Speed of activation sequence triggered.
      */
     public float speed;
+    /**
+     * The type of weather triggered.
+     */
+    public WeatherState weather;
 
-    public boolean reverse;
-
-    public RainSubstrate(ItemStack item, int duration, float speed) {
-        this(item, duration, speed, false);
+    public RainSubstrate(ItemStack item, float speed, WeatherState weather) {
+        this(item, 0, speed, weather);
     }
 
-    public RainSubstrate(ItemStack item, float speed) {
-        this(item, 0, speed, true);
-    }
-
-    public RainSubstrate(ItemStack item, int duration, float speed, boolean reverse) {
+    public RainSubstrate(ItemStack item, int duration, float speed, WeatherState weather) {
         this.item = item;
         this.duration = duration;
         this.speed = speed;
-        this.reverse = reverse;
+        this.weather = weather;
     }
 }

src/main/java/forestry/api/genetics/IIndividual.java

@@ -52,4 +52,8 @@ public interface IIndividual extends INBTTagable {
     IIndividual copy();
 
     boolean isPureBred(IChromosomeType chromosomeType);
+
+    default void addLore(List<String> text) {}
+
+    default void addDiscoveredBy(List<String> text) {}
 }

src/main/java/forestry/api/lepidopterology/EnumButterflyChromosome.java

@@ -77,7 +77,12 @@ public enum EnumButterflyChromosome implements IChromosomeType {
      */
     TERRITORY(IAlleleArea.class),;
 
-    Class<? extends IAllele> clss;
+    final Class<? extends IAllele> clss;
+
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumButterflyChromosome[] VALUES = values();
 
     EnumButterflyChromosome(Class<? extends IAllele> clss) {
         this.clss = clss;

src/main/java/forestry/api/multiblock/IAlvearyComponent.java

@@ -49,6 +49,14 @@ public interface IAlvearyComponent<T extends IMultiblockLogicAlveary> extends IM
          * @param alveary   the climate controlled alveary
          */
         void changeClimate(int tickCount, IClimateControlled alveary);
+
+        /**
+         * Get the priority of this climatiser. Called when alveary is constructed.
+         * {@link #changeClimate(int, IClimateControlled)} are run in descending priority.
+         */
+        default int getPriority() {
+            return 0;
+        }
     }
 
     /**

src/main/java/forestry/api/multiblock/IMultiblockComponent.java

@@ -9,6 +9,8 @@ import net.minecraft.util.ChunkCoordinates;
 
 import com.mojang.authlib.GameProfile;
 
+import forestry.core.inventory.IInventoryAdapter;
+
 /**
  * Basic interface for a multiblock machine component. Implemented by TileEntities.
  */
@@ -45,4 +47,15 @@ public interface IMultiblockComponent {
      * Called when the machine is broken for game reasons, e.g. a player removed a block or an explosion occurred.
      */
     void onMachineBroken();
+
+    /**
+     * A component with a separate inventory, like the Alveary Swarmer or Alveary Sieve.
+     */
+    interface HasInventory {
+
+        /**
+         * Called when this part is destroyed to drop its contents.
+         */
+        IInventoryAdapter getInternalInventory();
+    }
 }

src/main/java/forestry/apiculture/InventoryBeeHousing.java

@@ -8,7 +8,10 @@
  ******************************************************************************/
 package forestry.apiculture;
 
+import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.World;
 
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
@@ -73,4 +76,27 @@ public class InventoryBeeHousing extends InventoryAdapterRestricted implements I
     public final boolean addProduct(ItemStack product, boolean all) {
         return InventoryUtil.tryAddStack(this, product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true);
     }
+
+    public void dumpInventoryIntoWorld(World world, ChunkCoordinates coordinates) {
+        if (world.isRemote) {
+            return;
+        }
+        for (int i = 0; i < SLOT_PRODUCT_COUNT; i++) {
+            ItemStack stack = getStackInSlot(i);
+            if (stack == null) {
+                continue;
+            }
+            setInventorySlotContents(i, null);
+
+            EntityItem entityitem = new EntityItem(
+                    world,
+                    coordinates.posX + 0.5,
+                    coordinates.posY + 0.5,
+                    coordinates.posZ + 0.5,
+                    stack);
+            entityitem.delayBeforeCanPickup = 10;
+            world.spawnEntityInWorld(entityitem);
+        }
+
+    }
 }

src/main/java/forestry/apiculture/commands/CommandBeeGive.java

@@ -38,7 +38,7 @@ public class CommandBeeGive extends SubCommand {
         setPermLevel(PermLevel.ADMIN);
 
         List<String> beeTypeStrings = new ArrayList<>();
-        for (EnumBeeType type : EnumBeeType.values()) {
+        for (EnumBeeType type : EnumBeeType.VALUES) {
             if (type == EnumBeeType.NONE) {
                 continue;
             }
@@ -166,7 +166,7 @@ public class CommandBeeGive extends SubCommand {
     }
 
     private static EnumBeeType getBeeType(String beeTypeName) {
-        for (EnumBeeType beeType : EnumBeeType.values()) {
+        for (EnumBeeType beeType : EnumBeeType.VALUES) {
             if (beeType.getName().equalsIgnoreCase(beeTypeName)) {
                 return beeType;
             }

src/main/java/forestry/apiculture/flowers/FlowerRegistry.java

@@ -213,6 +213,7 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe
 
     private static boolean isAcceptedFlower(String flowerType, Set<Block> acceptedBlocks, Set<Flower> acceptedFlowers,
             World world, int x, int y, int z) {
+        if (!world.blockExists(x, y, z)) return false;
         Block block = world.getBlock(x, y, z);
 
         final int meta;

src/main/java/forestry/apiculture/flowers/GrowthRuleDirtGrass.java

@@ -24,7 +24,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
     @Override
     public boolean growFlower(IFlowerRegistry flowerRegistry, String flowerType, World world, IIndividual individual,
             int x, int y, int z) {
-        if (!world.isAirBlock(x, y, z)) {
+        if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
             return false;
         }
 
@@ -39,7 +39,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
 
     @Override
     public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) {
-        if (!world.isAirBlock(x, y, z)) {
+        if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
             return false;
         }
 

src/main/java/forestry/apiculture/flowers/GrowthRuleFlowerPot.java

@@ -34,6 +34,10 @@ public class GrowthRuleFlowerPot implements IFlowerGrowthRule {
     }
 
     private static boolean growFlower(String flowerType, World world, int x, int y, int z) {
+        if (!world.blockExists(x, y, z)) {
+            return false;
+        }
+
         TileEntity tile = world.getTileEntity(x, y, z);
         if (!(tile instanceof TileEntityFlowerPot)) {
             return false;

src/main/java/forestry/apiculture/genetics/Bee.java

@@ -18,6 +18,8 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -376,6 +378,36 @@ public class Bee extends IndividualLiving implements IBee {
         return suitableBiomes;
     }
 
+    @Override
+    public void addLore(List<String> text) {
+        IAlleleBeeSpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 0) {
+            String speciesLore = descTokens[0];
+            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
+                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
+                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
+                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
+                text.addAll(formattedLoreList);
+            }
+        }
+    }
+
+    @Override
+    public void addDiscoveredBy(List<String> text) {
+        IAlleleBeeSpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 2) {
+            String discoveredBy = descTokens[2];
+            if (!discoveredBy.isEmpty()) {
+                text.add("");
+                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
+            }
+        }
+    }
+
     @Override
     public void addTooltip(List<String> list) {
 
@@ -741,6 +773,9 @@ public class Bee extends IndividualLiving implements IBee {
         for (int i = 0; i < 20; i++) {
             Vect randomPos = Vect.getRandomPositionInArea(random, area);
             Vect blockPos = Vect.add(housingPos, randomPos, offset);
+            if (!world.blockExists(blockPos.x, blockPos.y, blockPos.z)) {
+                continue;
+            }
             TileEntity tile = world.getTileEntity(blockPos.x, blockPos.y, blockPos.z);
 
             if (tile instanceof IPollinatable) {

src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java

@@ -148,7 +148,7 @@ public enum BeeBranchDefinition implements IBranchDefinition {
 
     private static IAllele[] getDefaultTemplate() {
         if (defaultTemplate == null) {
-            defaultTemplate = new IAllele[EnumBeeChromosome.values().length];
+            defaultTemplate = new IAllele[EnumBeeChromosome.VALUES.length];
 
             AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
             AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);

src/main/java/forestry/apiculture/genetics/BeeDefinition.java

@@ -331,7 +331,7 @@ public enum BeeDefinition implements IBeeDefinition {
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f)
-                    .addProduct(PluginCore.items.ash.getItemStack(), 0.15f).setTemperature(EnumTemperature.HELLISH)
+                    .addProduct(PluginCore.items.getAsh(), 0.15f).setTemperature(EnumTemperature.HELLISH)
                     .setHumidity(EnumHumidity.ARID);
         }
 

src/main/java/forestry/apiculture/genetics/BeeHelper.java

@@ -102,7 +102,7 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot {
         IBee bee = (IBee) individual;
 
         Item beeItem;
-        switch (EnumBeeType.VALUES[type]) {
+        switch (EnumBeeType.fromOrdinal(type)) {
             case QUEEN:
                 beeItem = PluginApiculture.items.beeQueenGE;
                 // ensure a queen is always mated
@@ -353,7 +353,7 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot {
 
     @Override
     public IChromosomeType[] getKaryotype() {
-        return EnumBeeChromosome.values();
+        return EnumBeeChromosome.VALUES;
     }
 
     @Override

src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java

@@ -8,8 +8,6 @@
  ******************************************************************************/
 package forestry.apiculture.genetics;
 
-import java.util.Locale;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
@@ -22,24 +20,23 @@ import forestry.core.render.TextureManager;
 public class DefaultBeeIconProvider implements IBeeIconProvider {
 
     public static final DefaultBeeIconProvider instance = new DefaultBeeIconProvider();
+    private static final IIcon[][] icons = new IIcon[EnumBeeType.VALUES.length][3];
 
     private DefaultBeeIconProvider() {}
 
-    private static final IIcon[][] icons = new IIcon[EnumBeeType.values().length][3];
-
     @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister register) {
         String beeIconDir = "bees/default/";
         IIcon body1 = TextureManager.registerTex(register, beeIconDir + "body1");
 
-        for (int i = 0; i < EnumBeeType.values().length; i++) {
-            EnumBeeType beeType = EnumBeeType.values()[i];
+        for (int i = 0; i < EnumBeeType.VALUES.length; i++) {
+            EnumBeeType beeType = EnumBeeType.VALUES[i];
             if (beeType == EnumBeeType.NONE) {
                 continue;
             }
 
-            String beeTypeNameBase = beeIconDir + beeType.toString().toLowerCase(Locale.ENGLISH);
+            String beeTypeNameBase = beeIconDir + beeType.getName();
 
             icons[i][0] = TextureManager.registerTex(register, beeTypeNameBase + ".outline");
             if (beeType == EnumBeeType.LARVAE) {

src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java

@@ -13,6 +13,7 @@ import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
@@ -107,11 +108,8 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
             }
 
             // Some mods might use this logic? Idk, just a safety check. Might stop griefing.
-            if (!world.canMineBlock(
-                    housing.getWorld().func_152378_a(housing.getOwner().getId()),
-                    posHousing.x,
-                    posHousing.y,
-                    posHousing.z)) {
+            EntityPlayer player = world.func_152378_a(housing.getOwner().getId());
+            if (player == null || !world.canMineBlock(player, posHousing.x, posHousing.y, posHousing.z)) {
                 continue;
             }
 

src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectThrottled.java

@@ -27,6 +27,10 @@ public abstract class AlleleEffectThrottled extends AlleleEffect {
         this.requiresWorkingQueen = requiresWorking;
     }
 
+    public int getThrottle() {
+        return throttle;
+    }
+
     @Override
     public boolean isCombinable() {
         return isCombinable;

src/main/java/forestry/apiculture/items/ItemHabitatLocator.java

@@ -71,9 +71,8 @@ public class ItemHabitatLocator extends ItemWithGui {
     public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) {
         BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords((int) player.posX, (int) player.posZ);
 
-        float temperatureValue = currentBiome
-                .getFloatTemperature((int) player.posX, (int) player.posY, (int) player.posZ);
-        EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue);
+        EnumTemperature temperature = EnumTemperature
+                .getFromBiome(currentBiome, (int) player.posX, (int) player.posY, (int) player.posZ);
         EnumHumidity humidity = EnumHumidity.getFromValue(currentBiome.rainfall);
 
         list.add(StringUtil.localize("gui.currentBiome") + ": " + currentBiome.biomeName);

src/main/java/forestry/apiculture/multiblock/AlvearyController.java

@@ -9,8 +9,10 @@
 package forestry.apiculture.multiblock;
 
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
@@ -59,7 +61,9 @@ public class AlvearyController extends RectangularMultiblockControllerBase
     // PARTS
     private final Set<IBeeModifier> beeModifiers = new HashSet<>();
     private final Set<IBeeListener> beeListeners = new HashSet<>();
-    private final Set<IAlvearyComponent.Climatiser> climatisers = new HashSet<>();
+    private final Set<IAlvearyComponent.Climatiser> climatisers = new TreeSet<>(
+            Comparator.comparingInt(IAlvearyComponent.Climatiser::getPriority).thenComparingInt(Object::hashCode)
+                    .reversed());
     private final Set<IAlvearyComponent.Active> activeComponents = new HashSet<>();
 
     // CLIENT
@@ -155,6 +159,8 @@ public class AlvearyController extends RectangularMultiblockControllerBase
                 activeComponents.remove(oldPart);
             }
         }
+
+        inventory.dumpInventoryIntoWorld(this.worldObj, oldPart.getCoordinates());
     }
 
     @Override
@@ -233,26 +239,24 @@ public class AlvearyController extends RectangularMultiblockControllerBase
             beekeepingLogic.doWork();
         }
 
+        tempChange = 0;
+        humidChange = 0;
         for (IAlvearyComponent.Climatiser climatiser : climatisers) {
             climatiser.changeClimate(tickCount, this);
         }
 
-        tempChange = equalizeChange(tempChange);
-        humidChange = equalizeChange(humidChange);
-
         return canWork;
     }
 
-    private static float equalizeChange(float change) {
-        if (change == 0) {
-            return 0;
+    private float applyChange(float base, float currentChange, float extraChange, float boundaryDown,
+            float boundaryUp) {
+        float boundedNewChange = Math.max(boundaryDown, Math.min(base + currentChange + (extraChange * 20), boundaryUp))
+                - base;
+        if (extraChange > 0) {
+            return Math.max(currentChange, boundedNewChange);
+        } else {
+            return Math.min(currentChange, boundedNewChange);
         }
-
-        change *= 0.95f;
-        if (change <= 0.001f && change >= -0.001f) {
-            change = 0;
-        }
-        return change;
     }
 
     @Override
@@ -410,19 +414,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase
         ChunkCoordinates coordinates = getCoordinates();
 
         float temperature = getBiome().getFloatTemperature(coordinates.posX, coordinates.posY, coordinates.posZ);
-
-        tempChange += change;
-        tempChange = Math.max(boundaryDown - temperature, tempChange);
-        tempChange = Math.min(boundaryUp - temperature, tempChange);
+        tempChange = applyChange(temperature, tempChange, change, boundaryDown, boundaryUp);
     }
 
     @Override
     public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
         float humidity = getBiome().rainfall;
-
-        humidChange += change;
-        humidChange = Math.max(boundaryDown - humidity, humidChange);
-        humidChange = Math.min(boundaryUp - humidity, humidChange);
+        humidChange = applyChange(humidity, humidChange, change, boundaryDown, boundaryUp);
     }
 
     /* GUI */

src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java

@@ -19,6 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 import forestry.api.core.IClimateControlled;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearyHygroregulator;
 import forestry.apiculture.gui.GuiAlvearyHygroregulator;
@@ -31,8 +32,8 @@ import forestry.core.fluids.tanks.FilteredTank;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.tiles.ILiquidTankTile;
 
-public class TileAlvearyHygroregulator extends TileAlveary
-        implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser {
+public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankTile, IFluidHandler,
+        IAlvearyComponent.Climatiser, IMultiblockComponent.HasInventory {
 
     private final HygroregulatorRecipe[] recipes;
 
@@ -56,9 +57,9 @@ public class TileAlvearyHygroregulator extends TileAlveary
         this.tankManager = new TankManager(this, liquidTank);
 
         this.recipes = new HygroregulatorRecipe[] {
-                new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.0005f),
-                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.0005f),
-                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.001f) };
+                new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.005f),
+                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f),
+                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.01f) };
     }
 
     @Override
@@ -111,6 +112,11 @@ public class TileAlvearyHygroregulator extends TileAlveary
         }
     }
 
+    @Override
+    public int getPriority() {
+        return 100;
+    }
+
     /* SAVING & LOADING */
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {

src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java

@@ -18,6 +18,7 @@ import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.ISpeciesRoot;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearySieve;
 import forestry.apiculture.gui.GuiAlvearySieve;
@@ -25,7 +26,8 @@ import forestry.apiculture.inventory.InventoryAlvearySieve;
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.inventory.watchers.ISlotPickupWatcher;
 
-public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener {
+public class TileAlvearySieve extends TileAlveary
+        implements IAlvearyComponent.BeeListener, IMultiblockComponent.HasInventory {
 
     private final IBeeListener beeListener;
     private final InventoryAlvearySieve inventory;

src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java

@@ -22,6 +22,7 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IBee;
 import forestry.api.multiblock.IAlvearyComponent;
+import forestry.api.multiblock.IMultiblockComponent;
 import forestry.apiculture.blocks.BlockAlveary;
 import forestry.apiculture.gui.ContainerAlvearySwarmer;
 import forestry.apiculture.gui.GuiAlvearySwarmer;
@@ -37,7 +38,8 @@ import forestry.core.proxy.Proxies;
 import forestry.core.tiles.IActivatable;
 import forestry.core.utils.ItemStackUtil;
 
-public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable, IAlvearyComponent.Active {
+public class TileAlvearySwarmer extends TileAlveary
+        implements ISidedInventory, IActivatable, IAlvearyComponent.Active, IMultiblockComponent.HasInventory {
 
     private final InventorySwarmer inventory;
     private final Deque<ItemStack> pendingSpawns = new ArrayDeque<>();

src/main/java/forestry/arboriculture/genetics/Tree.java

@@ -16,6 +16,8 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
@@ -298,6 +300,36 @@ public class Tree extends Individual implements ITree, IPlantable {
         return plantTypes;
     }
 
+    @Override
+    public void addLore(List<String> text) {
+        IAlleleTreeSpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 0) {
+            String speciesLore = descTokens[0];
+            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
+                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
+                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
+                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
+                text.addAll(formattedLoreList);
+            }
+        }
+    }
+
+    @Override
+    public void addDiscoveredBy(List<String> text) {
+        IAlleleTreeSpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 2) {
+            String discoveredBy = descTokens[2];
+            if (!discoveredBy.isEmpty()) {
+                text.add("");
+                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
+            }
+        }
+    }
+
     @Override
     public void addTooltip(List<String> list) {
 

src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java

@@ -82,7 +82,7 @@ public enum TreeBranchDefinition implements IBranchDefinition {
     @Override
     public IAllele[] getTemplate() {
         if (defaultTemplate == null) {
-            defaultTemplate = new IAllele[EnumTreeChromosome.values().length];
+            defaultTemplate = new IAllele[EnumTreeChromosome.VALUES.length];
 
             AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.FRUITS, AlleleFruit.fruitNone);
             AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.GROWTH, AlleleGrowth.growthLightLevel);

src/main/java/forestry/arboriculture/genetics/TreeDefinition.java

@@ -1148,6 +1148,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
         return species.getUID();
     }
 
+    public EnumWoodType getWoodType() {
+        return woodType;
+    }
+
+    public ItemStack getVanillaWood() {
+        return vanillaWood;
+    }
+
     @Override
     public final ITreeGenome getGenome() {
         return genome;

src/main/java/forestry/arboriculture/genetics/TreeHelper.java

@@ -389,7 +389,7 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot {
 
     @Override
     public IChromosomeType[] getKaryotype() {
-        return EnumTreeChromosome.values();
+        return EnumTreeChromosome.VALUES;
     }
 
     @Override

src/main/java/forestry/core/access/AccessHandler.java

@@ -113,11 +113,7 @@ public final class AccessHandler implements IAccessHandler {
         if (!isOwner(player)) {
             return false;
         }
-
-        int ordinal = (access.ordinal() + 1) % EnumAccess.values().length;
-        EnumAccess newAccess = EnumAccess.values()[ordinal];
-        setAccess(player.worldObj, newAccess);
-
+        setAccess(player.worldObj, access.next());
         return true;
     }
 
@@ -156,7 +152,7 @@ public final class AccessHandler implements IAccessHandler {
     public void readData(DataInputStreamForestry data) throws IOException {
         byte accessOrdinal = data.readByte();
         if (accessOrdinal >= 0) {
-            access = EnumAccess.values()[accessOrdinal];
+            access = EnumAccess.fromOrdinal(accessOrdinal);
             GameProfile owner = new GameProfile(new UUID(data.readLong(), data.readLong()), data.readUTF());
             setOwner(owner);
         }
@@ -164,8 +160,7 @@ public final class AccessHandler implements IAccessHandler {
 
     @Override
     public void readFromNBT(NBTTagCompound data) {
-        access = EnumAccess.values()[data.getInteger("Access")];
-
+        access = EnumAccess.fromOrdinal(data.getInteger("Access"));
         if (data.hasKey("owner")) {
             owner = NBTUtil.func_152459_a(data.getCompoundTag("owner"));
         }

src/main/java/forestry/core/access/EnumAccess.java

@@ -8,22 +8,15 @@
  ******************************************************************************/
 package forestry.core.access;
 
-import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 public enum EnumAccess {
 
     SHARED("gui.rule.shared"),
     VIEWABLE("gui.rule.restricted"),
     PRIVATE("gui.rule.private");
 
+    private static final EnumAccess[] VALUES = values();
     private final String name;
 
-    @SideOnly(Side.CLIENT)
-    private IIcon icon;
-
     EnumAccess(String name) {
         this.name = name;
     }
@@ -31,4 +24,13 @@ public enum EnumAccess {
     public String getName() {
         return this.name;
     }
+
+    public EnumAccess next() {
+        int ordinal = (this.ordinal() + 1) % VALUES.length;
+        return VALUES[ordinal];
+    }
+
+    public static EnumAccess fromOrdinal(int ordinal) {
+        return VALUES[ordinal];
+    }
 }

src/main/java/forestry/core/blocks/BlockResourceOre.java

@@ -8,6 +8,8 @@
  ******************************************************************************/
 package forestry.core.blocks;
 
+import static forestry.Forestry.isDreamcraftLoaded;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,7 +54,7 @@ public class BlockResourceOre extends Block {
     public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float par6, int par7) {
         super.dropBlockAsItemWithChance(world, x, y, z, metadata, par6, par7);
 
-        if (metadata == 0) {
+        if (metadata == 0 && !isDreamcraftLoaded) {
             this.dropXpOnBlockBreak(world, x, y, z, MathHelper.getRandomIntegerInRange(world.rand, 1, 4));
         }
     }
@@ -61,7 +63,7 @@ public class BlockResourceOre extends Block {
     public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
         ArrayList<ItemStack> drops = new ArrayList<>();
 
-        if (metadata == ResourceType.APATITE.ordinal()) {
+        if (metadata == ResourceType.APATITE.ordinal() && !isDreamcraftLoaded) {
             int fortuneModifier = world.rand.nextInt(fortune + 2) - 1;
             if (fortuneModifier < 0) {
                 fortuneModifier = 0;

src/main/java/forestry/core/blocks/BlockStructure.java

@@ -116,6 +116,12 @@ public abstract class BlockStructure extends BlockForestry {
                     InventoryUtil.dropSockets((ISocketable) tile, world, x, y, z);
                 }
             }
+
+            if (tile instanceof IMultiblockComponent.HasInventory) {
+                IMultiblockComponent.HasInventory hasInventory = (IMultiblockComponent.HasInventory) tile;
+
+                InventoryUtil.dropInventory(hasInventory.getInternalInventory(), world, x, y, z);
+            }
         }
         super.breakBlock(world, x, y, z, block, meta);
     }

src/main/java/forestry/core/circuits/CircuitBoard.java

@@ -71,7 +71,7 @@ public class CircuitBoard<T> implements ICircuitBoard {
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {
 
-        type = EnumCircuitBoardType.values()[nbttagcompound.getShort("T")];
+        type = EnumCircuitBoardType.VALUES[nbttagcompound.getShort("T")];
 
         // Layout
         if (nbttagcompound.hasKey("LY")) {

src/main/java/forestry/core/circuits/EnumCircuitBoardType.java

@@ -15,6 +15,11 @@ public enum EnumCircuitBoardType {
     REFINED((short) 3, 0x191919, 0xc9c9c9),
     INTRICATE((short) 4, 0x191919, 0xe2cb6b);
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumCircuitBoardType[] VALUES = values();
+
     private final short sockets;
     private final int primaryColor;
     private final int secondaryColor;

src/main/java/forestry/core/circuits/GuiSolderingIron.java

@@ -63,7 +63,7 @@ public class GuiSolderingIron extends GuiForestry<ContainerSolderingIron, ItemIn
                 try {
                     ICircuitSocketType socketType = layout.getSocketType();
                     if (CircuitSocketType.FARM.equals(socketType)) {
-                        FarmDirection farmDirection = FarmDirection.values()[i];
+                        FarmDirection farmDirection = FarmDirection.fromOrdinal(i);
                         String farmDirectionString = farmDirection.toString().toLowerCase(Locale.ENGLISH);
                         String localizedDirection = StringUtil.localize("gui.solder." + farmDirectionString);
                         fontRendererObj.drawString(

src/main/java/forestry/core/circuits/ItemCircuitBoard.java

@@ -50,7 +50,7 @@ public class ItemCircuitBoard extends ItemForestryMultiPass {
 
     @Override
     public int getColorFromItemStack(ItemStack itemstack, int pass) {
-        EnumCircuitBoardType type = EnumCircuitBoardType.values()[itemstack.getItemDamage()];
+        EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[itemstack.getItemDamage()];
         if (pass == 0) {
             return type.getPrimaryColor();
         } else {
@@ -60,7 +60,7 @@ public class ItemCircuitBoard extends ItemForestryMultiPass {
 
     @Override
     public String getUnlocalizedName(ItemStack stack) {
-        EnumCircuitBoardType type = EnumCircuitBoardType.values()[stack.getItemDamage()];
+        EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[stack.getItemDamage()];
         return "item.for.circuitboard." + type.toString().toLowerCase(Locale.ENGLISH);
     }
 

src/main/java/forestry/core/config/Config.java

@@ -137,6 +137,7 @@ public class Config {
     public static boolean enableHints = true;
     public static final LinkedListMultimap<String, String> hints = LinkedListMultimap.create();
     public static boolean enableEnergyStat = true;
+    public static boolean showBackpackDurability = true;
 
     public static boolean isStructureEnabled(String uid) {
         return !Config.disabledStructures.contains(uid);
@@ -301,6 +302,9 @@ public class Config {
         configCommon.moveProperty("tweaks.gui", "mail.alert", "tweaks.gui.mail.alert");
         configCommon.renameProperty("tweaks.gui.mail.alert", "mail.alert", "enabled");
 
+        showBackpackDurability = configCommon
+                .getBooleanLocalized("tweaks.gui", "showBackpackDurability", showBackpackDurability);
+
         mailAlertEnabled = configCommon.getBooleanLocalized("tweaks.gui.mail.alert", "enabled", mailAlertEnabled);
         mailAlertXPosition = configCommon.getEnumLocalized(
                 "tweaks.gui.mail.alert",

src/main/java/forestry/core/config/Constants.java

@@ -109,6 +109,7 @@ public class Constants implements IForestryConstants {
     public static final int MACHINE_MAX_ENERGY = 5000;
 
     public static final int RAINMAKER_RAIN_DURATION_IODINE = 10000;
+    public static final int RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE = 10000;
 
     public static final int STILL_DESTILLATION_DURATION = 100;
     public static final int STILL_DESTILLATION_INPUT = 10;

src/main/java/forestry/core/entities/EntityMinecartForestry.java

@@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
-import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.minecart.MinecartInteractEvent;
@@ -29,6 +28,7 @@ import forestry.core.gui.GuiHandler;
 import forestry.core.gui.IGuiHandlerEntity;
 import forestry.core.gui.IHintSource;
 import forestry.core.tiles.ITitled;
+import forestry.core.utils.StringUtil;
 
 public abstract class EntityMinecartForestry extends EntityMinecart
         implements ITitled, IRestrictedAccess, IHintSource, IGuiHandlerEntity {
@@ -111,7 +111,7 @@ public abstract class EntityMinecartForestry extends EntityMinecart
 
     @Override
     public String getCommandSenderName() {
-        return StatCollector.translateToLocal(getUnlocalizedTitle());
+        return StringUtil.localizeGuiTitle(getUnlocalizedTitle());
     }
 
     /* ITitled */

src/main/java/forestry/core/genetics/ItemGE.java

@@ -72,6 +72,12 @@ public abstract class ItemGE extends ItemForestry {
         if (individual.isAnalyzed()) {
             if (Proxies.common.isShiftDown()) {
                 individual.addTooltip(list);
+                individual.addDiscoveredBy(list);
+                if (Proxies.common.isCtrlDown()) {
+                    individual.addLore(list);
+                } else {
+                    list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tml") + ">");
+                }
             } else {
                 list.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">");
             }

src/main/java/forestry/core/genetics/mutations/Mutation.java

@@ -176,4 +176,8 @@ public abstract class Mutation implements IMutationCustom {
     public boolean isSecret() {
         return isSecret;
     }
+
+    public List<IMutationCondition> getMutationConditions() {
+        return mutationConditions;
+    }
 }

src/main/java/forestry/core/gui/ContainerItemInventory.java

@@ -53,4 +53,13 @@ public abstract class ContainerItemInventory<I extends ItemInventory> extends Co
         inventory.onSlotClick(player);
         return result;
     }
+
+    @Override
+    public void detectAndSendChanges() {
+        if (!inventory.isParentItemEquipped()) {
+            inventory.getPlayer().closeScreen();
+            return;
+        }
+        super.detectAndSendChanges();
+    }
 }

src/main/java/forestry/core/gui/GuiForestryTitled.java

@@ -10,9 +10,9 @@ package forestry.core.gui;
 
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.util.StatCollector;
 
 import forestry.core.tiles.ITitled;
+import forestry.core.utils.StringUtil;
 
 public abstract class GuiForestryTitled<C extends Container, I extends ITitled & IInventory> extends GuiForestry<C, I> {
 
@@ -24,7 +24,7 @@ public abstract class GuiForestryTitled<C extends Container, I extends ITitled &
     protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {
         super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY);
 
-        String name = StatCollector.translateToLocal(inventory.getUnlocalizedTitle());
+        String name = StringUtil.localizeGuiTitle(inventory.getUnlocalizedTitle());
         textLayout.line = 6;
         textLayout.drawCenteredLine(name, 0, fontColor.get("gui.title"));
         bindTexture(textureFile);

src/main/java/forestry/core/inventory/ItemInventory.java

@@ -78,6 +78,14 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate {
         }
     }
 
+    public boolean isParentItemEquipped() {
+        return isSameItemInventory(player.getCurrentEquippedItem(), parent);
+    }
+
+    public EntityPlayer getPlayer() {
+        return player;
+    }
+
     public boolean isParentItemInventory(ItemStack itemStack) {
         ItemStack parent = getParent();
         return isSameItemInventory(parent, itemStack);

src/main/java/forestry/core/inventory/ItemInventorySolderingIron.java

@@ -121,11 +121,11 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS
         }
 
         // Illegal type
-        if (blank.getItemDamage() < 0 || blank.getItemDamage() >= EnumCircuitBoardType.values().length) {
+        if (blank.getItemDamage() < 0 || blank.getItemDamage() >= EnumCircuitBoardType.VALUES.length) {
             return;
         }
 
-        EnumCircuitBoardType type = EnumCircuitBoardType.values()[blank.getItemDamage()];
+        EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[blank.getItemDamage()];
         if (getCircuitCount() != type.getSockets()) {
             return;
         }
@@ -172,7 +172,7 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS
         if (blankCircuitBoard == null) {
             errorStates.add(EnumErrorCode.NO_CIRCUIT_BOARD);
         } else {
-            EnumCircuitBoardType type = EnumCircuitBoardType.values()[blankCircuitBoard.getItemDamage()];
+            EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[blankCircuitBoard.getItemDamage()];
 
             int circuitCount = 0;
             for (short i = 0; i < type.getSockets(); i++) {

src/main/java/forestry/core/items/ItemForestryTool.java

@@ -31,7 +31,7 @@ public class ItemForestryTool extends ItemForestry {
         setMaxDamage(200);
         this.remnants = remnants;
         if (remnants != null) {
-            MinecraftForge.EVENT_BUS.register(this);
+            MinecraftForge.EVENT_BUS.register(new EventHandler());
         }
     }
 
@@ -53,20 +53,6 @@ public class ItemForestryTool extends ItemForestry {
         return ForgeHooks.canToolHarvestBlock(block, 0, stack);
     }
 
-    @SubscribeEvent
-    public void onDestroyCurrentItem(PlayerDestroyItemEvent event) {
-        if (event.original == null || event.original.getItem() != this) {
-            return;
-        }
-
-        EntityPlayer player = event.entityPlayer;
-        World world = player.worldObj;
-
-        if (!world.isRemote && remnants != null) {
-            ItemStackUtil.dropItemStackAsEntity(remnants.copy(), world, player.posX, player.posY, player.posZ);
-        }
-    }
-
     @Override
     public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z,
             EntityLivingBase entityliving) {
@@ -80,4 +66,21 @@ public class ItemForestryTool extends ItemForestry {
     public boolean isFull3D() {
         return true;
     }
+
+    public class EventHandler {
+
+        @SubscribeEvent
+        public void onDestroyCurrentItem(PlayerDestroyItemEvent event) {
+            if (event.original == null || event.original.getItem() != ItemForestryTool.this) {
+                return;
+            }
+
+            EntityPlayer player = event.entityPlayer;
+            World world = player.worldObj;
+
+            if (!world.isRemote && remnants != null) {
+                ItemStackUtil.dropItemStackAsEntity(remnants.copy(), world, player.posX, player.posY, player.posZ);
+            }
+        }
+    }
 }

src/main/java/forestry/core/items/ItemFruit.java

@@ -34,6 +34,9 @@ public class ItemFruit extends ItemForestryFood {
         DATES("cropDate"),
         PAPAYA("cropPapaya"); // , COCONUT("cropCoconut");
 
+        /**
+         * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+         */
         public static final EnumFruit[] VALUES = values();
 
         private final String oreDict;
@@ -94,13 +97,13 @@ public class ItemFruit extends ItemForestryFood {
     @SideOnly(Side.CLIENT)
     @Override
     public IIcon getIconFromDamage(int meta) {
-        return EnumFruit.values()[meta].getIcon();
+        return EnumFruit.VALUES[meta].getIcon();
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
     public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
-        for (int i = 0; i < EnumFruit.values().length; i++) {
+        for (int i = 0; i < EnumFruit.VALUES.length; i++) {
             itemList.add(new ItemStack(this, 1, i));
         }
     }

src/main/java/forestry/core/items/ItemRegistryCore.java

@@ -10,6 +10,8 @@ package forestry.core.items;
 
 import static forestry.Forestry.isDreamcraftLoaded;
 
+import java.util.List;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
@@ -65,7 +67,7 @@ public class ItemRegistryCore extends ItemRegistry {
 
     /* Peat */
     public final ItemForestry peat;
-    public final ItemForestry ash;
+    private final ItemForestry ash;
     public final ItemForestry bituminousPeat;
 
     /* Moistener */
@@ -76,6 +78,7 @@ public class ItemRegistryCore extends ItemRegistry {
     /* Rainmaker */
     public final ItemForestry iodineCharge;
     public final ItemForestry phosphor;
+    public final ItemForestry phosphorCharge;
 
     /* Misc */
     public final ItemCraftingMaterial craftingMaterial;
@@ -179,8 +182,8 @@ public class ItemRegistryCore extends ItemRegistry {
 
         // / RAINMAKER SUBSTRATES
         iodineCharge = registerItem(new ItemForestry(), "iodineCapsule");
-
         phosphor = registerItem(new ItemForestry(), "phosphor");
+        phosphorCharge = registerItem(new ItemForestry(), "phosphoricIodineCapsule");
 
         // / BEE RESOURCES
         beeswax = registerItem(new ItemForestry(), "beeswax");
@@ -191,9 +194,17 @@ public class ItemRegistryCore extends ItemRegistry {
 
         // FRUITS
         fruits = registerItem(new ItemFruit(), "fruits");
-        for (ItemFruit.EnumFruit def : ItemFruit.EnumFruit.values()) {
+        for (ItemFruit.EnumFruit def : ItemFruit.EnumFruit.VALUES) {
             ItemStack fruit = new ItemStack(fruits, 1, def.ordinal());
             OreDictionary.registerOre(def.getOreDict(), fruit);
         }
     }
+
+    public ItemStack getAsh() {
+        List<ItemStack> options = OreDictionary.getOres("dustAsh");
+        for (ItemStack option : options) {
+            if (option.getItem() != ash) return option.copy();
+        }
+        return ash.getItemStack();
+    }
 }

src/main/java/forestry/core/proxy/ProxyCommon.java

@@ -61,6 +61,10 @@ public class ProxyCommon {
         return false;
     }
 
+    public boolean isCtrlDown() {
+        return false;
+    }
+
     public void playSoundFX(World world, int x, int y, int z, Block block) {
         Proxies.net.sendNetworkPacket(new PacketFXSignal(PacketFXSignal.SoundFXType.LEAF, x, y, z, block, 0), world);
     }

src/main/java/forestry/core/proxy/ProxyCommonClient.java

@@ -63,6 +63,11 @@ public class ProxyCommonClient extends ProxyCommon {
         return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
     }
 
+    @Override
+    public boolean isCtrlDown() {
+        return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
+    }
+
     @Override
     public String getDisplayName(ItemStack itemstack) {
         return itemstack.getItem().getItemStackDisplayName(itemstack);

src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java

@@ -112,18 +112,12 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
     public List<String> handleTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, int recipe) {
         super.handleTooltip(guiRecipe, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
+
         if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
             Point mouse = GuiDraw.getMousePosition();
-            int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
-
-            if (recipeIndex >= 0) {
-                Point offset = guiRecipe.getRecipePosition(recipeIndex);
-                Point relMouse = new Point(
-                        mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
-                        mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
-
-                currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
-            }
+            Point offset = guiRecipe.getRecipePosition(recipe);
+            Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
+            currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
         }
 
         return currenttip;
@@ -135,18 +129,10 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
         super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
         Point mouse = GuiDraw.getMousePosition();
-        int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
+        Point offset = guiRecipe.getRecipePosition(recipe);
+        Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
 
-        if (recipeIndex >= 0) {
-            Point offset = guiRecipe.getRecipePosition(recipeIndex);
-            Point relMouse = new Point(
-                    mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
-                    mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
-
-            currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
-        }
-
-        return currenttip;
+        return this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
     }
 
     public List<String> provideTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, CachedBaseRecipe crecipe,
@@ -210,11 +196,9 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
 
     protected boolean transferFluidTank(GuiRecipe<?> guiRecipe, int recipe, boolean usage) {
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
-        Point mousepos = GuiDraw.getMousePosition();
+        Point mouse = GuiDraw.getMousePosition();
         Point offset = guiRecipe.getRecipePosition(recipe);
-        Point relMouse = new Point(
-                mousepos.x - (guiRecipe.width - 176) / 2 - offset.x,
-                mousepos.y - (guiRecipe.height - 166) / 2 - offset.y);
+        Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
 
         if (crecipe.getFluidTanks() != null) {
             for (PositionedFluidTank tank : crecipe.getFluidTanks()) {

src/main/java/forestry/core/render/FontColour.java

@@ -8,15 +8,19 @@
  ******************************************************************************/
 package forestry.core.render;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
+import net.minecraft.client.resources.IResource;
 import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
 
 public class FontColour {
 
-    // private static final ResourceLocation colourDefinitions = new
-    // ForestryResource("/config/forestry/colour.properties");
+    private static final ResourceLocation colourDefinitions = new ForestryResource("config/colour.properties");
+    private static final String defaultColourDefinitions = "/assets/forestry/config/colour.properties";
 
     private final Properties defaultMappings = new Properties();
     private final Properties mappings = new Properties();
@@ -30,17 +34,30 @@ public class FontColour {
     }
 
     public void load(IResourceManager texturepack) {
-        try {
-            // InputStream fontStream = texturepack.func_110536_a(colourDefinitions).func_110527_b();
-            InputStream defaultFontStream = FontColour.class.getResourceAsStream("/config/forestry/colour.properties");
-            // mappings.load((fontStream == null) ? defaultFontStream : fontStream);
-            mappings.load(defaultFontStream);
-            defaultMappings.load(defaultFontStream);
+        mappings.clear();
+        defaultMappings.clear();
 
-            // if (fontStream != null)
-            // fontStream.close();
-            defaultFontStream.close();
-        } catch (Exception e) {
+        try (InputStream defaultFontStream = FontColour.class.getResourceAsStream(defaultColourDefinitions)) {
+            if (defaultFontStream != null) {
+                defaultMappings.load(defaultFontStream);
+                mappings.putAll(defaultMappings);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        if (texturepack == null) {
+            return;
+        }
+
+        try {
+            IResource resource = texturepack.getResource(colourDefinitions);
+            try (InputStream fontStream = resource.getInputStream()) {
+                mappings.load(fontStream);
+            }
+        } catch (FileNotFoundException ignored) {
+            // Resource pack does not provide an override.
+        } catch (IOException e) {
             e.printStackTrace();
         }
     }

src/main/java/forestry/core/tiles/EscritoireTextSource.java

@@ -37,7 +37,8 @@ public class EscritoireTextSource {
         EnumSet<Notes> multipleTranslationNoteLevels = EnumSet
                 .of(Notes.level1, Notes.level2, Notes.level3, Notes.level4, Notes.success, Notes.failure);
         for (Notes notesLevel : multipleTranslationNoteLevels) {
-            int levelCount = Integer.valueOf(StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count"));
+            int levelCount = Integer.valueOf(
+                    StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count").replaceAll("§\\d", ""));
             for (int i = 1; i <= levelCount; i++) {
                 String note = StringUtil.localize("gui.escritoire.notes." + notesLevel + '.' + i);
                 researchNotes.put(notesLevel, note);

src/main/java/forestry/core/utils/BlockUtil.java

@@ -235,7 +235,7 @@ public abstract class BlockUtil {
     private static Class<? extends Block> GTBlockMachines_Class;
     private static Block GTBlockMachines;
     private static final boolean bw = Loader.isModLoaded("bartworks");
-    private static final boolean gt = Loader.isModLoaded("gregtech");
+    private static final boolean gt = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi");
 
     static {
         if (bw) try {
@@ -268,11 +268,13 @@ public abstract class BlockUtil {
         } while (stillInside.test(tile));
         block = world.getBlock(x, y - depth, z);
 
-        if (bw && BW_MetaGenerated_WerkstoffBlocksClass.isInstance(block)) {
+        if (bw && BW_MetaGenerated_WerkstoffBlocksClass != null
+                && BWBlocks != null
+                && BW_MetaGenerated_WerkstoffBlocksClass.isInstance(block)) {
             return new ItemStack(BWBlocks, 1, block.getDamageValue(world, x, y - depth, z));
         }
 
-        if (gt && GTBlockMachines_Class.isInstance(block)) {
+        if (gt && GTBlockMachines_Class != null && GTBlockMachines != null && GTBlockMachines_Class.isInstance(block)) {
             return new ItemStack(GTBlockMachines, 1, block.getDamageValue(world, x, y - depth, z));
         }
 

src/main/java/forestry/core/utils/ClimateUtil.java

@@ -45,18 +45,18 @@ public class ClimateUtil implements IClimateHelper {
             case BOTH_4:
             case BOTH_3:
             case BOTH_2:
-                if (prefered.ordinal() + 2 < EnumHumidity.values().length) {
-                    tolerated.add(EnumHumidity.values()[prefered.ordinal() + 2]);
+                if (prefered.ordinal() + 2 < EnumHumidity.VALUES.length) {
+                    tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 2]);
                 }
                 if (prefered.ordinal() - 2 >= 0) {
-                    tolerated.add(EnumHumidity.values()[prefered.ordinal() - 2]);
+                    tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 2]);
                 }
             case BOTH_1:
-                if (prefered.ordinal() + 1 < EnumHumidity.values().length) {
-                    tolerated.add(EnumHumidity.values()[prefered.ordinal() + 1]);
+                if (prefered.ordinal() + 1 < EnumHumidity.VALUES.length) {
+                    tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 1]);
                 }
                 if (prefered.ordinal() - 1 >= 0) {
-                    tolerated.add(EnumHumidity.values()[prefered.ordinal() - 1]);
+                    tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 1]);
                 }
                 return tolerated;
 
@@ -64,12 +64,12 @@ public class ClimateUtil implements IClimateHelper {
             case UP_4:
             case UP_3:
             case UP_2:
-                if (prefered.ordinal() + 2 < EnumHumidity.values().length) {
-                    tolerated.add(EnumHumidity.values()[prefered.ordinal() + 2]);
+                if (prefered.ordinal() + 2 < EnumHumidity.VALUES.length) {
+                    tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 2]);
                 }
             case UP_1:
-                if (prefered.ordinal() + 1 < EnumHumidity.values().length) {
-                    tolerated.add(EnumHumidity.values()[prefered.ordinal() + 1]);
+                if (prefered.ordinal() + 1 < EnumHumidity.VALUES.length) {
+                    tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 1]);
                 }
                 return tolerated;
 
@@ -78,11 +78,11 @@ public class ClimateUtil implements IClimateHelper {
             case DOWN_3:
             case DOWN_2:
                 if (prefered.ordinal() - 2 >= 0) {
-                    tolerated.add(EnumHumidity.values()[prefered.ordinal() - 2]);
+                    tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 2]);
                 }
             case DOWN_1:
                 if (prefered.ordinal() - 1 >= 0) {
-                    tolerated.add(EnumHumidity.values()[prefered.ordinal() - 1]);
+                    tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 1]);
                 }
                 return tolerated;
 
@@ -96,85 +96,86 @@ public class ClimateUtil implements IClimateHelper {
         ArrayList<EnumTemperature> tolerated = new ArrayList<>();
         tolerated.add(prefered);
 
+        final EnumTemperature[] TEMP_VALUES = EnumTemperature.VALUES;
         switch (tolerance) {
             case BOTH_5:
-                if (prefered.ordinal() + 5 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 5]);
+                if (prefered.ordinal() + 5 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 5]);
                 }
                 if (prefered.ordinal() - 5 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 5]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 5]);
                 }
             case BOTH_4:
-                if (prefered.ordinal() + 4 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 4]);
+                if (prefered.ordinal() + 4 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 4]);
                 }
                 if (prefered.ordinal() - 4 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 4]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 4]);
                 }
             case BOTH_3:
-                if (prefered.ordinal() + 3 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 3]);
+                if (prefered.ordinal() + 3 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 3]);
                 }
                 if (prefered.ordinal() - 3 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 3]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 3]);
                 }
             case BOTH_2:
-                if (prefered.ordinal() + 2 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 2]);
+                if (prefered.ordinal() + 2 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 2]);
                 }
                 if (prefered.ordinal() - 2 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 2]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 2]);
                 }
             case BOTH_1:
-                if (prefered.ordinal() + 1 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 1]);
+                if (prefered.ordinal() + 1 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 1]);
                 }
                 if (prefered.ordinal() - 1 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 1]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 1]);
                 }
                 return tolerated;
 
             case UP_5:
-                if (prefered.ordinal() + 5 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 5]);
+                if (prefered.ordinal() + 5 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 5]);
                 }
             case UP_4:
-                if (prefered.ordinal() + 4 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 4]);
+                if (prefered.ordinal() + 4 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 4]);
                 }
             case UP_3:
-                if (prefered.ordinal() + 3 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 3]);
+                if (prefered.ordinal() + 3 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 3]);
                 }
             case UP_2:
-                if (prefered.ordinal() + 2 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 2]);
+                if (prefered.ordinal() + 2 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 2]);
                 }
             case UP_1:
-                if (prefered.ordinal() + 1 < EnumTemperature.values().length) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() + 1]);
+                if (prefered.ordinal() + 1 < TEMP_VALUES.length) {
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() + 1]);
                 }
                 return tolerated;
 
             case DOWN_5:
                 if (prefered.ordinal() - 5 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 5]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 5]);
                 }
             case DOWN_4:
                 if (prefered.ordinal() - 4 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 4]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 4]);
                 }
             case DOWN_3:
                 if (prefered.ordinal() - 3 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 3]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 3]);
                 }
             case DOWN_2:
                 if (prefered.ordinal() - 2 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 2]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 2]);
                 }
             case DOWN_1:
                 if (prefered.ordinal() - 1 >= 0) {
-                    tolerated.add(EnumTemperature.values()[prefered.ordinal() - 1]);
+                    tolerated.add(TEMP_VALUES[prefered.ordinal() - 1]);
                 }
                 return tolerated;
 

src/main/java/forestry/core/utils/GeneticsUtil.java

@@ -96,6 +96,8 @@ public class GeneticsUtil {
      * altering the world by changing vanilla leaves to forestry ones.
      */
     public static ICheckPollinatable getCheckPollinatable(World world, final int x, final int y, final int z) {
+        if (!world.blockExists(x, y, z)) return null;
+
         TileEntity tile = world.getTileEntity(x, y, z);
 
         if (tile instanceof IPollinatable) {

src/main/java/forestry/core/utils/StringUtil.java

@@ -38,6 +38,17 @@ public class StringUtil {
                 .replace("\\%", "@");
     }
 
+    public static String localizeGuiTitle(String unlocalizedKey) {
+        String titleKey = unlocalizedKey + ".title";
+        String translated;
+        if (StatCollector.canTranslate(titleKey)) {
+            translated = StatCollector.translateToLocal(titleKey);
+        } else {
+            translated = StatCollector.translateToLocal(unlocalizedKey);
+        }
+        return translated.replace("\\n", "\n").replace("@", "%").replace("\\%", "@");
+    }
+
     public static String localizeAndFormat(String key, Object... args) {
         return localizeAndFormatRaw("for." + key, args);
     }

src/main/java/forestry/energy/tiles/TileEnginePeat.java

@@ -78,7 +78,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory {
                 return i;
             }
 
-            if (waste.getItem() != PluginCore.items.ash) {
+            if (waste.getItem() != PluginCore.items.getAsh().getItem()) {
                 continue;
             }
 
@@ -182,7 +182,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory {
         if (wasteSlot >= 0) {
             IInventoryAdapter inventory = getInternalInventory();
             if (inventory.getStackInSlot(wasteSlot) == null) {
-                inventory.setInventorySlotContents(wasteSlot, PluginCore.items.ash.getItemStack());
+                inventory.setInventorySlotContents(wasteSlot, PluginCore.items.getAsh());
             } else {
                 inventory.getStackInSlot(wasteSlot).stackSize++;
             }

src/main/java/forestry/factory/inventory/InventoryRainmaker.java

@@ -26,16 +26,14 @@ public class InventoryRainmaker extends InventoryAdapterTile<TileMillRainmaker>
     @Override
     public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
         if (slotIndex == SLOT_SUBSTRATE) {
+            if (getStackInSlot(SLOT_SUBSTRATE) != null) {
+                return false;
+            }
             if (FuelManager.rainSubstrate.containsKey(itemStack) && tile.charge == 0 && tile.progress == 0) {
                 RainSubstrate substrate = FuelManager.rainSubstrate.get(itemStack);
-                if (tile.getWorld().isRaining() && substrate.reverse) {
-                    return true;
-                } else if (!tile.getWorld().isRaining() && !substrate.reverse) {
-                    return true;
-                }
+                return tile.isValidSubstrate(substrate);
             }
         }
-
         return false;
     }
 

src/main/java/forestry/factory/recipes/nei/NEIHandlerBottler.java

@@ -15,7 +15,6 @@ import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
 import net.minecraftforge.fluids.FluidStack;
@@ -26,6 +25,7 @@ import codechicken.nei.PositionedStack;
 import forestry.core.recipes.nei.NEIUtils;
 import forestry.core.recipes.nei.PositionedFluidTank;
 import forestry.core.recipes.nei.RecipeHandlerBase;
+import forestry.core.utils.StringUtil;
 import forestry.factory.gui.GuiBottler;
 import forestry.factory.recipes.BottlerRecipe;
 
@@ -89,7 +89,7 @@ public class NEIHandlerBottler extends RecipeHandlerBase {
 
     @Override
     public String getRecipeName() {
-        return StatCollector.translateToLocal("tile.for.factory.0.name");
+        return StringUtil.localizeGuiTitle("tile.for.factory.0.name");
     }
 
     @Override

src/main/java/forestry/factory/recipes/nei/NEIHandlerCarpenter.java

@@ -15,7 +15,6 @@ import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.FluidStack;
 
 import codechicken.lib.gui.GuiDraw;
@@ -28,6 +27,7 @@ import forestry.api.recipes.RecipeManagers;
 import forestry.core.recipes.nei.NEIUtils;
 import forestry.core.recipes.nei.PositionedFluidTank;
 import forestry.core.recipes.nei.RecipeHandlerBase;
+import forestry.core.utils.StringUtil;
 import forestry.factory.gui.GuiCarpenter;
 
 public class NEIHandlerCarpenter extends RecipeHandlerBase {
@@ -125,7 +125,7 @@ public class NEIHandlerCarpenter extends RecipeHandlerBase {
 
     @Override
     public String getRecipeName() {
-        return StatCollector.translateToLocal("tile.for.factory.1.name");
+        return StringUtil.localizeGuiTitle("tile.for.factory.1.name");
     }
 
     @Override

src/main/java/forestry/factory/recipes/nei/NEIHandlerCentrifuge.java

@@ -18,7 +18,6 @@ import java.util.Set;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
 
 import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
@@ -26,6 +25,7 @@ import forestry.api.recipes.ICentrifugeRecipe;
 import forestry.api.recipes.RecipeManagers;
 import forestry.core.recipes.nei.PositionedStackAdv;
 import forestry.core.recipes.nei.RecipeHandlerBase;
+import forestry.core.utils.StringUtil;
 import forestry.factory.gui.GuiCentrifuge;
 
 public class NEIHandlerCentrifuge extends RecipeHandlerBase {
@@ -109,7 +109,7 @@ public class NEIHandlerCentrifuge extends RecipeHandlerBase {
 
     @Override
     public String getRecipeName() {
-        return StatCollector.translateToLocal("tile.for.factory.2.name");
+        return StringUtil.localizeGuiTitle("tile.for.factory.2.name");
     }
 
     @Override

src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java

@@ -18,7 +18,6 @@ import java.util.Map;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -31,6 +30,7 @@ import forestry.api.recipes.RecipeManagers;
 import forestry.core.recipes.nei.NEIUtils;
 import forestry.core.recipes.nei.PositionedFluidTank;
 import forestry.core.recipes.nei.RecipeHandlerBase;
+import forestry.core.utils.StringUtil;
 import forestry.factory.gui.GuiFabricator;
 import forestry.factory.recipes.FabricatorSmeltingRecipeManager;
 
@@ -140,7 +140,7 @@ public class NEIHandlerFabricator extends RecipeHandlerBase {
 
     @Override
     public String getRecipeName() {
-        return StatCollector.translateToLocal("tile.for.factory2.0.name");
+        return StringUtil.localizeGuiTitle("tile.for.factory2.0.name");
     }
 
     @Override

src/main/java/forestry/factory/recipes/nei/NEIHandlerFermenter.java

@@ -16,7 +16,6 @@ import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.FluidStack;
 
 import codechicken.lib.gui.GuiDraw;
@@ -32,6 +31,7 @@ import forestry.core.config.Constants;
 import forestry.core.recipes.nei.NEIUtils;
 import forestry.core.recipes.nei.PositionedFluidTank;
 import forestry.core.recipes.nei.RecipeHandlerBase;
+import forestry.core.utils.StringUtil;
 import forestry.factory.gui.GuiFermenter;
 
 public class NEIHandlerFermenter extends RecipeHandlerBase {
@@ -118,7 +118,7 @@ public class NEIHandlerFermenter extends RecipeHandlerBase {
 
     @Override
     public String getRecipeName() {
-        return StatCollector.translateToLocal("tile.for.factory.3.name");
+        return StringUtil.localizeGuiTitle("tile.for.factory.3.name");
     }
 
     @Override

src/main/java/forestry/factory/recipes/nei/NEIHandlerMoistener.java

@@ -15,7 +15,6 @@ import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -27,6 +26,7 @@ import forestry.api.recipes.IMoistenerRecipe;
 import forestry.api.recipes.RecipeManagers;
 import forestry.core.recipes.nei.PositionedFluidTank;
 import forestry.core.recipes.nei.RecipeHandlerBase;
+import forestry.core.utils.StringUtil;
 import forestry.factory.gui.GuiMoistener;
 
 public class NEIHandlerMoistener extends RecipeHandlerBase {
@@ -88,7 +88,7 @@ public class NEIHandlerMoistener extends RecipeHandlerBase {
 
     @Override
     public String getRecipeName() {
-        return StatCollector.translateToLocal("tile.for.factory.4.name");
+        return StringUtil.localizeGuiTitle("tile.for.factory.4.name");
     }
 
     @Override

src/main/java/forestry/factory/recipes/nei/NEIHandlerSqueezer.java

@@ -18,7 +18,6 @@ import java.util.Random;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.FluidStack;
 
 import codechicken.nei.NEIServerUtils;
@@ -30,6 +29,7 @@ import forestry.core.recipes.nei.NEIUtils;
 import forestry.core.recipes.nei.PositionedFluidTank;
 import forestry.core.recipes.nei.PositionedStackAdv;
 import forestry.core.recipes.nei.RecipeHandlerBase;
+import forestry.core.utils.StringUtil;
 import forestry.factory.gui.GuiSqueezer;
 import forestry.factory.recipes.ISqueezerContainerRecipe;
 import forestry.factory.recipes.SqueezerRecipeManager;
@@ -165,7 +165,7 @@ public class NEIHandlerSqueezer extends RecipeHandlerBase {
 
     @Override
     public String getRecipeName() {
-        return StatCollector.translateToLocal("tile.for.factory.5.name");
+        return StringUtil.localizeGuiTitle("tile.for.factory.5.name");
     }
 
     @Override

src/main/java/forestry/factory/recipes/nei/NEIHandlerStill.java

@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.fluids.FluidStack;
 
 import codechicken.lib.gui.GuiDraw;
@@ -24,6 +23,7 @@ import forestry.api.recipes.RecipeManagers;
 import forestry.core.recipes.nei.NEIUtils;
 import forestry.core.recipes.nei.PositionedFluidTank;
 import forestry.core.recipes.nei.RecipeHandlerBase;
+import forestry.core.utils.StringUtil;
 import forestry.factory.gui.GuiStill;
 
 public class NEIHandlerStill extends RecipeHandlerBase {
@@ -71,7 +71,7 @@ public class NEIHandlerStill extends RecipeHandlerBase {
 
     @Override
     public String getRecipeName() {
-        return StatCollector.translateToLocal("tile.for.factory.6.name");
+        return StringUtil.localizeGuiTitle("tile.for.factory.6.name");
     }
 
     @Override

src/main/java/forestry/factory/tiles/TileMillRainmaker.java

@@ -10,6 +10,7 @@ package forestry.factory.tiles;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.storage.WorldInfo;
 
 import forestry.api.fuels.FuelManager;
 import forestry.api.fuels.RainSubstrate;
@@ -20,7 +21,7 @@ import forestry.factory.inventory.InventoryRainmaker;
 public class TileMillRainmaker extends TileMill {
 
     private int duration;
-    private boolean reverse;
+    private RainSubstrate.WeatherState weather;
 
     public TileMillRainmaker() {
         super(null);
@@ -39,9 +40,9 @@ public class TileMillRainmaker extends TileMill {
         }
 
         // We don't have a gui, but we can be activated
-        if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0) {
+        if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0 && progress == 0) {
             RainSubstrate substrate = FuelManager.rainSubstrate.get(player.inventory.getCurrentItem());
-            if (substrate.item.isItemEqual(player.inventory.getCurrentItem())) {
+            if (isValidSubstrate(substrate)) {
                 addCharge(substrate);
                 player.inventory.getCurrentItem().stackSize--;
             }
@@ -49,6 +50,17 @@ public class TileMillRainmaker extends TileMill {
         sendNetworkUpdate();
     }
 
+    public boolean isValidSubstrate(RainSubstrate substrate) {
+        boolean thundering = getWorld().isThundering();
+        boolean raining = getWorld().isRaining();
+
+        return switch (substrate.weather) {
+            case CLEAR -> (thundering || raining);
+            case RAIN -> (thundering || !raining);
+            case STORM -> (!thundering);
+        };
+    }
+
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {
         super.readFromNBT(nbttagcompound);
@@ -57,7 +69,7 @@ public class TileMillRainmaker extends TileMill {
         progress = nbttagcompound.getFloat("Progress");
         stage = nbttagcompound.getInteger("Stage");
         duration = nbttagcompound.getInteger("Duration");
-        reverse = nbttagcompound.getBoolean("Reverse");
+        weather = RainSubstrate.WeatherState.valueOf(nbttagcompound.getString("Weather"));
     }
 
     @Override
@@ -68,14 +80,14 @@ public class TileMillRainmaker extends TileMill {
         nbttagcompound.setFloat("Progress", progress);
         nbttagcompound.setInteger("Stage", stage);
         nbttagcompound.setInteger("Duration", duration);
-        nbttagcompound.setBoolean("Reverse", reverse);
+        nbttagcompound.setString("Weather", weather.name());
     }
 
     public void addCharge(RainSubstrate substrate) {
         charge = 1;
         speed = substrate.speed;
         duration = substrate.duration;
-        reverse = substrate.reverse;
+        weather = substrate.weather;
         sendNetworkUpdate();
     }
 
@@ -103,15 +115,26 @@ public class TileMillRainmaker extends TileMill {
         }
 
         if (!worldObj.isRemote) {
-            if (reverse) {
-                worldObj.getWorldInfo().setRaining(false);
-            } else {
-                worldObj.getWorldInfo().setRaining(true);
-                worldObj.getWorldInfo().setRainTime(duration);
+            WorldInfo world = worldObj.getWorldInfo();
+            switch (weather) {
+                case CLEAR:
+                    world.setRaining(false);
+                    world.setThundering(false);
+                    break;
+                case STORM:
+                    world.setRaining(true);
+                    world.setRainTime(duration);
+                    world.setThundering(true);
+                    world.setThunderTime(duration);
+                    break;
+                case RAIN:
+                    world.setRaining(true);
+                    world.setRainTime(duration);
+                    world.setThundering(false);
+                    break;
             }
             charge = 0;
             duration = 0;
-            reverse = false;
             sendNetworkUpdate();
         }
     }

src/main/java/forestry/farming/blocks/BlockFarm.java

@@ -61,7 +61,7 @@ public class BlockFarm extends BlockStructure {
                 continue;
             }
 
-            for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) {
+            for (EnumFarmBlockTexture block : EnumFarmBlockTexture.VALUES) {
                 ItemStack stack = new ItemStack(item, 1, i);
                 NBTTagCompound compound = new NBTTagCompound();
                 block.saveToCompound(compound);

src/main/java/forestry/farming/circuits/CircuitFarmLogic.java

@@ -61,7 +61,7 @@ public class CircuitFarmLogic extends Circuit {
         } catch (Throwable e) {
             // uses older version of the API that doesn't implement setManual
         }
-        housing.setFarmLogic(FarmDirection.values()[slot], logic);
+        housing.setFarmLogic(FarmDirection.fromOrdinal(slot), logic);
     }
 
     @Override
@@ -75,8 +75,7 @@ public class CircuitFarmLogic extends Circuit {
         if (farmHousing == null) {
             return;
         }
-
-        farmHousing.resetFarmLogic(FarmDirection.values()[slot]);
+        farmHousing.resetFarmLogic(FarmDirection.fromOrdinal(slot));
     }
 
     @Override

src/main/java/forestry/farming/multiblock/FarmController.java

@@ -372,7 +372,7 @@ public class FarmController extends RectangularMultiblockControllerBase
     }
 
     private void refreshFarmLogics() {
-        for (FarmDirection direction : FarmDirection.values()) {
+        for (FarmDirection direction : FarmDirection.VALUES) {
             resetFarmLogic(direction);
         }
 
@@ -475,7 +475,7 @@ public class FarmController extends RectangularMultiblockControllerBase
         // Cultivation and collection
         FarmWorkStatus farmWorkStatus = new FarmWorkStatus();
 
-        for (FarmDirection farmSide : FarmDirection.values()) {
+        for (FarmDirection farmSide : FarmDirection.VALUES) {
 
             IFarmLogic logic = getFarmLogic(farmSide);
             if (logic == null) {
@@ -541,7 +541,7 @@ public class FarmController extends RectangularMultiblockControllerBase
     private static void createTargets(World world, Map<FarmDirection, List<FarmTarget>> targets, Vect targetStart,
             final int allowedExtent, final int farmSizeNorthSouth, final int farmSizeEastWest) {
 
-        for (FarmDirection farmSide : FarmDirection.values()) {
+        for (FarmDirection farmSide : FarmDirection.VALUES) {
 
             final int farmWidth;
             if (farmSide == FarmDirection.NORTH || farmSide == FarmDirection.SOUTH) {

src/main/java/forestry/farming/multiblock/InventoryFarm.java

@@ -106,7 +106,7 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
             return false;
         }
 
-        for (FarmDirection farmDirection : FarmDirection.values()) {
+        for (FarmDirection farmDirection : FarmDirection.VALUES) {
             IFarmLogic logic = farmController.getFarmLogic(farmDirection);
             if (logic.isAcceptedGermling(itemstack)) {
                 return true;
@@ -122,7 +122,7 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
             return false;
         }
 
-        for (FarmDirection farmDirection : FarmDirection.values()) {
+        for (FarmDirection farmDirection : FarmDirection.VALUES) {
             IFarmLogic logic = farmController.getFarmLogic(farmDirection);
             if (logic.isAcceptedResource(itemstack)) {
                 return true;

src/main/java/forestry/farming/render/EnumFarmBlockTexture.java

@@ -45,8 +45,17 @@ public enum EnumFarmBlockTexture {
     private static final int TYPE_VALVE = 6;
     private static final int TYPE_CONTROL = 7;
 
+    /**
+     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
+     */
+    public static final EnumFarmBlockTexture[] VALUES = values();
     @SideOnly(Side.CLIENT)
     private static List<IIcon> icons;
+    private final ItemStack base;
+
+    EnumFarmBlockTexture(ItemStack base) {
+        this.base = base;
+    }
 
     @SideOnly(Side.CLIENT)
     public static void registerIcons(IIconRegister register) {
@@ -61,12 +70,6 @@ public enum EnumFarmBlockTexture {
                 TextureManager.registerTex(register, "farm/control"));
     }
 
-    private final ItemStack base;
-
-    EnumFarmBlockTexture(ItemStack base) {
-        this.base = base;
-    }
-
     @SideOnly(Side.CLIENT)
     public static IIcon getIcon(BlockFarmType type, int side) {
         switch (type) {
@@ -109,11 +112,10 @@ public enum EnumFarmBlockTexture {
     public static EnumFarmBlockTexture getFromCompound(NBTTagCompound compound) {
         if (compound != null) {
             int farmBlockOrdinal = compound.getInteger("FarmBlock");
-            if (farmBlockOrdinal < EnumFarmBlockTexture.values().length) {
-                return EnumFarmBlockTexture.values()[farmBlockOrdinal];
+            if (farmBlockOrdinal < EnumFarmBlockTexture.VALUES.length) {
+                return EnumFarmBlockTexture.VALUES[farmBlockOrdinal];
             }
         }
-
         return EnumFarmBlockTexture.BRICK_STONE;
     }
 }

src/main/java/forestry/lepidopterology/genetics/Butterfly.java

@@ -14,6 +14,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -60,6 +62,36 @@ public class Butterfly extends IndividualLiving implements IButterfly {
         this.genome = genome;
     }
 
+    @Override
+    public void addLore(List<String> text) {
+        IAlleleButterflySpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 0) {
+            String speciesLore = descTokens[0];
+            if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
+                FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
+                String formattedLore = EnumChatFormatting.GOLD + speciesLore;
+                List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
+                text.addAll(formattedLoreList);
+            }
+        }
+    }
+
+    @Override
+    public void addDiscoveredBy(List<String> text) {
+        IAlleleButterflySpecies primary = genome.getPrimary();
+        String descTokens[] = primary.getDescription().split("\\|");
+
+        if (descTokens.length > 2) {
+            String discoveredBy = descTokens[2];
+            if (!discoveredBy.isEmpty()) {
+                text.add("");
+                text.add("Discovered by " + EnumChatFormatting.ITALIC + discoveredBy);
+            }
+        }
+    }
+
     @Override
     public void addTooltip(List<String> list) {
         IAlleleButterflySpecies primary = genome.getPrimary();

src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java

@@ -57,7 +57,7 @@ public enum ButterflyBranchDefinition implements IBranchDefinition {
     @Override
     public IAllele[] getTemplate() {
         if (defaultTemplate == null) {
-            defaultTemplate = new IAllele[EnumButterflyChromosome.values().length];
+            defaultTemplate = new IAllele[EnumButterflyChromosome.VALUES.length];
 
             AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALL);
             AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWEST);

src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java

@@ -245,7 +245,7 @@ public class ButterflyHelper extends SpeciesRoot implements IButterflyRoot {
 
     @Override
     public IChromosomeType[] getKaryotype() {
-        return EnumButterflyChromosome.values();
+        return EnumButterflyChromosome.VALUES;
     }
 
     @Override

src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java

@@ -18,11 +18,10 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import com.mojang.realmsclient.gui.ChatFormatting;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.Tabs;
@@ -93,7 +92,7 @@ public class ItemButterflyGE extends ItemGE {
     @Override
     public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) {
         super.addInformation(itemstack, player, list, flag);
-        if (Config.disableButterfly && type == EnumFlutterType.BUTTERFLY) list.add(ChatFormatting.RED + "Disabled");
+        if (Config.disableButterfly && type == EnumFlutterType.BUTTERFLY) list.add(EnumChatFormatting.RED + "Disabled");
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })

src/main/java/forestry/mail/gui/GuiTrader.java

@@ -9,7 +9,6 @@
 package forestry.mail.gui;
 
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.StatCollector;
 
 import forestry.core.config.Constants;
 import forestry.core.gui.GuiForestry;
@@ -26,7 +25,7 @@ public class GuiTrader extends GuiForestry<ContainerTrader, TileTrader> {
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        String name = StatCollector.translateToLocal(inventory.getUnlocalizedTitle());
+        String name = StringUtil.localizeGuiTitle(inventory.getUnlocalizedTitle());
         this.fontRendererObj.drawString(name, textLayout.getCenteredOffset(name), 6, fontColor.get("gui.mail.text"));
 
         String receive = StringUtil.localize("gui.mail.receive");

src/main/java/forestry/plugins/PluginCore.java

@@ -137,7 +137,7 @@ public class PluginCore extends ForestryPlugin {
         crateRegistry.registerCrate(items.fertilizerCompound, "cratedFertilizer");
         crateRegistry.registerCrate(items.mulch, "cratedMulch");
         crateRegistry.registerCrate(items.phosphor, "cratedPhosphor");
-        crateRegistry.registerCrate(items.ash, "cratedAsh");
+        crateRegistry.registerCrateUsingOreDict(items.getAsh(), "cratedAsh");
         if (!isDreamcraftLoaded) {
             crateRegistry.registerCrate(items.apatite, "cratedApatite");
             crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin");
@@ -207,7 +207,7 @@ public class PluginCore extends ForestryPlugin {
                     0.5f);
             RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.TIN, 1), items.ingotTin, 0.5f);
         }
-        RecipeUtil.addSmelting(new ItemStack(items.peat), items.ash, 0.0f);
+        RecipeUtil.addSmelting(new ItemStack(items.peat), items.getAsh(), 0.0f);
 
         /* BRONZE INGOTS */
         if (Config.isCraftingBronzeEnabled()) {

src/main/java/forestry/plugins/PluginFactory.java

@@ -222,9 +222,23 @@ public class PluginFactory extends ForestryPlugin {
         // Set rain substrates
         ItemStack iodineCharge = coreItems.iodineCharge.getItemStack();
         ItemStack dissipationCharge = coreItems.craftingMaterial.getDissipationCharge();
+        ItemStack phosphorCharge = coreItems.phosphorCharge.getItemStack();
+        FuelManager.rainSubstrate.put(
+                iodineCharge,
+                new RainSubstrate(
+                        iodineCharge,
+                        Constants.RAINMAKER_RAIN_DURATION_IODINE,
+                        0.01f,
+                        RainSubstrate.WeatherState.RAIN));
         FuelManager.rainSubstrate
-                .put(iodineCharge, new RainSubstrate(iodineCharge, Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f));
-        FuelManager.rainSubstrate.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f));
+                .put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f, RainSubstrate.WeatherState.CLEAR));
+        FuelManager.rainSubstrate.put(
+                phosphorCharge,
+                new RainSubstrate(
+                        phosphorCharge,
+                        Constants.RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE,
+                        0.008f,
+                        RainSubstrate.WeatherState.STORM));
 
         for (BlockFactoryTesrType type : BlockFactoryTesrType.VALUES) {
             MachineDefinition machineDefinition = new MachineDefinition(type);
@@ -594,6 +608,15 @@ public class PluginFactory extends ForestryPlugin {
                     PluginFluids.items.canEmpty,
                     'Z',
                     beeItems.honeydew);
+            RecipeManagers.carpenterManager.addRecipe(
+                    5,
+                    PluginCore.items.iodineCharge.getItemStack(),
+                    PluginCore.items.phosphorCharge.getItemStack(),
+                    "# #",
+                    " # ",
+                    "# #",
+                    '#',
+                    PluginCore.items.phosphor.getItemStack());
         }
 
         // Ender pearl

src/main/java/forestry/plugins/PluginFarming.java

@@ -300,7 +300,7 @@ public class PluginFarming extends ForestryPlugin {
         ItemStack valve = blocks.farm.get(BlockFarmType.VALVE, 1);
         ItemStack control = blocks.farm.get(BlockFarmType.CONTROL, 1);
 
-        for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) {
+        for (EnumFarmBlockTexture block : EnumFarmBlockTexture.VALUES) {
             NBTTagCompound compound = new NBTTagCompound();
             block.saveToCompound(compound);
 

src/main/java/forestry/plugins/PluginManager.java

@@ -47,6 +47,7 @@ import forestry.plugins.compat.PluginBuildCraftTransport;
 import forestry.plugins.compat.PluginChisel;
 import forestry.plugins.compat.PluginEnderIO;
 import forestry.plugins.compat.PluginErebus;
+import forestry.plugins.compat.PluginEtFuturumRequiem;
 import forestry.plugins.compat.PluginExtraUtilities;
 import forestry.plugins.compat.PluginGrowthCraft;
 import forestry.plugins.compat.PluginHarvestCraft;
@@ -118,7 +119,8 @@ public class PluginManager {
         NATURA(new PluginNatura()),
         PLANTMEGAPACK(new PluginPlantMegaPack()),
         ROTARYCRAFT(new PluginRotaryCraft()),
-        WITCHERY(new PluginWitchery());
+        WITCHERY(new PluginWitchery()),
+        EFR(new PluginEtFuturumRequiem());
 
         static {
             ForestryAPI.enabledPlugins = new HashSet<>();

src/main/java/forestry/plugins/PluginStorage.java

@@ -449,10 +449,15 @@ public class PluginStorage extends ForestryPlugin {
                     String oreName = OreDictionary.getOreName(oreId);
                     addCrating(crateStack, oreName);
                 }
+                if (oreIds.length > 0 && oreIds[0] == OreDictionary.getOreID("dustAsh")) {
+                    addUncrating(crateStack, PluginCore.items.getAsh());
+                } else {
+                    addUncrating(crateStack, uncrated);
+                }
             } else {
                 addCrating(crateStack, uncrated);
+                addUncrating(crateStack, uncrated);
             }
-            addUncrating(crateStack, uncrated);
         }
     }
 

src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java

@@ -197,8 +197,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
                     FlowerManager.FlowerTypeVanilla,
                     FlowerManager.FlowerTypeSnow,
                     FlowerManager.FlowerTypeMushrooms); // Swampflower
-            // FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 2, 1.0, FlowerManager.FlowerTypeNether);
-            // //Deathbloom
             FlowerManager.flowerRegistry.registerPlantableFlower(
                     flowers,
                     3,
@@ -248,16 +246,8 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
                     1.0,
                     FlowerManager.FlowerTypeVanilla,
                     FlowerManager.FlowerTypeSnow); // Waterlily
-            FlowerManager.flowerRegistry.registerPlantableFlower(
-                    flowers,
-                    11,
-                    1.0,
-                    FlowerManager.FlowerTypeVanilla,
-                    FlowerManager.FlowerTypeSnow); // EnderLotus (does not actually spawn in the end)
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 12, 1.0, FlowerManager.FlowerTypeCacti); // Bromeliad
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 13, 1.0, FlowerManager.FlowerTypeNether); // EyeBulb
-            // FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 14, 1.0, FlowerManager.FlowerTypeNether);
-            // // Unlisted top of the eyebulb
             FlowerManager.flowerRegistry.registerPlantableFlower(
                     flowers,
                     15,
@@ -283,8 +273,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 3, 1.0, FlowerManager.FlowerTypeVanilla); // Lavender
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 4, 1.0, FlowerManager.FlowerTypeVanilla); // Goldenrod
             FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 5, 1.0, FlowerManager.FlowerTypeVanilla); // Bluebells
-            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 6, 1.0, FlowerManager.FlowerTypeVanilla); // Miner's
-                                                                                                                     // delight
             FlowerManager.flowerRegistry.registerPlantableFlower(
                     flowers2,
                     7,

src/main/java/forestry/plugins/compat/PluginEtFuturumRequiem.java

@@ -0,0 +1,65 @@
+package forestry.plugins.compat;
+
+import net.minecraft.block.Block;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.api.apiculture.FlowerManager;
+import forestry.core.utils.ModUtil;
+import forestry.plugins.ForestryPlugin;
+import forestry.plugins.Plugin;
+import forestry.plugins.PluginManager;
+
+@Plugin(
+        pluginID = "EtFuturumRequiem",
+        name = "EtFuturumRequiem",
+        unlocalizedDescription = "for.plugin.etfuturum.description")
+public class PluginEtFuturumRequiem extends ForestryPlugin {
+
+    private static final String EFR = "etfuturum";
+
+    @Override
+    public boolean isAvailable() {
+        return ModUtil.isModLoaded(EFR);
+    }
+
+    @Override
+    public String getFailMessage() {
+        return "EtFuturumRequiem not found";
+    }
+
+    @Override
+    public void doInit() {
+        super.doInit();
+        if (PluginManager.Module.APICULTURE.isEnabled()) {
+            addFlowers();
+        }
+    }
+
+    private void addFlowers() {
+        Block CornFlower = GameRegistry.findBlock(EFR, "cornflower");
+        Block Lily = GameRegistry.findBlock(EFR, "lily_of_the_valley");
+        Block Petals = GameRegistry.findBlock(EFR, "pink_petals");
+        Block Rose = GameRegistry.findBlock(EFR, "rose");
+        Block WitherRose = GameRegistry.findBlock(EFR, "wither_rose");
+        Block ChorusFlower = GameRegistry.findBlock(EFR, "chorus_flower");
+
+        if (CornFlower != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(CornFlower, FlowerManager.FlowerTypeVanilla);
+        }
+        if (Lily != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(Lily, FlowerManager.FlowerTypeVanilla);
+        }
+        if (Petals != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(Petals, FlowerManager.FlowerTypeVanilla);
+        }
+        if (Rose != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(Rose, FlowerManager.FlowerTypeVanilla);
+        }
+        if (WitherRose != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(WitherRose, FlowerManager.FlowerTypeNether);
+        }
+        if (ChorusFlower != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(ChorusFlower, FlowerManager.FlowerTypeEnd);
+        }
+    }
+}

src/main/java/forestry/storage/items/ItemBackpack.java

@@ -348,4 +348,17 @@ public class ItemBackpack extends ItemWithGui {
                 return null;
         }
     }
+
+    @Override
+    public double getDurabilityForDisplay(final ItemStack stack) {
+        final int occupied = ItemInventory.getOccupiedSlotCount(stack);
+        final int max = getBackpackSize();
+
+        return 1.0d - (occupied + 1.0d) / (max + 1.0d);
+    }
+
+    @Override
+    public boolean showDurabilityBar(final ItemStack stack) {
+        return Config.showBackpackDurability && ItemInventory.getOccupiedSlotCount(stack) > 0;
+    }
 }