Merge remote-tracking branch 'TweksTY/master' into dev

This always exists

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.7:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.9.13:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.0:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.7.3:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.63-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -39,34 +39,14 @@ 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 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
+# 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
 
 # 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.
 enableGenericInjection = true

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.6'
 }

src/main/java/binnie/botany/Botany.java

@@ -271,7 +271,7 @@ public class Botany extends AbstractMod {
                 EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
                 int next = Math
                         .min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
-                if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.VALUES[next])
+                if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next])
                         && !event.entityPlayer.capabilities.isCreativeMode) {
                     ItemStack heldItem = event.entityPlayer.getHeldItem();
                     heldItem.stackSize--;
@@ -284,7 +284,7 @@ public class Botany extends AbstractMod {
                 EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
                 int next = Math
                         .max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
-                if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.VALUES[next])
+                if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
                         && !event.entityPlayer.capabilities.isCreativeMode) {
                     ItemStack heldItem2 = event.entityPlayer.getHeldItem();
                     heldItem2.stackSize--;
@@ -297,7 +297,7 @@ public class Botany extends AbstractMod {
                 EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
                 int next = Math
                         .min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
-                if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.VALUES[next])
+                if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
                         && !event.entityPlayer.capabilities.isCreativeMode) {
                     ItemStack heldItem3 = event.entityPlayer.getHeldItem();
                     heldItem3.stackSize--;

src/main/java/binnie/botany/api/EnumAcidity.java

@@ -6,11 +6,6 @@ public enum EnumAcidity {
     NEUTRAL,
     ALKALINE;
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumAcidity[] VALUES = values();
-
     public String getID() {
         return name().toLowerCase();
     }

src/main/java/binnie/botany/api/EnumFlowerChromosome.java

@@ -24,10 +24,6 @@ public enum EnumFlowerChromosome implements IChromosomeType {
     SAPPINESS(IAlleleFloat.class),
     STEM(IAlleleInteger.class);
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumFlowerChromosome[] VALUES = values();
     private final Class<? extends IAllele> cls;
 
     EnumFlowerChromosome(Class<? extends IAllele> cls) {

src/main/java/binnie/botany/api/EnumMoisture.java

@@ -6,11 +6,6 @@ public enum EnumMoisture {
     NORMAL,
     DAMP;
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumMoisture[] VALUES = values();
-
     public String getID() {
         return name().toLowerCase();
     }

src/main/java/binnie/botany/api/EnumSoilType.java

@@ -6,11 +6,6 @@ public enum EnumSoilType {
     LOAM,
     FLOWERBED;
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumSoilType[] VALUES = values();
-
     public String getID() {
         return name().toLowerCase();
     }

src/main/java/binnie/botany/ceramic/BlockCeramic.java

@@ -93,7 +93,7 @@ public class BlockCeramic extends Block implements IBlockMetadata {
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
         }
     }

src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java

@@ -102,12 +102,12 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             BlockType type = new BlockType(c, c, TileType.Tile);
             itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal()));
         }
 
-        for (TileType type2 : TileType.VALUES) {
+        for (TileType type2 : TileType.values()) {
             if (type2.canDouble()) {
                 itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.GOLD, type2).getStack(1));
             }
@@ -136,7 +136,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (TileType type : TileType.VALUES) {
+        for (TileType type : TileType.values()) {
             for (int i = 0; i < 3; ++i) {
                 type.icons[i] = Botany.proxy.getIcon(register, "ceramic." + type.id + "." + i);
             }
@@ -205,10 +205,6 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
         VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"),
         VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks");
 
-        /**
-         * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-         */
-        public static final TileType[] VALUES = values();
         private final String id;
         private final String name;
         private final IIcon[] icons;
@@ -220,7 +216,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
         }
 
         public static TileType get(int id) {
-            return VALUES[id % VALUES.length];
+            return values()[id % values().length];
         }
 
         public boolean canDouble() {

src/main/java/binnie/botany/ceramic/BlockStained.java

@@ -124,7 +124,7 @@ public class BlockStained extends Block implements IBlockMetadata {
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
         }
     }

src/main/java/binnie/botany/ceramic/CeramicColor.java

@@ -16,7 +16,7 @@ public class CeramicColor implements IDesignMaterial {
 
     static {
         CeramicColor.map = new LinkedHashMap<>();
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             CeramicColor.map.put(c, new CeramicColor(c));
         }
     }

src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java

@@ -74,7 +74,7 @@ public class CeramicDesignSystem implements IDesignSystem {
 
     @Override
     public void registerIcons(IIconRegister register) {
-        for (EnumPattern pattern : EnumPattern.VALUES) {
+        for (EnumPattern pattern : EnumPattern.values()) {
             primary.put(
                     pattern.ordinal(),
                     BinnieCore.proxy.getIcon(

src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java

@@ -52,7 +52,7 @@ public class CeramicTileRecipe implements IRecipe {
             }
         }
 
-        for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.VALUES) {
+        for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
             ItemStack stack2 = type.getRecipe(stacks);
             if (stack2 != null) {
                 return stack2;

src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java

@@ -91,7 +91,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
                 }
             };
             List<IFlowerColor> colors = new ArrayList<>();
-            Collections.addAll(colors, EnumFlowerColor.VALUES);
+            Collections.addAll(colors, EnumFlowerColor.values());
             listBox.setOptions(colors);
         }
     }

src/main/java/binnie/botany/farm/GardenLogic.java

@@ -129,7 +129,7 @@ public class GardenLogic extends FarmLogic {
                 if (pH.ordinal() < acidity.ordinal()) {
                     ItemStack stack = getAvailableAlkaline();
                     if (stack != null && soil
-                            .setPH(world, position.x, position.y, position.z, EnumAcidity.VALUES[pH.ordinal() + 1])) {
+                            .setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() + 1])) {
                         housing.getFarmInventory().removeResources(new ItemStack[] { stack });
                         continue;
                     }
@@ -138,7 +138,7 @@ public class GardenLogic extends FarmLogic {
                 if (pH.ordinal() > acidity.ordinal()) {
                     ItemStack stack = getAvailableAcid();
                     if (stack != null && soil
-                            .setPH(world, position.x, position.y, position.z, EnumAcidity.VALUES[pH.ordinal() - 1])) {
+                            .setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() - 1])) {
                         housing.getFarmInventory().removeResources(new ItemStack[] { stack });
                         continue;
                     }

src/main/java/binnie/botany/flower/BlockFlower.java

@@ -55,7 +55,7 @@ public class BlockFlower extends BlockContainer {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (EnumFlowerType type : EnumFlowerType.VALUES) {
+        for (EnumFlowerType type : EnumFlowerType.values()) {
             type.registerIcons(register);
         }
     }

src/main/java/binnie/botany/gardening/BlockSoil.java

@@ -81,8 +81,8 @@ public class BlockSoil extends Block implements IBlockSoil {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (EnumMoisture moisture : EnumMoisture.VALUES) {
-            for (EnumAcidity pH : EnumAcidity.VALUES) {
+        for (EnumMoisture moisture : EnumMoisture.values()) {
+            for (EnumAcidity pH : EnumAcidity.values()) {
                 int index = moisture.ordinal() + pH.ordinal() * 3;
                 String id = "soil/" + getType().getID() + "." + pH.getID() + "." + moisture.getID();
                 iconsTop[index] = Botany.proxy.getIcon(register, id + ".0");
@@ -104,8 +104,8 @@ public class BlockSoil extends Block implements IBlockSoil {
     @Override
     public void updateTick(World world, int x, int y, int z, Random random) {
         int meta = world.getBlockMetadata(x, y, z);
-        EnumMoisture moisture = EnumMoisture.VALUES[meta % 3];
-        EnumAcidity acidity = EnumAcidity.VALUES[meta / 3];
+        EnumMoisture moisture = EnumMoisture.values()[meta % 3];
+        EnumAcidity acidity = EnumAcidity.values()[meta / 3];
         EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z);
         if (desiredMoisture.ordinal() > moisture.ordinal()) {
             moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP);
@@ -141,12 +141,12 @@ public class BlockSoil extends Block implements IBlockSoil {
 
     @Override
     public EnumAcidity getPH(World world, int x, int y, int z) {
-        return EnumAcidity.VALUES[world.getBlockMetadata(x, y, z) / 3];
+        return EnumAcidity.values()[world.getBlockMetadata(x, y, z) / 3];
     }
 
     @Override
     public EnumMoisture getMoisture(World world, int x, int y, int z) {
-        return EnumMoisture.VALUES[world.getBlockMetadata(x, y, z) % 3];
+        return EnumMoisture.values()[world.getBlockMetadata(x, y, z) % 3];
     }
 
     @Override

src/main/java/binnie/botany/gardening/Gardening.java

@@ -233,8 +233,8 @@ public class Gardening {
         BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
         return canTolerate(
                 flower,
-                EnumAcidity.VALUES[soilMeta / 3 % 3],
-                EnumMoisture.VALUES[soilMeta % 3],
+                EnumAcidity.values()[soilMeta / 3 % 3],
+                EnumMoisture.values()[soilMeta % 3],
                 EnumTemperature.getFromValue(biome.temperature));
     }
 

src/main/java/binnie/botany/gardening/ItemSoil.java

@@ -33,8 +33,8 @@ public class ItemSoil extends ItemBlock {
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
         super.addInformation(stack, player, tooltip, advanced);
-        EnumMoisture moisture = EnumMoisture.VALUES[stack.getItemDamage() % 3];
-        EnumAcidity acidity = EnumAcidity.VALUES[stack.getItemDamage() / 3];
+        EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3];
+        EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3];
         String info = "";
 
         if (moisture == EnumMoisture.DRY) {

src/main/java/binnie/botany/gardening/ModuleGardening.java

@@ -109,7 +109,7 @@ public class ModuleGardening implements IInitializable {
 
         for (boolean manual : new boolean[] { true, false }) {
             for (boolean fertilised : new boolean[] { true, false }) {
-                for (EnumMoisture moist : EnumMoisture.VALUES) {
+                for (EnumMoisture moist : EnumMoisture.values()) {
                     ItemStack icon = (moist == EnumMoisture.DRY) ? yellow
                             : ((moist == EnumMoisture.NORMAL) ? red : blue);
                     int insulate = 2 - moist.ordinal();
@@ -258,7 +258,7 @@ public class ModuleGardening implements IInitializable {
         GameRegistry
                 .addRecipe(BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel);
 
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal());
             ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal());
             GameRegistry.addShapelessRecipe(clay, Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment);
@@ -276,9 +276,9 @@ public class ModuleGardening implements IInitializable {
             return null;
         }
         return new ItemStack(
-                Gardening.getSoilBlock(EnumSoilType.VALUES[type]),
+                Gardening.getSoilBlock(EnumSoilType.values()[type]),
                 1,
-                BlockSoil.getMeta(EnumAcidity.VALUES[pH], EnumMoisture.VALUES[moisture]));
+                BlockSoil.getMeta(EnumAcidity.values()[pH], EnumMoisture.values()[moisture]));
     }
 
     private void addAcidFertiliser(ItemStack stack, int strengthMax) {

src/main/java/binnie/botany/genetics/EnumFlowerColor.java

@@ -92,10 +92,7 @@ public enum EnumFlowerColor implements IFlowerColor {
     YELLOW("yellow", 0xffff00),
     YELLOW_GREEN("yellowGreen", 0x9acd32);
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumFlowerColor[] VALUES = values();
+    private static final EnumFlowerColor[] ALL_VALUES = values();
     private final int color;
     private final int colorDis;
     private final String name;
@@ -2967,7 +2964,7 @@ public enum EnumFlowerColor implements IFlowerColor {
     }
 
     public static EnumFlowerColor get(int i) {
-        return VALUES[Math.max(0, i) % VALUES.length];
+        return ALL_VALUES[Math.max(0, i) % ALL_VALUES.length];
     }
 
     @Override

src/main/java/binnie/botany/genetics/EnumFlowerType.java

@@ -57,10 +57,6 @@ public enum EnumFlowerType implements IFlowerType {
     DELPHINIUM(2),
     HOLLYHOCK(2);
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumFlowerType[] VALUES = values();
     private final int sections;
     private final IIcon[] stem;
     private final IIcon[] petal;

src/main/java/binnie/botany/genetics/FlowerHelper.java

@@ -232,7 +232,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
 
     @Override
     public IChromosomeType[] getKaryotype() {
-        return EnumFlowerChromosome.VALUES;
+        return EnumFlowerChromosome.values();
     }
 
     @Override

src/main/java/binnie/botany/genetics/FlowerSpecies.java

@@ -496,7 +496,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
 
     @Override
     public EnumHumidity getHumidity() {
-        return EnumHumidity.VALUES[getMoisture().ordinal()];
+        return EnumHumidity.values()[getMoisture().ordinal()];
     }
 
     @Override

src/main/java/binnie/botany/genetics/FlowerTemplates.java

@@ -9,7 +9,7 @@ import forestry.core.genetics.alleles.EnumAllele;
 public class FlowerTemplates {
 
     public static IAllele[] getDefaultTemplate() {
-        IAllele[] alleles = new IAllele[EnumFlowerChromosome.VALUES.length];
+        IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length];
         alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY;
         alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
         alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);

src/main/java/binnie/botany/genetics/ModuleGenetics.java

@@ -42,7 +42,7 @@ public class ModuleGenetics implements IInitializable {
 
     @Override
     public void init() {
-        for (EnumFlowerColor color : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor color : EnumFlowerColor.values()) {
             AlleleManager.alleleRegistry.registerAllele(color.getAllele());
         }
 

src/main/java/binnie/botany/items/ItemClay.java

@@ -49,7 +49,7 @@ public class ItemClay extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             list.add(new ItemStack(this, 1, c.ordinal()));
         }
     }

src/main/java/binnie/botany/items/ItemPigment.java

@@ -49,7 +49,7 @@ public class ItemPigment extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (EnumFlowerColor c : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
             list.add(new ItemStack(this, 1, c.ordinal()));
         }
     }

src/main/java/binnie/botany/network/MessageFlowerUpdate.java

@@ -39,10 +39,10 @@ public class MessageFlowerUpdate extends MessageCoordinates {
     public void readData(ByteBuf data) throws IOException {
         super.readData(data);
         render = new TileEntityFlower.RenderInfo();
-        render.primary = EnumFlowerColor.get(data.readByte());
-        render.secondary = EnumFlowerColor.get(data.readByte());
-        render.stem = EnumFlowerColor.get(data.readByte());
-        render.type = EnumFlowerType.VALUES[data.readByte()];
+        render.primary = EnumFlowerColor.values()[data.readByte()];
+        render.secondary = EnumFlowerColor.values()[data.readByte()];
+        render.stem = EnumFlowerColor.values()[data.readByte()];
+        render.type = EnumFlowerType.values()[data.readByte()];
         render.age = data.readByte();
         render.section = data.readByte();
         render.wilted = data.readBoolean();

src/main/java/binnie/core/craftgui/minecraft/EnumColor.java

@@ -20,10 +20,6 @@ public enum EnumColor {
     Yellow("Yellow", 16777045, 'e'),
     White("White", 16777215, 'f');
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumColor[] VALUES = values();
     private final int colour;
     private final String name;
     private final char code;

src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java

@@ -8,7 +8,6 @@ import net.minecraft.nbt.NBTTagList;
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.core.Control;
 import binnie.core.craftgui.minecraft.InventoryType;
-import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
 import binnie.core.network.packet.MessageCraftGUI;
 
 public class ControlPlayerInventory extends Control {
@@ -25,21 +24,19 @@ public class ControlPlayerInventory extends Control {
         slots = new ArrayList<>();
         for (int row = 0; row < 3; ++row) {
             for (int column = 0; column < 9; ++column) {
-                ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18)
-                        .setSlotTexture(CraftGUITexture.SlotInventory);
+                ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18);
                 slots.add(slot);
             }
         }
 
         if (wide) {
             for (int i1 = 0; i1 < 9; ++i1) {
-                ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18)
-                        .setSlotTexture(CraftGUITexture.SlotInventory);
+                ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18);
                 slots.add(slot2);
             }
         } else {
             for (int i1 = 0; i1 < 9; ++i1) {
-                ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f).setSlotTexture(CraftGUITexture.SlotInventory);
+                ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f);
                 slots.add(slot2);
             }
         }
@@ -54,8 +51,7 @@ public class ControlPlayerInventory extends Control {
         slots = new ArrayList<>();
         for (int row = 0; row < 6; ++row) {
             for (int column = 0; column < 6; ++column) {
-                ControlSlot slot = new ControlSlot(this, column * 18, row * 18)
-                        .setSlotTexture(CraftGUITexture.SlotInventory);
+                ControlSlot slot = new ControlSlot(this, column * 18, row * 18);
                 slots.add(slot);
             }
         }

src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java

@@ -49,12 +49,10 @@ public class ControlSlot extends ControlSlotBase {
     }
 
     public Slot slot;
-    private CraftGUITexture slotTexture;
 
     public ControlSlot(IWidget parent, float x, float y) {
         super(parent, x, y);
         slot = null;
-        slotTexture = CraftGUITexture.Slot;
         addSelfEventHandler(new EventMouse.Down.Handler() {
 
             @Override
@@ -82,17 +80,11 @@ public class ControlSlot extends ControlSlotBase {
     public ControlSlot(IWidget parent, int x, int y, Slot slot) {
         super(parent, x, y);
         this.slot = slot;
-        slotTexture = CraftGUITexture.Slot;
-    }
-
-    public ControlSlot setSlotTexture(CraftGUITexture texture) {
-        slotTexture = texture == null ? CraftGUITexture.Slot : texture;
-        return this;
     }
 
     @Override
     public void onRenderBackground() {
-        CraftGUI.render.texture(slotTexture, IPoint.ZERO);
+        CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO);
         if (slot == null) {
             return;
         }

src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java

@@ -10,7 +10,6 @@ public enum CraftGUITexture {
     Button("button"),
     ButtonHighlighted("button.highlighted"),
     Slot("slot"),
-    SlotInventory("slot.inventory"),
     SlotBorder("slot.border"),
     SlotOverlay("slot.overlay"),
     SlotCharge("slot.charge"),

src/main/java/binnie/core/genetics/FlowerBreedingSystem.java

@@ -113,7 +113,7 @@ class FlowerBreedingSystem extends BreedingSystem {
             case PRIMARY:
             case SECONDARY:
             case STEM:
-                for (EnumFlowerColor color : EnumFlowerColor.VALUES) {
+                for (EnumFlowerColor color : EnumFlowerColor.values()) {
                     alleles.add(color.getAllele());
                 }
                 break;

src/main/java/binnie/core/machines/MachinePackage.java

@@ -32,11 +32,6 @@ public abstract class MachinePackage {
         return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID());
     }
 
-    public String getGuiDisplayName() {
-        String guiKey = group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID() + ".title";
-        return I18N.canLocalise(guiKey) ? I18N.localise(guiKey) : getDisplayName();
-    }
-
     public Integer getMetadata() {
         return metadata;
     }

src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java

@@ -1,6 +1,7 @@
 package binnie.core.machines.inventory;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -15,13 +16,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.core.machines.IMachine;
-import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
 
 public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots {
 
-    private final Int2ObjectLinkedOpenHashMap<InventorySlot> inventory = new Int2ObjectLinkedOpenHashMap<>();
-    private int cachedSize = 0;
-    private int[] cachedAccessibleSlots = null;
+    private final Map<Integer, InventorySlot> inventory = new LinkedHashMap<>();
 
     public ComponentInventorySlots(IMachine machine) {
         super(machine);
@@ -29,20 +27,25 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public int getSizeInventory() {
-        return cachedSize;
+        int size = 0;
+        for (Integer index : inventory.keySet()) {
+            size = Math.max(size, index + 1);
+        }
+        return size;
     }
 
     @Override
     public ItemStack getStackInSlot(int index) {
-        InventorySlot slot = inventory.get(index);
-        return slot != null ? slot.getContent() : null;
+        if (inventory.containsKey(index)) {
+            return inventory.get(index).getContent();
+        }
+        return null;
     }
 
     @Override
     public ItemStack decrStackSize(int index, int amount) {
-        InventorySlot slot = inventory.get(index);
-        if (slot != null) {
-            ItemStack stack = slot.decrStackSize(amount);
+        if (inventory.containsKey(index)) {
+            ItemStack stack = inventory.get(index).decrStackSize(amount);
             markDirty();
             return stack;
         }
@@ -56,9 +59,8 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public void setInventorySlotContents(int index, ItemStack itemStack) {
-        InventorySlot slot = inventory.get(index);
-        if (slot != null && (itemStack == null || slot.isValid(itemStack))) {
-            slot.setContent(itemStack);
+        if (inventory.containsKey(index) && (itemStack == null || inventory.get(index).isValid(itemStack))) {
+            inventory.get(index).setContent(itemStack);
         }
         markDirty();
     }
@@ -111,7 +113,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
     public void writeToNBT(NBTTagCompound nbttagcompound) {
         super.writeToNBT(nbttagcompound);
         NBTTagList inventoryNBT = new NBTTagList();
-        for (Map.Entry<Integer, InventorySlot> entry : inventory.int2ObjectEntrySet()) {
+        for (Map.Entry<Integer, InventorySlot> entry : inventory.entrySet()) {
             NBTTagCompound slotNBT = new NBTTagCompound();
             slotNBT.setInteger("id", entry.getKey());
             entry.getValue().writeToNBT(slotNBT);
@@ -123,8 +125,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
     @Override
     public InventorySlot addSlot(int index, String unlocalizedName) {
         inventory.put(index, new InventorySlot(index, unlocalizedName));
-        cachedSize = Math.max(cachedSize, index + 1);
-        cachedAccessibleSlots = null;
         return getSlot(index);
     }
 
@@ -138,7 +138,10 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public InventorySlot getSlot(int index) {
-        return inventory.get(index);
+        if (inventory.containsKey(index)) {
+            return inventory.get(index);
+        }
+        return null;
     }
 
     @Override
@@ -148,7 +151,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public InventorySlot[] getSlots(int[] indexes) {
-        List<InventorySlot> list = new ArrayList<>(indexes.length);
+        List<InventorySlot> list = new ArrayList<>();
         for (int i : indexes) {
             if (getSlot(i) != null) {
                 list.add(getSlot(i));
@@ -210,20 +213,18 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public int[] getAccessibleSlotsFromSide(int var1) {
-        if (cachedAccessibleSlots == null) {
-            List<Integer> slots = new ArrayList<>();
-            for (InventorySlot slot : inventory.values()) {
-                if (slot.canInsert() || slot.canExtract()) {
-                    slots.add(slot.getIndex());
-                }
-            }
-
-            cachedAccessibleSlots = new int[slots.size()];
-            for (int i = 0; i < slots.size(); ++i) {
-                cachedAccessibleSlots[i] = slots.get(i);
+        List<Integer> slots = new ArrayList<>();
+        for (InventorySlot slot : inventory.values()) {
+            if (slot.canInsert() || slot.canExtract()) {
+                slots.add(slot.getIndex());
             }
         }
-        return cachedAccessibleSlots;
+
+        int[] ids = new int[slots.size()];
+        for (int i = 0; i < slots.size(); ++i) {
+            ids[i] = slots.get(i);
+        }
+        return ids;
     }
 
     @Override
@@ -233,7 +234,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public boolean canExtractItem(int slot, ItemStack itemstack, int direction) {
-        InventorySlot iSlot = getSlot(slot);
-        return iSlot != null && iSlot.canExtract(ForgeDirection.getOrientation(direction));
+        return getSlot(slot).canExtract(ForgeDirection.getOrientation(direction));
     }
 }

src/main/java/binnie/core/machines/power/IProcess.java

@@ -9,4 +9,11 @@ public interface IProcess extends IErrorStateSource {
     boolean isInProgress();
 
     ProcessInfo getInfo();
+
+    /***
+     * Returns true if the current target got worked on at least once.
+     */
+    default boolean workedOnTarget() {
+        return false;
+    }
 }

src/main/java/binnie/core/machines/storage/CompartmentTab.java

@@ -25,7 +25,7 @@ class CompartmentTab implements INBTTagable {
     public void readFromNBT(NBTTagCompound nbt) {
         name = nbt.getString("name");
         icon = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("icon"));
-        color = EnumColor.VALUES[nbt.getByte("color")];
+        color = EnumColor.values()[nbt.getByte("color")];
         id = nbt.getByte("id");
     }
 

src/main/java/binnie/core/machines/storage/WindowCompartment.java

@@ -83,7 +83,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 
     @Override
     public void initialiseClient() {
-        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
+        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
         int x = 16;
         int y = 32;
         ComponentCompartmentInventory inv = Machine.getMachine(getInventory())
@@ -320,7 +320,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
                     1 + cw * (cc / 8),
                     cw,
                     cw,
-                    EnumColor.VALUES[cc]);
+                    EnumColor.values()[cc]);
             color.addSelfEventHandler(new EventMouse.Down.Handler() {
 
                 @Override

src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java

@@ -12,6 +12,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
 import binnie.core.network.packet.MessageCraftGUI;
+import binnie.core.util.I18N;
 import binnie.extrabees.ExtraBees;
 import cpw.mods.fml.relauncher.Side;
 
@@ -34,7 +35,7 @@ public class WindowAlvearyFrame extends Window {
 
     @Override
     public void initialiseClient() {
-        setTitle(machine.getPackage().getGuiDisplayName());
+        setTitle(I18N.localise("extrabees.machine.alveay.frame"));
         final NBTTagList actions = new NBTTagList();
         playerInventory = new ControlPlayerInventory(this).create(actions);
         new ControlSlot(this, 79.0f, 30.0f).assign(actions, InventoryType.Machine, 0);

src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java

@@ -12,6 +12,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
 import binnie.core.network.packet.MessageCraftGUI;
+import binnie.core.util.I18N;
 import binnie.extrabees.ExtraBees;
 import binnie.extrabees.apiary.machine.hatchery.AlvearyHatchery;
 import cpw.mods.fml.relauncher.Side;
@@ -36,7 +37,7 @@ public class WindowAlvearyHatchery extends Window {
     @Override
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
-        setTitle(machine.getPackage().getGuiDisplayName());
+        setTitle(I18N.localise("extrabees.machine.alveay.hatchery"));
         playerInventory = new ControlPlayerInventory(this).create(actions);
         new ControlSlotArray(this, 43, 30, 5, 1).create(actions, InventoryType.Machine, AlvearyHatchery.SLOT_LARVAE);
         MessageCraftGUI.sendToServer(actions);

src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java

@@ -44,7 +44,7 @@ public class WindowAlvearyMutator extends Window {
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
 
-        setTitle(machine.getPackage().getGuiDisplayName());
+        setTitle(I18N.localise("extrabees.machine.alveay.mutator"));
         playerInventory = new ControlPlayerInventory(this).create(actions);
         new ControlSlot(this, 79.0f, 30.0f).assign(actions, InventoryType.Machine, AlvearyMutator.SLOT_MUTATOR);
         new ControlText(

src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java

@@ -14,6 +14,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
 import binnie.core.network.packet.MessageCraftGUI;
+import binnie.core.util.I18N;
 import binnie.extrabees.ExtraBees;
 import binnie.extrabees.apiary.machine.stimulator.AlvearyStimulator;
 import cpw.mods.fml.relauncher.Side;
@@ -38,7 +39,7 @@ public class WindowAlvearyStimulator extends Window {
     @Override
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
-        setTitle(machine.getPackage().getGuiDisplayName());
+        setTitle(I18N.localise("extrabees.machine.alveay.stimulator"));
         playerInventory = new ControlPlayerInventory(this).create(actions);
         new ControlSlot(this, 41.0f, 28.0f).assign(actions, InventoryType.Machine, AlvearyStimulator.SLOT_CIRCUIT);
         new ControlEnergyBar(this, 75, 29, 60, 16, Position.LEFT);

src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java

@@ -54,9 +54,9 @@ public class ControlClimateBar extends Control implements ITooltip {
         }
 
         if (isHumidity) {
-            tooltip.add(EnumHumidity.VALUES[type].name);
+            tooltip.add(EnumHumidity.values()[type].name);
         } else {
-            tooltip.add(EnumTemperature.VALUES[type + 1].name);
+            tooltip.add(EnumTemperature.values()[type + 1].name);
         }
     }
 

src/main/java/binnie/extrabees/products/EnumHoneyComb.java

@@ -101,10 +101,6 @@ public enum EnumHoneyComb implements IItemEnum {
     CYANITE(new Color(0x27204d), new Color(0x86ed)),
     BLUTONIUM(new Color(0x27204d), new Color(0x1b00e6));
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumHoneyComb[] VALUES = values();
     public final Map<ItemStack, Float> products;
     public final int primaryColor;
     public final int secondaryColor;
@@ -121,10 +117,10 @@ public enum EnumHoneyComb implements IItemEnum {
 
     public static EnumHoneyComb get(ItemStack itemStack) {
         int i = itemStack.getItemDamage();
-        if (i >= 0 && i < VALUES.length) {
-            return VALUES[i];
+        if (i >= 0 && i < values().length) {
+            return values()[i];
         }
-        return VALUES[0];
+        return values()[0];
     }
 
     public void addRecipe() {

src/main/java/binnie/extrabees/products/EnumHoneyDrop.java

@@ -44,10 +44,6 @@ public enum EnumHoneyDrop implements IItemEnum {
     MAGENTA(new Color(0xe57fd8), new Color(0xff00cc), "for.honey"),
     LIGHTGRAY(new Color(0x999999), new Color(0xc9c9c9), "for.honey");
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumHoneyDrop[] VALUES = values();
     public final int primaryColor;
     public final int secondaryColor;
 
@@ -62,10 +58,10 @@ public enum EnumHoneyDrop implements IItemEnum {
 
     public static EnumHoneyDrop get(ItemStack itemStack) {
         int i = itemStack.getItemDamage();
-        if (i >= 0 && i < VALUES.length) {
-            return VALUES[i];
+        if (i >= 0 && i < values().length) {
+            return values()[i];
         }
-        return VALUES[0];
+        return values()[0];
     }
 
     public void addRemenant(ItemStack stack) {

src/main/java/binnie/extrabees/products/EnumPropolis.java

@@ -24,10 +24,6 @@ public enum EnumPropolis implements IItemEnum {
     // GLACIAL,
     // PEAT
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumPropolis[] VALUES = values();
     public final int secondaryColor;
     public final int primaryColor;
     public final String liquidName;
@@ -40,10 +36,10 @@ public enum EnumPropolis implements IItemEnum {
 
     public static EnumPropolis get(ItemStack itemStack) {
         int i = itemStack.getItemDamage();
-        if (i >= 0 && i < VALUES.length) {
-            return VALUES[i];
+        if (i >= 0 && i < values().length) {
+            return values()[i];
         }
-        return VALUES[0];
+        return values()[0];
     }
 
     public void addRecipe() {

src/main/java/binnie/extrabees/products/ItemHoneyComb.java

@@ -21,7 +21,7 @@ public class ItemHoneyComb extends ItemProduct {
     protected IIcon icon2;
 
     public ItemHoneyComb() {
-        super("honeyComb", EnumHoneyComb.VALUES);
+        super("honeyComb", EnumHoneyComb.values());
         setCreativeTab(Tabs.tabApiculture);
     }
 
@@ -148,9 +148,7 @@ public class ItemHoneyComb extends ItemProduct {
 
         EnumHoneyComb.COFFEE.addProduct(beeswax, 0.90f);
         EnumHoneyComb.COFFEE.addProduct(honeyDrop, 0.75f);
-        if (!OreDictionary.getOres("dustCoffee").isEmpty()) {
-            EnumHoneyComb.COFFEE.tryAddProduct(OreDictionary.getOres("dustCoffee").get(0), 0.75f);
-        }
+        EnumHoneyComb.COFFEE.tryAddProduct(Mods.ic2.stack("itemCofeePowder"), 0.75f);
 
         EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE, 0.80f);
         EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f);
@@ -233,15 +231,15 @@ public class ItemHoneyComb extends ItemProduct {
         OreDictionary.registerOre("beeComb", new ItemStack(ExtraBees.comb, 1, 32767));
 
         for (int i = 0; i < 16; ++i) {
-            EnumHoneyComb type = EnumHoneyComb.VALUES[EnumHoneyComb.RED.ordinal() + i];
+            EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i];
             if (type != EnumHoneyComb.RED) {
                 type.copyProducts(EnumHoneyComb.RED);
             }
         }
 
         for (int i = 0; i < 16; ++i) {
-            EnumHoneyComb type = EnumHoneyComb.VALUES[EnumHoneyComb.RED.ordinal() + i];
-            EnumHoneyDrop drop = EnumHoneyDrop.VALUES[EnumHoneyDrop.RED.ordinal() + i];
+            EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i];
+            EnumHoneyDrop drop = EnumHoneyDrop.values()[EnumHoneyDrop.RED.ordinal() + i];
             int[] dyeC = { 1, 11, 4, 2, 0, 15, 3, 14, 6, 5, 8, 12, 9, 10, 13, 7 };
             int k = dyeC[i];
             ItemStack dye = switch (k) {

src/main/java/binnie/extrabees/products/ItemHoneyDrop.java

@@ -15,7 +15,7 @@ public class ItemHoneyDrop extends ItemProduct {
     protected IIcon icon2;
 
     public ItemHoneyDrop() {
-        super("honeyDrop", EnumHoneyDrop.VALUES);
+        super("honeyDrop", EnumHoneyDrop.values());
         setCreativeTab(Tabs.tabApiculture);
     }
 

src/main/java/binnie/extrabees/products/ItemPropolis.java

@@ -11,7 +11,7 @@ import forestry.api.core.Tabs;
 public class ItemPropolis extends ItemProduct {
 
     public ItemPropolis() {
-        super("propolis", EnumPropolis.VALUES);
+        super("propolis", EnumPropolis.values());
         setCreativeTab(Tabs.tabApiculture);
     }
 

src/main/java/binnie/extrabees/products/ModuleProducts.java

@@ -25,13 +25,13 @@ public class ModuleProducts implements IInitializable {
 
     @Override
     public void postInit() {
-        for (EnumHoneyComb info : EnumHoneyComb.VALUES) {
+        for (EnumHoneyComb info : EnumHoneyComb.values()) {
             info.addRecipe();
         }
-        for (EnumHoneyDrop info2 : EnumHoneyDrop.VALUES) {
+        for (EnumHoneyDrop info2 : EnumHoneyDrop.values()) {
             info2.addRecipe();
         }
-        for (EnumPropolis info3 : EnumPropolis.VALUES) {
+        for (EnumPropolis info3 : EnumPropolis.values()) {
             info3.addRecipe();
         }
     }

src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java

@@ -44,7 +44,7 @@ public class BlockExtraBeeHive extends Block {
 
     @Override
     public IIcon getIcon(int side, int metadata) {
-        if (metadata >= EnumHiveType.VALUES.length) {
+        if (metadata >= EnumHiveType.values().length) {
             return null;
         }
         if (side < 2) {
@@ -56,8 +56,8 @@ public class BlockExtraBeeHive extends Block {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        icons = new IIcon[EnumHiveType.VALUES.length][2];
-        for (EnumHiveType hive : EnumHiveType.VALUES) {
+        icons = new IIcon[EnumHiveType.values().length][2];
+        for (EnumHiveType hive : EnumHiveType.values()) {
             icons[hive.ordinal()][0] = ExtraBees.proxy
                     .getIcon(register, "hive/" + hive.toString().toLowerCase() + ".0");
             icons[hive.ordinal()][1] = ExtraBees.proxy
@@ -68,7 +68,7 @@ public class BlockExtraBeeHive extends Block {
     @Override
     public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
         ArrayList<ItemStack> ret = new ArrayList<>();
-        List<IHiveDrop> dropList = EnumHiveType.VALUES[metadata].drops;
+        List<IHiveDrop> dropList = EnumHiveType.values()[metadata].drops;
         Collections.shuffle(dropList);
         int tries = 0;
 

src/main/java/binnie/extrabees/worldgen/EnumHiveType.java

@@ -12,10 +12,6 @@ public enum EnumHiveType {
     NETHER,
     MARBLE;
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumHiveType[] VALUES = values();
     public final List<IHiveDrop> drops;
 
     EnumHiveType() {

src/main/java/binnie/extratrees/block/BlockETDoor.java

@@ -40,8 +40,8 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
 
     public static DoorType getDoorType(int tileMeta) {
         int type = (tileMeta & 0xF00) >> 8;
-        if (type < DoorType.VALUES.length) {
-            return DoorType.VALUES[type];
+        if (type < DoorType.values().length) {
+            return DoorType.values()[type];
         }
         return DoorType.STANDARD;
     }
@@ -96,7 +96,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (DoorType type : DoorType.VALUES) {
+        for (DoorType type : DoorType.values()) {
             type.iconDoorLower = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".lower");
             type.iconDoorUpper = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".upper");
             type.iconDoorLowerFlip = new IconFlipped(type.iconDoorLower, true, false);
@@ -237,18 +237,18 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
-        for (IPlankType type : PlankType.ExtraTreePlanks.VALUES) {
+        for (IPlankType type : PlankType.ExtraTreePlanks.values()) {
             itemList.add(WoodManager.getDoor(type, DoorType.STANDARD));
         }
-        for (IPlankType type : PlankType.ForestryPlanks.VALUES) {
+        for (IPlankType type : PlankType.ForestryPlanks.values()) {
             itemList.add(WoodManager.getDoor(type, DoorType.STANDARD));
         }
-        for (IPlankType type : PlankType.ExtraBiomesPlank.VALUES) {
+        for (IPlankType type : PlankType.ExtraBiomesPlank.values()) {
             if (type.getStack() != null) {
                 itemList.add(WoodManager.getDoor(type, DoorType.STANDARD));
             }
         }
-        for (IPlankType type : PlankType.VanillaPlanks.VALUES) {
+        for (IPlankType type : PlankType.VanillaPlanks.values()) {
             itemList.add(WoodManager.getDoor(type, DoorType.STANDARD));
         }
     }

src/main/java/binnie/extratrees/block/BlockETLog.java

@@ -37,7 +37,7 @@ public class BlockETLog extends BlockLog implements IBlockMetadata {
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (int i = 0; i < ILogType.ExtraTreeLog.VALUES.length; ++i) {
+        for (int i = 0; i < ILogType.ExtraTreeLog.values().length; ++i) {
             list.add(TileEntityMetadata.getItemStack(this, i));
         }
     }
@@ -54,7 +54,7 @@ public class BlockETLog extends BlockLog implements IBlockMetadata {
 
     public IIcon getIcon(int side, int tileMeta, int blockMeta) {
         int oriented = blockMeta & 0xC;
-        ILogType.ExtraTreeLog log = ILogType.ExtraTreeLog.VALUES[tileMeta];
+        ILogType.ExtraTreeLog log = ILogType.ExtraTreeLog.values()[tileMeta];
         switch (oriented) {
             case 4:
                 if (side > 3) {
@@ -125,7 +125,7 @@ public class BlockETLog extends BlockLog implements IBlockMetadata {
     @Override
     public String getBlockName(ItemStack itemStack) {
         int meta = TileEntityMetadata.getItemDamage(itemStack);
-        ILogType.ExtraTreeLog[] logs = ILogType.ExtraTreeLog.VALUES;
+        ILogType.ExtraTreeLog[] logs = ILogType.ExtraTreeLog.values();
         if (meta < 0 || meta >= logs.length) {
             meta = 0;
         }

src/main/java/binnie/extratrees/block/BlockETPlanks.java

@@ -75,7 +75,7 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata {
     @Override
     public String getBlockName(ItemStack itemStack) {
         int meta = TileEntityMetadata.getItemDamage(itemStack);
-        return I18N.localise("extratrees.block.plank.name", PlankType.ExtraTreePlanks.VALUES[meta].getName());
+        return I18N.localise("extratrees.block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName());
     }
 
     @Override
@@ -90,7 +90,7 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata {
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (int i = 0; i < PlankType.ExtraTreePlanks.VALUES.length; ++i) {
+        for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) {
             list.add(TileEntityMetadata.getItemStack(this, i));
         }
     }
@@ -107,13 +107,13 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata {
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        return PlankType.ExtraTreePlanks.VALUES[meta].getIcon();
+        return PlankType.ExtraTreePlanks.values()[meta].getIcon();
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister register) {
-        for (PlankType.ExtraTreePlanks plank : PlankType.ExtraTreePlanks.VALUES) {
+        for (PlankType.ExtraTreePlanks plank : PlankType.ExtraTreePlanks.values()) {
             plank.loadIcon(register);
         }
     }

src/main/java/binnie/extratrees/block/BlockETSlab.java

@@ -88,7 +88,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata {
     @Override
     public String getBlockName(ItemStack itemStack) {
         int meta = TileEntityMetadata.getItemDamage(itemStack);
-        return I18N.localise("extratrees.block.woodslab.name", PlankType.ExtraTreePlanks.VALUES[meta].getName());
+        return I18N.localise("extratrees.block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName());
     }
 
     @Override
@@ -106,7 +106,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata {
         if (field_150004_a) {
             return;
         }
-        for (int i = 0; i < PlankType.ExtraTreePlanks.VALUES.length; ++i) {
+        for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) {
             list.add(TileEntityMetadata.getItemStack(this, i));
         }
     }
@@ -123,7 +123,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata {
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        return PlankType.ExtraTreePlanks.VALUES[meta].getIcon();
+        return PlankType.ExtraTreePlanks.values()[meta].getIcon();
     }
 
     @Override

src/main/java/binnie/extratrees/block/BlockETStairs.java

@@ -43,7 +43,7 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata {
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> list) {
-        for (int i = 0; i < PlankType.ExtraTreePlanks.VALUES.length; ++i) {
+        for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) {
             list.add(new ItemStack(this, 1, i));
         }
     }

src/main/java/binnie/extratrees/block/DoorType.java

@@ -11,10 +11,6 @@ public enum DoorType {
     DOUBLE("double"),
     FULL("full");
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final DoorType[] VALUES = values();
     final String id;
     IIcon iconDoorLower;
     IIcon iconDoorUpper;

src/main/java/binnie/extratrees/block/ILogType.java

@@ -67,10 +67,6 @@ public interface ILogType {
         Cinnamon("cinnamon", 0x86583c, PlankType.VanillaPlanks.JUNGLE),
         PinkIvory("pinkivory", 0x7f6554, PlankType.ExtraTreePlanks.PinkIvory);
 
-        /**
-         * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-         */
-        public static final ExtraTreeLog[] VALUES = values();
         private final String name;
         private final int color;
         private final IDesignMaterial plank;
@@ -90,7 +86,7 @@ public interface ILogType {
         }
 
         public static void registerIcons(IIconRegister register) {
-            for (ExtraTreeLog log : VALUES) {
+            for (ExtraTreeLog log : values()) {
                 log.trunk = ExtraTrees.proxy.getIcon(register, "logs/" + log.toString().toLowerCase() + "Trunk");
                 log.bark = ExtraTrees.proxy.getIcon(register, "logs/" + log.toString().toLowerCase() + "Bark");
             }

src/main/java/binnie/extratrees/block/ItemETDoor.java

@@ -66,7 +66,7 @@ public class ItemETDoor extends ItemMetadata {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister register) {
-        for (DoorType type : DoorType.VALUES) {
+        for (DoorType type : DoorType.values()) {
             type.iconItem = ExtraTrees.proxy.getIcon(register, "door." + type.id);
         }
     }

src/main/java/binnie/extratrees/block/ItemETStairs.java

@@ -24,7 +24,7 @@ public class ItemETStairs extends ItemBlock {
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIconFromDamage(int par1) {
-        return PlankType.ExtraTreePlanks.VALUES[par1].getIcon();
+        return PlankType.ExtraTreePlanks.values()[par1].getIcon();
     }
 
     @Override

src/main/java/binnie/extratrees/block/ModuleBlocks.java

@@ -67,12 +67,12 @@ public class ModuleBlocks implements IInitializable {
                 .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStairs), new StairItemRenderer());
         BinnieCore.proxy
                 .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockGate), new GateItemRenderer());
-        for (ILogType plank : ILogType.ExtraTreeLog.VALUES) {
+        for (ILogType plank : ILogType.ExtraTreeLog.values()) {
             OreDictionary.registerOre("logWood", plank.getItemStack());
         }
 
         GameRegistry.addSmelting(ExtraTrees.blockLog, new ItemStack(Items.coal, 1, 1), 0.15f);
-        for (IPlankType plank2 : PlankType.ExtraTreePlanks.VALUES) {
+        for (IPlankType plank2 : PlankType.ExtraTreePlanks.values()) {
             OreDictionary.registerOre("plankWood", plank2.getStack());
         }
 
@@ -102,7 +102,7 @@ public class ModuleBlocks implements IInitializable {
 
     @Override
     public void postInit() {
-        for (PlankType.ExtraTreePlanks plank : PlankType.ExtraTreePlanks.VALUES) {
+        for (PlankType.ExtraTreePlanks plank : PlankType.ExtraTreePlanks.values()) {
             ItemStack planks = plank.getStack();
             ItemStack slabs = TileEntityMetadata.getItemStack(ExtraTrees.blockSlab, plank.ordinal());
             ItemStack stairs = TileEntityMetadata.getItemStack(ExtraTrees.blockStairs, plank.ordinal());

src/main/java/binnie/extratrees/block/PlankType.java

@@ -18,16 +18,16 @@ import extrabiomes.api.Stuff;
 public class PlankType {
 
     public static void setup() {
-        for (VanillaPlanks plank : VanillaPlanks.VALUES) {
+        for (VanillaPlanks plank : VanillaPlanks.values()) {
             CarpentryManager.carpentryInterface.registerCarpentryWood(plank.ordinal(), plank);
         }
-        for (ExtraTreePlanks plank2 : ExtraTreePlanks.VALUES) {
+        for (ExtraTreePlanks plank2 : ExtraTreePlanks.values()) {
             CarpentryManager.carpentryInterface.registerCarpentryWood(plank2.ordinal() + 32, plank2);
         }
-        for (ForestryPlanks plank3 : ForestryPlanks.VALUES) {
+        for (ForestryPlanks plank3 : ForestryPlanks.values()) {
             CarpentryManager.carpentryInterface.registerCarpentryWood(plank3.ordinal() + 128, plank3);
         }
-        for (ExtraBiomesPlank plank4 : ExtraBiomesPlank.VALUES) {
+        for (ExtraBiomesPlank plank4 : ExtraBiomesPlank.values()) {
             CarpentryManager.carpentryInterface.registerCarpentryWood(plank4.ordinal() + 192, plank4);
         }
     }
@@ -70,10 +70,6 @@ public class PlankType {
         Gingko(0xf4e7ba),
         PinkIvory(0xec8ca0);
 
-        /**
-         * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-         */
-        public static final ExtraTreePlanks[] VALUES = values();
         private final int color;
         private IIcon icon;
 
@@ -125,10 +121,6 @@ public class PlankType {
         ACACIA(0xba6337),
         DARKOAK(0x462d15);
 
-        /**
-         * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-         */
-        public static final VanillaPlanks[] VALUES = values();
         private final int color;
 
         VanillaPlanks(int color) {
@@ -200,10 +192,6 @@ public class PlankType {
         COCOBOLO(0x731302),
         ZEBRAWOOD(0xa6824e);
 
-        /**
-         * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-         */
-        public static final ForestryPlanks[] VALUES = values();
         private final int color;
 
         ForestryPlanks(int color) {
@@ -253,10 +241,6 @@ public class PlankType {
         Fir(0x7e774a),
         Acacia(0xbfaa7e);
 
-        /**
-         * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-         */
-        public static final ExtraBiomesPlank[] VALUES = values();
         private final int color;
 
         ExtraBiomesPlank(int color) {

src/main/java/binnie/extratrees/block/StairItemRenderer.java

@@ -15,7 +15,7 @@ public class StairItemRenderer implements IItemRenderer {
     private void renderStairBlock(RenderBlocks renderBlocks, ItemStack item, float f, float g, float h) {
         Tessellator tessellator = Tessellator.instance;
         Block block = ((ItemBlock) item.getItem()).field_150939_a;
-        IIcon textureIndex = PlankType.ExtraTreePlanks.VALUES[item.getItemDamage()].getIcon();
+        IIcon textureIndex = PlankType.ExtraTreePlanks.values()[item.getItemDamage()].getIcon();
 
         for (int i = 0; i < 2; ++i) {
             if (i == 0) {

src/main/java/binnie/extratrees/block/WoodManager.java

@@ -105,12 +105,12 @@ public class WoodManager {
         }
 
         List<IPlankType> list = new ArrayList<>();
-        Collections.addAll(list, PlankType.ExtraTreePlanks.VALUES);
-        Collections.addAll(list, PlankType.ForestryPlanks.VALUES);
+        Collections.addAll(list, PlankType.ExtraTreePlanks.values());
+        Collections.addAll(list, PlankType.ForestryPlanks.values());
         if (Mods.extraBiomes.active()) {
-            Collections.addAll(list, PlankType.ExtraBiomesPlank.VALUES);
+            Collections.addAll(list, PlankType.ExtraBiomesPlank.values());
         }
-        Collections.addAll(list, PlankType.VanillaPlanks.VALUES);
+        Collections.addAll(list, PlankType.VanillaPlanks.values());
         allPlankTypes = list;
         return list;
     }

src/main/java/binnie/extratrees/block/decor/BlockFence.java

@@ -42,11 +42,11 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
 
     @Override
     public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (IFenceProvider type : PlankType.ExtraTreePlanks.VALUES) {
+        for (IFenceProvider type : PlankType.ExtraTreePlanks.values()) {
             list.add(type.getFence());
         }
 
-        for (IFenceProvider type : PlankType.VanillaPlanks.VALUES) {
+        for (IFenceProvider type : PlankType.VanillaPlanks.values()) {
             if (type != PlankType.VanillaPlanks.OAK) {
                 list.add(type.getFence());
             }

src/main/java/binnie/extratrees/carpentry/EnumPattern.java

@@ -408,9 +408,6 @@ public enum EnumPattern implements IPattern {
 
     private ILayout leftRotation;
     private ILayout horizontalFlip;
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
     public static final EnumPattern[] VALUES = values();
 
     EnumPattern() {

src/main/java/binnie/extratrees/carpentry/GlassType.java

@@ -20,7 +20,7 @@ public class GlassType implements IDesignMaterial {
         for (StandardColor c : StandardColor.values()) {
             GlassType.types.put(c.ordinal(), new GlassType(c.ordinal(), c.name, c.color));
         }
-        for (EnumFlowerColor c2 : EnumFlowerColor.VALUES) {
+        for (EnumFlowerColor c2 : EnumFlowerColor.values()) {
             GlassType.types
                     .put(128 + c2.ordinal(), new GlassType(128 + c2.ordinal(), c2.getName(), c2.getColor(false)));
         }

src/main/java/binnie/extratrees/core/ModuleCore.java

@@ -46,10 +46,10 @@ public class ModuleCore implements IInitializable {
             Collections.addAll(speciesQueue, ExtraTreeSpecies.values());
 
             Queue<ILogType> logQueue = new LinkedList<>();
-            Collections.addAll(logQueue, ILogType.ExtraTreeLog.VALUES);
+            Collections.addAll(logQueue, ILogType.ExtraTreeLog.values());
 
             Queue<IDesignMaterial> plankQueue = new LinkedList<>();
-            Collections.addAll(plankQueue, PlankType.ExtraTreePlanks.VALUES);
+            Collections.addAll(plankQueue, PlankType.ExtraTreePlanks.values());
 
             Queue<ExtraTreeFruitGene> fruitQueue = new LinkedList<>();
             Collections.addAll(fruitQueue, ExtraTreeFruitGene.values());

src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java

@@ -43,7 +43,7 @@ public class WindowLumbermill extends Window {
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
 
-        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
+        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
         new ControlSlot(this, 42.0f, 43.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_WOOD);
         new ControlSlot(this, 148.0f, 43.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_PLANKS);
         new ControlSlot(this, 172.0f, 28.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_BARK);

src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java

@@ -53,7 +53,7 @@ public class WindowWoodworker extends Window {
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
 
-        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
+        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
         new ControlText(
                 this,
                 new IArea(190.0f, 36.0f, 114.0f, 10.0f),

src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java

@@ -387,7 +387,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
         if (ripeningTime >= ripeningPeriod) {
             return 1.0f;
         }
-        return (float) ripeningTime / ripeningPeriod;
+        return ripeningTime / ripeningPeriod;
     }
 
     @Override
@@ -418,7 +418,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister register) {
         if (ordinal() == 0) {
-            for (FruitSprite sprite : FruitSprite.VALUES) {
+            for (FruitSprite sprite : FruitSprite.values()) {
                 sprite.registerIcons(register);
             }
         }
@@ -436,7 +436,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
 
         for (ItemStack stack : products.keySet()) {
             if (stack.getItem() == ExtraTrees.itemFood) {
-                return Food.VALUES[stack.getItemDamage()].toString();
+                return Food.values()[stack.getItemDamage()].toString();
             }
         }
         return "NoFruit";

src/main/java/binnie/extratrees/genetics/FruitSprite.java

@@ -19,10 +19,6 @@ public enum FruitSprite implements IIconProvider {
     Larger,
     Pear;
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final FruitSprite[] VALUES = values();
     private BinnieIcon icon;
 
     public short getIndex() {
@@ -33,8 +29,8 @@ public enum FruitSprite implements IIconProvider {
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(short texUID) {
         int index = texUID - 4200;
-        if (index >= 0 && index < VALUES.length) {
-            return VALUES[index].icon.getIcon();
+        if (index >= 0 && index < values().length) {
+            return values()[index].icon.getIcon();
         }
         return null;
     }

src/main/java/binnie/extratrees/item/Food.java

@@ -79,10 +79,6 @@ public enum Food implements IItemMisc {
     Starfruit(2),
     Candlenut(0);
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final Food[] VALUES = values();
     private IIcon icon;
     private final int hunger;
     private final List<String> ores;

src/main/java/binnie/extratrees/item/ItemFood.java

@@ -18,18 +18,22 @@ import forestry.api.core.Tabs;
 
 public class ItemFood extends net.minecraft.item.ItemFood {
 
+    protected IItemMisc[] items;
+
     public ItemFood() {
         super(0, 0.0f, false);
         setUnlocalizedName("food");
         setCreativeTab(Tabs.tabArboriculture);
         setHasSubtypes(true);
+        items = Food.values();
+
         registerItem(this, getUnlocalizedName().substring(5));
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        for (IItemMisc itemMisc : Food.VALUES) {
+        for (IItemMisc itemMisc : items) {
             if (itemMisc.isActive()) {
                 list.add(getStack(itemMisc, 1));
             }
@@ -37,7 +41,7 @@ public class ItemFood extends net.minecraft.item.ItemFood {
     }
 
     private IItemMisc getItem(int damage) {
-        return (damage >= Food.VALUES.length) ? Food.VALUES[0] : Food.VALUES[damage];
+        return (damage >= items.length) ? items[0] : items[damage];
     }
 
     public ItemStack getStack(IItemMisc type, int size) {
@@ -75,7 +79,7 @@ public class ItemFood extends net.minecraft.item.ItemFood {
     @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister register) {
-        for (IItemMisc item : Food.VALUES) {
+        for (IItemMisc item : items) {
             if (item.isActive()) {
                 item.registerIcons(register);
             }
@@ -83,7 +87,7 @@ public class ItemFood extends net.minecraft.item.ItemFood {
     }
 
     private Food getFood(ItemStack stack) {
-        return Food.VALUES[stack.getItemDamage()];
+        return Food.values()[stack.getItemDamage()];
     }
 
     @Override

src/main/java/binnie/extratrees/item/ModuleItems.java

@@ -233,7 +233,7 @@ public class ModuleItems implements IInitializable {
         FuelManager.bronzeEngineFuel.put(
                 ExtraTreeLiquid.Resin.get(1).getFluid(),
                 new EngineBronzeFuel(ExtraTreeLiquid.Resin.get(1).getFluid(), 30, 10000, 1));
-        for (ILogType.ExtraTreeLog log : ILogType.ExtraTreeLog.VALUES) {
+        for (ILogType.ExtraTreeLog log : ILogType.ExtraTreeLog.values()) {
             log.addRecipe();
         }
     }

src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java

@@ -64,7 +64,7 @@ public class WindowAcclimatiser extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.labMachine.acclimatiser.title");
+        return I18N.localise("genetics.machine.labMachine.acclimatiser");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowAnalyser.java

@@ -79,7 +79,7 @@ public class WindowAnalyser extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.labMachine.analyser.title");
+        return I18N.localise("genetics.machine.labMachine.analyser");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowGenepool.java

@@ -75,7 +75,7 @@ public class WindowGenepool extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.labMachine.genepool.title");
+        return I18N.localise("genetics.machine.labMachine.genepool");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowIncubator.java

@@ -77,7 +77,7 @@ public class WindowIncubator extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.labMachine.incubator.title");
+        return I18N.localise("genetics.machine.labMachine.incubator");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowInoculator.java

@@ -89,7 +89,7 @@ public class WindowInoculator extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.machine.inoculator.title");
+        return I18N.localise("genetics.machine.machine.inoculator");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowIsolator.java

@@ -76,7 +76,7 @@ public class WindowIsolator extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.machine.isolator.title");
+        return I18N.localise("genetics.machine.machine.isolator");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java

@@ -75,7 +75,7 @@ public class WindowPolymeriser extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.machine.polymeriser.title");
+        return I18N.localise("genetics.machine.machine.polymeriser");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowSequencer.java

@@ -104,7 +104,7 @@ public class WindowSequencer extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.machine.sequencer.title");
+        return I18N.localise("genetics.machine.machine.sequencer");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowSplicer.java

@@ -83,7 +83,7 @@ public class WindowSplicer extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("gui.genetics.machine.advMachine.splicer.title");
+        return I18N.localise("genetics.machine.advMachine.splicer");
     }
 
     @Override

src/main/java/binnie/genetics/gui/WindowAnalyst.java

@@ -123,12 +123,12 @@ public class WindowAnalyst extends Window {
     public void initialiseClient() {
         if (isDatabase) {
             if (isMaster) {
-                setTitle(I18N.localise("genetics.gui.registry.1.title"));
+                setTitle(I18N.localise("genetics.item.registry.1.name"));
             } else {
-                setTitle(I18N.localise("genetics.gui.registry.title"));
+                setTitle(I18N.localise("genetics.item.registry.0.name"));
             }
         } else {
-            setTitle(I18N.localise("genetics.gui.analyst.title"));
+            setTitle(I18N.localise("genetics.item.analyst.name"));
         }
 
         getWindowInventory().createSlot(0);

src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java

@@ -19,6 +19,10 @@ import forestry.api.genetics.IIndividual;
 
 public class SplicerComponentLogic extends ComponentProcessSetCost implements IProcess {
 
+    // Needed to keep stack. If user takes out target slot and it gets automatically refilled, this happens in the same
+    // tick
+    private ItemStack workedOnStack = null;
+
     public int nOfGenes;
 
     public SplicerComponentLogic(Machine machine) {
@@ -50,6 +54,11 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP
     public void onInventoryUpdate() {
         super.onInventoryUpdate();
         nOfGenes = getGenesToUse();
+        ItemStack newTarget = getUtil().getStack(Splicer.SLOT_TARGET);
+
+        if (newTarget == null || !ItemStack.areItemStacksEqual(workedOnStack, newTarget)) {
+            workedOnStack = null;
+        }
     }
 
     protected int getGenesToUse() {
@@ -190,5 +199,31 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP
             Splicer.setGene(gene, target, 1);
         }
         getUtil().damageItem(Splicer.SLOT_SERUM_VIAL, 1);
+        workedOnStack = getUtil().getStack(Splicer.SLOT_TARGET).copy();
+    }
+
+    @Override
+    public boolean workedOnTarget() {
+        return ItemStack.areItemStacksEqual(workedOnStack, getUtil().getStack(Splicer.SLOT_TARGET));
+    }
+
+    @Override
+    public void readFromNBT(NBTTagCompound nbt) {
+        super.readFromNBT(nbt);
+        NBTTagCompound tagWorkedOnStack = (NBTTagCompound) nbt.getTag("workedOnStack");
+        if (tagWorkedOnStack != null) {
+            workedOnStack = ItemStack.loadItemStackFromNBT(tagWorkedOnStack);
+        }
+    }
+
+    @Override
+    public void writeToNBT(NBTTagCompound nbt) {
+        super.writeToNBT(nbt);
+        if (workedOnStack != null) {
+            NBTTagCompound tagWorkedOnStack = new NBTTagCompound();
+            workedOnStack.writeToNBT(tagWorkedOnStack);
+            // Need to save, in case inventory is full it might need to get moved out way later.
+            nbt.setTag("workedOnStack", tagWorkedOnStack);
+        }
     }
 }

src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java

@@ -3,6 +3,7 @@ package binnie.genetics.machine.splicer;
 import net.minecraft.item.ItemStack;
 
 import binnie.core.craftgui.minecraft.IMachineInformation;
+import binnie.core.machines.IMachine;
 import binnie.core.machines.Machine;
 import binnie.core.machines.inventory.ComponentInventorySlots;
 import binnie.core.machines.inventory.ComponentInventoryTransfer;
@@ -79,8 +80,20 @@ public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase impl
 
             @Override
             public boolean fufilled(ItemStack stack) {
-                return stack != null && transfer.getMachine().getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null
-                        && transfer.getMachine().getInterface(SplicerComponentLogic.class).isValidSerum() != null;
+                if (stack == null) {
+                    return false;
+                }
+                IMachine machine = transfer.getMachine();
+                boolean hasSerum = machine.getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null;
+
+                if (hasSerum) {
+                    // Move item if it can't be processed anymore with current serum.
+                    boolean validSerum = machine.getInterface(SplicerComponentLogic.class).isValidSerum() == null;
+                    return !validSerum;
+                } else {
+                    // Move item if there is no serum and item got processed already
+                    return machine.getMachineUtil().getProcess().workedOnTarget();
+                }
             }
         });
 

src/main/resources/assets/binniecore/gui/stylesheet.json

@@ -69,12 +69,6 @@
             "uv": "4 4 18 18",
             "padding": "2"
         },
-        {
-            "name": "slot.inventory",
-            "sheet": "slots",
-            "uv": "76 4 18 18",
-            "padding": "2"
-        },
         {
             "name": "slot.border",
             "sheet": "slots",

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

@@ -36,10 +36,6 @@ genetics.item.registry.1.name=Master Registry
 genetics.item.serum.name=%s Serum
 genetics.item.serumArray.name=%s Serum Array
 
-genetics.gui.registry.title=Registry
-genetics.gui.registry.1.title=Master Registry
-genetics.gui.analyst.title=Analyst
-
 genetics.item.sequence=DNA Sequence
 genetics.item.sequence.0=Very Faint
 genetics.item.sequence.1=Faint
@@ -63,7 +59,6 @@ genetics.sequence.partially=Partially Sequenced (%d%%)
 
 tile.machine.name=Isolator
 genetics.machine.machine.isolator=Isolator
-gui.genetics.machine.machine.isolator.title=Isolator
 genetics.machine.machine.isolator.info=The Isolator takes a random allele from a bee, tree or other individual and copies it into an empty sequence vial. This requires the use of ethanol as a solvent and an enzyme to cut up the DNA. The unsequenced serums can then be amplified in a Polymeriser and sequenced in a Sequencer. This process has a small chance to destroy the individual.
 genetics.machine.isolator.error.noIndividual=No individual to isolate
 genetics.machine.isolator.error.noRoom=No room for DNA sequences
@@ -72,7 +67,6 @@ genetics.machine.isolator.error.noLiquid=Insufficient ethanol
 genetics.machine.isolator.error.noEnzyme=No enzyme
 
 genetics.machine.machine.sequencer=Sequencer
-gui.genetics.machine.machine.sequencer.title=Sequencer
 genetics.machine.machine.sequencer.info=The Sequencer takes unsequenced serums and determines which allele is present in them. This process is slow and requires the use of fluorescent dye.
 genetics.machine.sequencer.unsequencedDNA=Unsequenced DNA
 genetics.machine.sequencer.error.noSequence=No DNA sequence
@@ -84,7 +78,6 @@ genetics.machine.sequencer.gui.sequensedBy=Genes will be sequenced by %s
 genetics.machine.sequencer.gui.willNotSave=Userless. Will not save sequences
 
 genetics.machine.machine.polymeriser=Polymeriser
-gui.genetics.machine.machine.polymeriser.title=Polymeriser
 genetics.machine.machine.polymeriser.info=The Polymeriser fills empty serums with Raw DNA and replicating bacteria. This process can be accelerated using gold nuggets. 
 genetics.machine.polymeriser.error.noItem=No item to replicate
 genetics.machine.polymeriser.error.itemFilled=Item Filled
@@ -95,7 +88,6 @@ genetics.machine.polymeriser.replicatingWithGenes=Replicating with %d genes
 genetics.machine.polymeriser.unfilledSerum=Unfilled Serum
 
 genetics.machine.machine.inoculator=Inoculator
-gui.genetics.machine.machine.inoculator.title=Inoculator
 genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process is very slow and requires a Bacteria Vector, but is always successful.  
 genetics.machine.inoculator.error.noIndividual=No Individual to Inoculate
 genetics.machine.inoculator.error.noSerum=No Serum
@@ -113,7 +105,6 @@ genetics.machine.inoculator.inoculableIndividual=Inoculable Individual
 genetics.machine.inoculator.serums=Serum Vials & Arrays
 
 genetics.machine.labMachine.genepool=Genepool
-gui.genetics.machine.labMachine.genepool.title=Genepool
 genetics.machine.labMachine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. During this process, all genetic information is lost and the source of the DNA is destroyed.
 genetics.machine.genepool.error.noIndividual=No Individual
 genetics.machine.genepool.error.noRoom=Not enough room in Tank
@@ -124,7 +115,6 @@ tile.labMachine.name=Lab Stand
 genetics.machine.labMachine.labMachine=Lab Stand
 
 genetics.machine.labMachine.analyser=Analyzer
-gui.genetics.machine.labMachine.analyser.title=Analyzer
 genetics.machine.labMachine.analyser.info=The Analyzer takes breedable individuals and DNA sequencers and analyzes them to determine the genes present. This requires DNA Dye, created from purple dye and glowstone
 genetics.machine.analyser.dnaDye=DNA Dye
 genetics.machine.analyser.unanalysedItem=Unanalyzed Item
@@ -135,7 +125,6 @@ genetics.machine.analyser.error.insufficientDye=Not enough DNA dye to analyze
 genetics.machine.analyser.error.noItem=No item to analyze
 
 genetics.machine.labMachine.incubator=Incubator
-gui.genetics.machine.labMachine.incubator.title=Incubator
 genetics.machine.labMachine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. 
 genetics.machine.incubator.error.noRecipe.title=No Recipe
 genetics.machine.incubator.error.noRecipe=There is no valid recipe
@@ -143,7 +132,6 @@ genetics.machine.incubator.error.noLiquid=Not enough incubation liquid
 genetics.machine.incubator.error.noRoom=No room for output
 
 genetics.machine.labMachine.acclimatiser=Acclimatiser
-gui.genetics.machine.labMachine.acclimatiser.title=Acclimatiser
 genetics.machine.labMachine.acclimatiser.info=The Acclimatiser uses acclimatizing items to adjust the temperature and humidity tolerance of individuals. This process has only a small chance to succeed.
 genetics.machine.acclimatiser.acclimatizingItems=Acclimatizing Items
 genetics.machine.acclimatiser.error.noIndividual=No Individual to Acclimatise
@@ -152,7 +140,6 @@ genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Cannot Acclimatise
 
 tile.advMachine.name=Splicer
 genetics.machine.advMachine.splicer=Splicer
-gui.genetics.machine.advMachine.splicer.title=Splicer
 genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine that is used to insert genes into individuals. This process is fast, but requires monumental amounts of power.
 genetics.machine.splicer.error.noIndividual=No Individual to Splice
 genetics.machine.splicer.error.noSerum=No Serum