update

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

dependencies.gradle

@@ -2,10 +2,10 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta49:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.62-GTNH:dev')
+    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.44: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

@@ -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.
@@ -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.13-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.
@@ -114,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.
@@ -172,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" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 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.38'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20'
 }
 
 

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/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/multiblock/AlvearyController.java

@@ -159,6 +159,8 @@ public class AlvearyController extends RectangularMultiblockControllerBase
                 activeComponents.remove(oldPart);
             }
         }
+
+        inventory.dumpInventoryIntoWorld(this.worldObj, oldPart.getCoordinates());
     }
 
     @Override

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/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/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/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/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/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/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/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/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/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/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/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/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;
+    }
 }

src/main/resources/assets/forestry/config/colour.properties

@@ -1,6 +1,6 @@
-# Add a file of this format in your texture packs zip as
-# /config/forestry/colour.properties to configure font colours.
-# A file at that location inside the zip of the active texture pack
+# Add a file of this format in your resource pack zip as
+# /assets/forestry/config/colour.properties to configure font colours.
+# A file at that location inside the zip of the active resource pack
 # will take precedence over the default.
 #
 # Hex format without leading 0x
@@ -48,4 +48,4 @@ ledger.farm.text=000000
 
 ledger.search_ingredients.background=ffffff
 ledger.search_ingredients.header=587b96
-ledger.search_ingredients.text=000000
+ledger.search_ingredients.text=000000

src/main/resources/assets/forestry/lang/en_US.lang

@@ -1738,6 +1738,7 @@ for.plugin.growthcraft.description=Compatibility plugin for GrowthCraft
 for.plugin.erebus.description=Compatibility plugin for Erebus
 for.plugin.rotarycraft.description=Compatibility plugin for RotaryCraft
 for.plugin.minefactoryreloaded.description=Compatibility plugin for MineFactoryReloaded
+for.plugin.etfuturum.description=Compatibility plugin for EtFuturumRequiem
 
 ####################
 # CONFIG FILES
@@ -1781,6 +1782,7 @@ for.config.crafting.stamps.disabled.comment=Disables the crafting recipe for cer
 
 for.config.tweaks=Tweaks
 
+for.config.tweaks.gui.showBackpackDurability=Shows a durability bar on backpacks indicating how full they are.
 for.config.tweaks.gui.mail.alert.enabled=Mail Alert
 for.config.tweaks.gui.mail.alert.enabled.comment=Enables the new mail alert box.
 for.config.tweaks.gui.mail.alert.xPosition=Horizontal Position