Add OreDictionary entry for fertile tree pollen (#120)

Co-authored-by: UltraProdigy <[email protected]>

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

dependencies.gradle

@@ -1,11 +1,12 @@
 // Add your dependencies here
 
 dependencies {
+    api("com.github.GTNewHorizons:GTNHLib:0.9.54:dev")
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta68a:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.70-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.19:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.93-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly('curse.maven:craftguide-75557:2459320')
 }

gradle/gradle-daemon-jvm.properties

@@ -1,12 +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
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/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-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

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

src/main/java/forestry/Forestry.java

@@ -57,7 +57,8 @@ import forestry.plugins.PluginManager;
         name = Constants.MOD,
         version = Constants.VERSION,
         guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-        dependencies = "required-after:Forge@[10.13.4.1566,);" + "after:Buildcraft|Core@[6.1.7,);"
+        dependencies = "required-after:Forge@[10.13.4.1566,);" + "required-after:gtnhlib@[0.9.41,);"
+                + "after:Buildcraft|Core@[6.1.7,);"
                 + "after:ExtrabiomesXL;"
                 + "after:BiomesOPlenty;"
                 + "after:IC2@[2.0.140,);"

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

@@ -0,0 +1,40 @@
+package forestry.api.multiblock;
+
+import java.util.Collection;
+
+import net.minecraft.item.ItemStack;
+
+public interface IFarmFertilizerRegistry {
+
+    /**
+     * Gets a list of all fertilizer stacks in the registry.
+     *
+     * @return The current fertilizer registry.
+     */
+    Collection<ItemStack> getFertilizers();
+
+    /**
+     * Adds a new fertilizer to the registry.
+     *
+     * @apiNote The stack size doesn't matter it always consumes 1.
+     * @apiNote You can use OreDictionary.WILDCARD_VALUE to specific that any meta of the item will be ok.
+     *
+     * @param itemstack The item to add to the registry.
+     */
+    void addFertilizer(ItemStack itemstack);
+
+    /**
+     * Removes a fertilizer from the fretilizer registry.
+     *
+     * @param itemstack The item to remove from the registry.
+     */
+    void removeFertilizer(ItemStack itemstack);
+
+    /**
+     * Checks if an item is a usable multi-farm fertilizer.
+     *
+     * @param itemstack - The stack to check with.
+     * @return True if the item is a fertilizer item.
+     */
+    boolean isFertilizer(ItemStack itemstack);
+}

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

@@ -8,4 +8,6 @@ package forestry.api.multiblock;
 public class MultiblockManager {
 
     public static IMultiblockLogicFactory logicFactory;
+
+    public static IFarmFertilizerRegistry farmFertilizerRegistry;
 }

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

@@ -573,7 +573,7 @@ public class Bee extends IndividualLiving implements IBee {
         }
         // / Secondary Products
         for (Map.Entry<ItemStack, Float> entry : secondary.getProductChances().entrySet()) {
-            if (housing.getWorld().rand.nextFloat() < getFinalChance(entry.getValue() / 2, speed, prodModifier, 1f)) {
+            if (housing.getWorld().rand.nextFloat() < getFinalChance(entry.getValue() / 2f, speed, prodModifier, 1f)) {
                 products.add(entry.getKey().copy());
             }
         }

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

@@ -250,8 +250,9 @@ public class AlvearyController extends RectangularMultiblockControllerBase
 
     private float applyChange(float base, float currentChange, float extraChange, float boundaryDown,
             float boundaryUp) {
-        float boundedNewChange = Math.max(boundaryDown, Math.min(base + currentChange + (extraChange * 20), boundaryUp))
-                - base;
+        float boundedNewChange = Math.round(
+                (Math.max(boundaryDown, Math.min(base + currentChange + (extraChange * 20), boundaryUp)) - base) * 100)
+                / 100.0f;
         if (extraChange > 0) {
             return Math.max(currentChange, boundedNewChange);
         } else {
@@ -355,12 +356,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase
     @Override
     public float getExactTemperature() {
         ChunkCoordinates coords = getReferenceCoord();
-        return getBiome().getFloatTemperature(coords.posX, coords.posY, coords.posZ) + tempChange;
+        return Math.round((getBiome().getFloatTemperature(coords.posX, coords.posY, coords.posZ) + tempChange) * 100)
+                / 100.0f;
     }
 
     @Override
     public float getExactHumidity() {
-        return getBiome().rainfall + humidChange;
+        return Math.round((getBiome().rainfall + humidChange) * 100) / 100.0f;
     }
 
     @Override

src/main/java/forestry/arboriculture/LeafDecayHelper.java

@@ -1,145 +0,0 @@
-package forestry.arboriculture;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockLeaves;
-import net.minecraft.world.World;
-
-/** Based on vanilla leaf decay, but accepts leaves that are connected further from a trunk */
-public abstract class LeafDecayHelper {
-
-    private static final short SUSTAINS_LEAVES = 0;
-    private static final short NOT_SUSTAINS_LEAVES = -1;
-    private static final short IS_LEAVES = -2;
-    private static int[] leafDecayValues;
-
-    public static void leafDecay(BlockLeaves leaves, World world, int x, int y, int z) {
-        if (world.isRemote) {
-            return;
-        }
-
-        int leafMeta = world.getBlockMetadata(x, y, z);
-
-        if ((leafMeta & 8) != 0 && (leafMeta & 4) == 0) {
-            byte radius = 4;
-            byte yArrayMult = 32;
-            int xArrayMult = yArrayMult * yArrayMult;
-            int arrayOffset = yArrayMult / 2;
-
-            if (leafDecayValues == null) {
-                leafDecayValues = new int[yArrayMult * yArrayMult * yArrayMult];
-            }
-
-            int radius1 = radius + 1;
-            if (world.checkChunksExist(x - radius1, y - radius1, z - radius1, x + radius1, y + radius1, z + radius1)) {
-                for (int xOffset = -radius; xOffset <= radius; ++xOffset) {
-                    for (int yOffset = -radius; yOffset <= radius; ++yOffset) {
-                        for (int zOffset = -radius; zOffset <= radius; ++zOffset) {
-                            Block block = world.getBlock(x + xOffset, y + yOffset, z + zOffset);
-
-                            if (!block.canSustainLeaves(world, x + xOffset, y + yOffset, z + zOffset)) {
-                                if (block.isLeaves(world, x + xOffset, y + yOffset, z + zOffset)) {
-                                    leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                            + (yOffset + arrayOffset) * yArrayMult
-                                            + zOffset
-                                            + arrayOffset] = IS_LEAVES;
-                                } else {
-                                    leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                            + (yOffset + arrayOffset) * yArrayMult
-                                            + zOffset
-                                            + arrayOffset] = NOT_SUSTAINS_LEAVES;
-                                }
-                            } else {
-                                leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                        + (yOffset + arrayOffset) * yArrayMult
-                                        + zOffset
-                                        + arrayOffset] = SUSTAINS_LEAVES;
-                            }
-                        }
-                    }
-                }
-
-                for (int sustainedValue = 1; sustainedValue <= 8; ++sustainedValue) {
-                    for (int xOffset = -radius; xOffset <= radius; ++xOffset) {
-                        for (int yOffset = -radius; yOffset <= radius; ++yOffset) {
-                            for (int zOffset = -radius; zOffset <= radius; ++zOffset) {
-                                if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                        + (yOffset + arrayOffset) * yArrayMult
-                                        + zOffset
-                                        + arrayOffset] == sustainedValue - 1) {
-                                    if (leafDecayValues[(xOffset + arrayOffset - 1) * xArrayMult
-                                            + (yOffset + arrayOffset) * yArrayMult
-                                            + zOffset
-                                            + arrayOffset] == IS_LEAVES) {
-                                        leafDecayValues[(xOffset + arrayOffset - 1) * xArrayMult
-                                                + (yOffset + arrayOffset) * yArrayMult
-                                                + zOffset
-                                                + arrayOffset] = sustainedValue;
-                                    }
-
-                                    if (leafDecayValues[(xOffset + arrayOffset + 1) * xArrayMult
-                                            + (yOffset + arrayOffset) * yArrayMult
-                                            + zOffset
-                                            + arrayOffset] == IS_LEAVES) {
-                                        leafDecayValues[(xOffset + arrayOffset + 1) * xArrayMult
-                                                + (yOffset + arrayOffset) * yArrayMult
-                                                + zOffset
-                                                + arrayOffset] = sustainedValue;
-                                    }
-
-                                    if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                            + (yOffset + arrayOffset - 1) * yArrayMult
-                                            + zOffset
-                                            + arrayOffset] == IS_LEAVES) {
-                                        leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                                + (yOffset + arrayOffset - 1) * yArrayMult
-                                                + zOffset
-                                                + arrayOffset] = sustainedValue;
-                                    }
-
-                                    if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                            + (yOffset + arrayOffset + 1) * yArrayMult
-                                            + zOffset
-                                            + arrayOffset] == IS_LEAVES) {
-                                        leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                                + (yOffset + arrayOffset + 1) * yArrayMult
-                                                + zOffset
-                                                + arrayOffset] = sustainedValue;
-                                    }
-
-                                    if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                            + (yOffset + arrayOffset) * yArrayMult
-                                            + (zOffset + arrayOffset - 1)] == IS_LEAVES) {
-                                        leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                                + (yOffset + arrayOffset) * yArrayMult
-                                                + (zOffset + arrayOffset - 1)] = sustainedValue;
-                                    }
-
-                                    if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                            + (yOffset + arrayOffset) * yArrayMult
-                                            + zOffset
-                                            + arrayOffset
-                                            + 1] == IS_LEAVES) {
-                                        leafDecayValues[(xOffset + arrayOffset) * xArrayMult
-                                                + (yOffset + arrayOffset) * yArrayMult
-                                                + zOffset
-                                                + arrayOffset
-                                                + 1] = sustainedValue;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            int sustainValue = leafDecayValues[(arrayOffset * xArrayMult) + (arrayOffset * yArrayMult) + arrayOffset];
-
-            if (sustainValue >= 0) {
-                world.setBlockMetadataWithNotify(x, y, z, leafMeta & -9, 4); // stop trying to decay
-            } else {
-                leaves.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-                world.setBlockToAir(x, y, z);
-            }
-        }
-    }
-}

src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java

@@ -34,6 +34,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.gtnewhorizon.gtnhlib.blocks.util.BFSLeafDecay;
 import com.mojang.authlib.GameProfile;
 
 import cpw.mods.fml.relauncher.Side;
@@ -48,7 +49,6 @@ import forestry.api.core.Tabs;
 import forestry.api.lepidopterology.ButterflyManager;
 import forestry.api.lepidopterology.EnumFlutterType;
 import forestry.api.lepidopterology.IButterfly;
-import forestry.arboriculture.LeafDecayHelper;
 import forestry.arboriculture.genetics.TreeDefinition;
 import forestry.arboriculture.items.ItemBlockLeaves;
 import forestry.arboriculture.render.TextureLeaves;
@@ -230,7 +230,12 @@ public class BlockForestryLeaves extends BlockNewLeaf implements ITileEntityProv
             return;
         }
 
-        LeafDecayHelper.leafDecay(this, world, x, y, z);
+        if (!world.isRemote) {
+            final int meta = world.getBlockMetadata(x, y, z);
+            if ((meta & 8) != 0 && (meta & 4) == 0) {
+                BFSLeafDecay.handleDecayChecked(this, world, x, y, z, meta, 4);
+            }
+        }
 
         // check leaves tile again because they can decay in super.updateTick
         if (tileLeaves.isInvalid()) {

src/main/java/forestry/arboriculture/blocks/BlockFruitPod.java

@@ -36,29 +36,29 @@ public class BlockFruitPod extends BlockCocoa {
     }
 
     public static TileFruitPod getPodTile(IBlockAccess world, int x, int y, int z) {
-        TileEntity tile = world.getTileEntity(x, y, z);
-        if (!(tile instanceof TileFruitPod)) {
-            return null;
+        final TileEntity tile = world.getTileEntity(x, y, z);
+        if (tile instanceof TileFruitPod) {
+            return (TileFruitPod) tile;
         }
-
-        return (TileFruitPod) tile;
+        return null;
     }
 
     @Override
     public void updateTick(World world, int x, int y, int z, Random rand) {
-
+        if (!world.checkChunksExist(x - 1, y, z - 1, x + 1, y, z + 1)) {
+            return;
+        }
         if (!canBlockStay(world, x, y, z)) {
-            dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
+            final int meta = world.getBlockMetadata(x, y, z);
+            this.dropBlockAsItem(world, x, y, z, meta, 0);
             world.setBlockToAir(x, y, z);
             return;
         }
 
-        TileFruitPod tile = getPodTile(world, x, y, z);
-        if (tile == null) {
-            return;
+        final TileFruitPod tile = getPodTile(world, x, y, z);
+        if (tile != null) {
+            tile.onBlockTick();
         }
-
-        tile.onBlockTick();
     }
 
     @SuppressWarnings("deprecation")

src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java

@@ -26,6 +26,7 @@ public class ItemRegistryArboriculture extends ItemRegistry {
         OreDictionary.registerOre("treeSapling", sapling.getWildcard());
 
         pollenFertile = registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollenFertile");
+        OreDictionary.registerOre("itemPollenFertile", pollenFertile.getWildcard());
         treealyzer = registerItem(new ItemTreealyzer(), "treealyzer");
         grafter = registerItem(new ItemGrafter(4), "grafter");
         grafterProven = registerItem(new ItemGrafter(149), "grafterProven");

src/main/java/forestry/arboriculture/tiles/TileWood.java

@@ -95,8 +95,7 @@ public class TileWood extends TileEntity implements IStreamable {
         EnumWoodType woodType = wood.getWoodType();
 
         int amount = 1;
-        if (block instanceof BlockSlab) {
-            BlockSlab blockSlab = (BlockSlab) block;
+        if (block instanceof BlockSlab blockSlab) {
             if (blockSlab.isDoubleSlab()) {
                 amount = 2;
                 block = PluginArboriculture.blocks.slabs;
@@ -104,6 +103,7 @@ public class TileWood extends TileEntity implements IStreamable {
         }
 
         ItemStack itemStack = new ItemStack(block, amount);
+        if (itemStack.getItem() == null) return null;
         ItemBlockWood.saveToItemStack(woodType, itemStack);
         return itemStack;
     }

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

@@ -84,31 +84,26 @@ public class BlockSoil extends Block implements IItemTyped {
     }
 
     @Override
-    public void updateTick(World world, int i, int j, int k, Random random) {
+    public void updateTick(World world, int x, int y, int z, Random random) {
         if (world.isRemote) {
             return;
         }
 
-        int meta = world.getBlockMetadata(i, j, k);
-
+        int meta = world.getBlockMetadata(x, y, z);
         SoilType type = getTypeFromMeta(meta);
 
         if (type == SoilType.HUMUS) {
-            updateTickHumus(world, i, j, k);
+            if (world.checkChunksExist(x - 1, y + 1, z - 1, x + 1, y + 1, z + 1)) {
+                if (isEnrooted(world, x, y, z)) {
+                    degradeSoil(world, x, y, z);
+                }
+            }
         } else if (type == SoilType.BOG_EARTH) {
-            updateTickBogEarth(world, i, j, k);
-        }
-    }
-
-    private static void updateTickHumus(World world, int i, int j, int k) {
-        if (isEnrooted(world, i, j, k)) {
-            degradeSoil(world, i, j, k);
-        }
-    }
-
-    private static void updateTickBogEarth(World world, int i, int j, int k) {
-        if (isMoistened(world, i, j, k)) {
-            matureBog(world, i, j, k);
+            if (world.checkChunksExist(x - 2, y, z - 2, x + 2, y, z + 2)) {
+                if (isMoistened(world, x, y, z)) {
+                    matureBog(world, x, y, z);
+                }
+            }
         }
     }
 
@@ -122,7 +117,6 @@ public class BlockSoil extends Block implements IItemTyped {
                 }
             }
         }
-
         return false;
     }
 
@@ -156,7 +150,6 @@ public class BlockSoil extends Block implements IItemTyped {
     }
 
     private static boolean isMoistened(World world, int x, int y, int z) {
-
         for (int i = -2; i < 3; i++) {
             for (int j = -2; j < 3; j++) {
                 Block block = world.getBlock(x + i, y, z + j);
@@ -165,7 +158,6 @@ public class BlockSoil extends Block implements IItemTyped {
                 }
             }
         }
-
         return false;
     }
 

src/main/java/forestry/core/fluids/BlockForestryFluid.java

@@ -193,7 +193,7 @@ public class BlockForestryFluid extends BlockFluidClassic {
         super.updateTick(world, x, y, z, rand);
 
         // Start fires if the fluid is lava-like
-        if (getMaterial() == Material.lava) {
+        if (getMaterial() == Material.lava && world.checkChunksExist(x - 4, y, z - 4, x + 4, y, z + 4)) {
             int rangeUp = rand.nextInt(3);
 
             for (int i = 0; i < rangeUp; ++i) {

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

@@ -60,8 +60,6 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockR
 
     private void render(ItemStack itemstack, World world, ForgeDirection orientation, double x, double y, double z) {
 
-        dummyEntityItem.worldObj = world;
-
         model.render(orientation, (float) x, (float) y, (float) z);
         if (itemstack == null) {
             return;
@@ -72,13 +70,18 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer implements IBlockR
         GL11.glTranslatef((float) x, (float) y, (float) z);
         GL11.glTranslatef(0.5f, 0.2f, 0.5f);
         GL11.glScalef(renderScale, renderScale, renderScale);
-        dummyEntityItem.setEntityItemStack(itemstack);
 
-        if (world.getTotalWorldTime() != lastTick) {
-            lastTick = world.getTotalWorldTime();
-            dummyEntityItem.onUpdate();
+        try {
+            dummyEntityItem.worldObj = world;
+            dummyEntityItem.setEntityItemStack(itemstack);
+            if (world.getTotalWorldTime() != lastTick) {
+                lastTick = world.getTotalWorldTime();
+                dummyEntityItem.onUpdate();
+            }
+            customRenderItem.doRender(dummyEntityItem, 0, 0, 0, 0, 0);
+        } finally {
+            dummyEntityItem.worldObj = null;
         }
-        customRenderItem.doRender(dummyEntityItem, 0, 0, 0, 0, 0);
         GL11.glPopMatrix();
     }
 }

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

@@ -22,8 +22,6 @@ import forestry.core.tiles.TileMill;
 
 public class RenderMill extends TileEntitySpecialRenderer implements IBlockRenderer {
 
-    private final ModelBase model = new ModelBase() {};
-
     private enum Textures {
         PEDESTAL,
         EXTENSION,
@@ -41,6 +39,7 @@ public class RenderMill extends TileEntitySpecialRenderer implements IBlockRende
     private final ModelRenderer blade2;
 
     public RenderMill() {
+        ModelBase model = new ModelBase() {};
         pedestal = new ModelRenderer(model, 0, 0);
         pedestal.addBox(-8F, -8F, -8F, 16, 1, 16);
         pedestal.rotationPointX = 8;

src/main/java/forestry/factory/gui/GuiWorktable.java

@@ -118,7 +118,7 @@ public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWork
 
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glTranslatef(0, 0, 150);
-        drawRect(left, top, left + 16, top + 16, 0x88ff0000);
+        drawRect(left, top, left + 16, top + 16, 0x88000000 | getFontColor().get("gui.worktable.missing"));
         GL11.glTranslatef(0, 0, -150);
         GL11.glEnable(GL11.GL_LIGHTING);
     }

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

@@ -72,51 +72,54 @@ public class BlockMushroom extends BlockSapling implements IItemTyped {
     }
 
     @Override
-    public void updateTick(World world, int i, int j, int k, Random random) {
-
+    public void updateTick(World world, int x, int y, int z, Random random) {
         if (world.isRemote) {
             return;
         }
 
-        int meta = world.getBlockMetadata(i, j, k);
-        MushroomType type = getTypeFromMeta(meta);
-        int maturity = meta >> 2;
+        final int meta = world.getBlockMetadata(x, y, z);
+        final MushroomType type = getTypeFromMeta(meta);
+        final int maturity = meta >> 2;
 
-        tickGermling(world, i, j, k, random, type, maturity);
+        tickGermling(world, x, y, z, random, type, maturity);
     }
 
-    private void tickGermling(World world, int i, int j, int k, Random random, MushroomType type, int maturity) {
-
-        int lightvalue = world.getBlockLightValue(i, j + 1, k);
-
+    private void tickGermling(World world, int x, int y, int z, Random random, MushroomType type, int maturity) {
         if (random.nextInt(2) != 0) {
             return;
         }
-
         if (maturity != 3) {
             maturity = 3;
-            int matX = maturity << 2;
-            int meta = (matX | type.ordinal());
-            world.setBlockMetadataWithNotify(i, j, k, meta, Constants.FLAG_BLOCK_SYNCH);
-        } else if (lightvalue <= 7) {
-            func_149878_d(world, i, j, k, random);
+            final int matX = maturity << 2;
+            final int meta = (matX | type.ordinal());
+            world.setBlockMetadataWithNotify(x, y, z, meta, Constants.FLAG_BLOCK_SYNCH);
+        } else {
+            if (world.checkChunksExist(x - 1, y, z - 1, x + 1, y, z + 1)) {
+                final int lightvalue = world.getBlockLightValue(x, y + 1, z);
+                if (lightvalue <= 7) {
+                    func_149878_d(world, x, y, z, random);
+                }
+            }
         }
     }
 
     @Override
-    public void func_149878_d(World world, int i, int j, int k, Random random) {
-        MushroomType type = getTypeFromMeta(world.getBlockMetadata(i, j, k));
+    public void func_149878_d(World world, int x, int y, int z, Random random) {
+        MushroomType type = getTypeFromMeta(world.getBlockMetadata(x, y, z));
 
-        world.setBlockToAir(i, j, k);
-        if (!generators[type.ordinal()].generate(world, random, i, j, k)) {
-            world.setBlock(i, j, k, this, type.ordinal(), 0);
+        world.setBlockToAir(x, y, z);
+        if (!generators[type.ordinal()].generate(world, random, x, y, z)) {
+            world.setBlock(x, y, z, this, type.ordinal(), 0);
         }
     }
 
     @Override
     public MushroomType getTypeFromMeta(int meta) {
-        meta %= MushroomType.values().length;
-        return MushroomType.values()[meta];
+        return switch (meta % 2) {
+            case 0 -> MushroomType.BROWN;
+            case 1 -> MushroomType.RED;
+            default -> throw new IllegalStateException("Unexpected value: " + meta);
+        };
     }
 
     /* ICONS */
@@ -135,15 +138,10 @@ public class BlockMushroom extends BlockSapling implements IItemTyped {
     @SideOnly(Side.CLIENT)
     @Override
     public IIcon getIcon(int side, int meta) {
-        MushroomType type = getTypeFromMeta(meta);
-
-        switch (type) {
-            case BROWN:
-                return Blocks.brown_mushroom.getIcon(side, meta);
-            case RED:
-                return Blocks.red_mushroom.getIcon(side, meta);
-            default:
-                return null;
-        }
+        final MushroomType type = getTypeFromMeta(meta);
+        return switch (type) {
+            case BROWN -> Blocks.brown_mushroom.getIcon(side, meta);
+            case RED -> Blocks.red_mushroom.getIcon(side, meta);
+        };
     }
 }

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

@@ -0,0 +1,50 @@
+package forestry.farming.multiblock;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+
+import forestry.api.multiblock.IFarmFertilizerRegistry;
+import forestry.core.utils.ItemStackUtil;
+
+public class FarmFertilizerRegistry implements IFarmFertilizerRegistry {
+
+    // the current list isn't big enough to require a hash map, and is faster as a list.
+    private final List<ItemStack> fertilizers = new ArrayList<>(5);
+
+    @Override
+    public Collection<ItemStack> getFertilizers() {
+        return fertilizers;
+    }
+
+    @Override
+    public void addFertilizer(ItemStack itemstack) {
+        // maybe throw warn? but could also be nice to leave as no warn for easier/cleaner optional mod dependencies
+        if (itemstack == null || itemstack.getItem() == null || itemstack.stackSize <= 0) return;
+        fertilizers.add(itemstack);
+    }
+
+    @Override
+    public void removeFertilizer(ItemStack itemstack) {
+        // maybe throw warn? but could also be nice to leave as no warn for easier/cleaner optional mod dependencies
+        if (itemstack == null || itemstack.getItem() == null) return;
+        fertilizers.removeIf(fert -> {
+            // in stack first so it wild card can be used for a wild-card clear.
+            return ItemStackUtil.isIdenticalItem(itemstack, fert);
+        });
+    }
+
+    @Override
+    public boolean isFertilizer(ItemStack itemstack) {
+        if (itemstack == null) return false;
+        for (ItemStack fert : this.fertilizers) {
+            // fert first to allow for wild card checks
+            if (ItemStackUtil.isIdenticalItem(fert, itemstack)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -12,7 +12,6 @@ import java.util.Deque;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.Fluid;
@@ -21,6 +20,7 @@ import forestry.api.farming.FarmDirection;
 import forestry.api.farming.IFarmInventory;
 import forestry.api.farming.IFarmLogic;
 import forestry.api.farming.IFarmable;
+import forestry.api.multiblock.MultiblockManager;
 import forestry.core.fluids.FluidHelper;
 import forestry.core.fluids.TankManager;
 import forestry.core.inventory.InventoryAdapterRestricted;
@@ -28,9 +28,6 @@ import forestry.core.inventory.wrappers.InventoryMapper;
 import forestry.core.utils.InventoryUtil;
 import forestry.core.utils.PlayerUtil;
 import forestry.core.utils.SlotUtil;
-import forestry.plugins.PluginCore;
-import forestry.plugins.PluginManager;
-import ic2.api.item.IC2Items;
 
 public class InventoryFarm extends InventoryAdapterRestricted implements IFarmInventory {
 
@@ -134,18 +131,8 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
 
     @Override
     public boolean acceptsAsFertilizer(ItemStack itemstack) {
-        if (itemstack == null) {
-            return false;
-        }
-        Item item = itemstack.getItem();
-        if (PluginManager.Module.INDUSTRIALCRAFT.isEnabled()) {
-            Item ic2fert = IC2Items.getItem("fertilizer").getItem();
-            if (ic2fert == item) {
-                return true;
-            }
-        }
-
-        return PluginCore.items.fertilizerCompound == item;
+        // check if it's a fertilizer
+        return MultiblockManager.farmFertilizerRegistry.isFertilizer(itemstack);
     }
 
     @Override

src/main/java/forestry/lepidopterology/entities/EntityButterfly.java

@@ -307,8 +307,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
         size = genome.getSize();
         setSize(size, 0.4f);
         species = genome.getPrimary();
-
-        if (!worldObj.isRemote) {
+        if (worldObj != null && !worldObj.isRemote) {
             dataWatcher.updateObject(DATAWATCHER_ID_SIZE, (int) (size * 100));
             dataWatcher.updateObject(DATAWATCHER_ID_SPECIES, species.getUID());
         } else {

src/main/java/forestry/lepidopterology/render/RenderButterflyItem.java

@@ -25,13 +25,8 @@ import forestry.lepidopterology.entities.EntityButterfly;
 
 public class RenderButterflyItem implements IItemRenderer {
 
-    private final ModelButterfly model;
     private EntityButterfly entity;
 
-    public RenderButterflyItem() {
-        model = new ModelButterfly();
-    }
-
     private static float getWingYaw(IButterfly butterfly) {
         float wingYaw = 1f;
 
@@ -72,18 +67,12 @@ public class RenderButterflyItem implements IItemRenderer {
 
     private IButterfly initButterfly(ItemStack item) {
         IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(item);
-        if (butterfly == null) {
-            butterfly = ButterflyManager.butterflyRoot
-                    .templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate());
-        }
-
         if (entity == null) {
-            entity = new EntityButterfly(Proxies.common.getRenderWorld(), butterfly, 0, 0, 0);
+            entity = new EntityButterfly(null, butterfly, 0, 0, 0);
         } else {
             entity.setIndividual(butterfly);
         }
-
-        return butterfly;
+        return entity.getButterfly();
     }
 
     private void renderButterflyItem(IButterfly butterfly, float translateX, float translateY, float translateZ) {
@@ -111,7 +100,12 @@ public class RenderButterflyItem implements IItemRenderer {
             entity.rotationPitch = 0;
             entity.rotationYawHead = entity.rotationYaw;
 
-            RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0f);
+            try {
+                entity.setWorld(Proxies.common.getRenderWorld());
+                RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0f);
+            } finally {
+                entity.setWorld(null);
+            }
 
         } else {
             GL11.glTranslatef(translateX, translateY, translateZ);
@@ -119,14 +113,19 @@ public class RenderButterflyItem implements IItemRenderer {
             GL11.glScalef(-2.0f, 2.0f, 2.0f);
             GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
             GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F);
-            GL11.glRotatef(-((float) Math.atan((double) (pitch / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F);
+            GL11.glRotatef(-((float) Math.atan(pitch / 40.0F)) * 20.0F, 1.0F, 0.0F, 0.0F);
 
-            entity.renderYawOffset = (float) Math.atan((double) (yaw / 40.0F)) * 20.0F;
-            entity.rotationYaw = (float) Math.atan((double) (yaw / 40.0F)) * 40.0F;
-            entity.rotationPitch = -((float) Math.atan((double) (pitch / 40.0F))) * 20.0F;
+            entity.renderYawOffset = (float) Math.atan(yaw / 40.0F) * 20.0F;
+            entity.rotationYaw = (float) Math.atan(yaw / 40.0F) * 40.0F;
+            entity.rotationPitch = -((float) Math.atan(pitch / 40.0F)) * 20.0F;
             entity.rotationYawHead = entity.rotationYaw;
 
-            RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, getWingYaw(butterfly));
+            try {
+                entity.setWorld(Proxies.common.getRenderWorld());
+                RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, getWingYaw(butterfly));
+            } finally {
+                entity.setWorld(null);
+            }
         }
 
         GL11.glPopMatrix();
@@ -160,8 +159,12 @@ public class RenderButterflyItem implements IItemRenderer {
         entity.rotationPitch = 0;
         entity.rotationYawHead = entity.rotationYaw;
 
-        RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, getWingYaw(butterfly));
-
+        try {
+            entity.setWorld(Proxies.common.getRenderWorld());
+            RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, getWingYaw(butterfly));
+        } finally {
+            entity.setWorld(null);
+        }
         GL11.glPopMatrix();
         RenderHelper.disableStandardItemLighting();
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
@@ -173,39 +176,27 @@ public class RenderButterflyItem implements IItemRenderer {
 
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
-        switch (type) {
-            case ENTITY:
-            case EQUIPPED:
-            case EQUIPPED_FIRST_PERSON:
-            case INVENTORY:
-                return true;
-            default:
-                return false;
-        }
+        return switch (type) {
+            case ENTITY, EQUIPPED, EQUIPPED_FIRST_PERSON, INVENTORY -> true;
+            default -> false;
+        };
     }
 
     @Override
     public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
-        switch (helper) {
-            case ENTITY_BOBBING:
-            case ENTITY_ROTATION:
-                return false;
-            default:
-                return true;
-        }
+        return switch (helper) {
+            case ENTITY_BOBBING, ENTITY_ROTATION -> false;
+            default -> true;
+        };
     }
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-
         switch (type) {
             case ENTITY:
                 renderButterflyItem(initButterfly(item), 0f, -0.5f, 0f);
                 break;
-            case EQUIPPED:
-                renderButterflyItem(initButterfly(item), 0.5f, -0.9f, 1.0f);
-                break;
-            case EQUIPPED_FIRST_PERSON:
+            case EQUIPPED, EQUIPPED_FIRST_PERSON:
                 renderButterflyItem(initButterfly(item), 0.5f, -0.9f, 1.0f);
                 break;
             case INVENTORY:

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

@@ -55,6 +55,7 @@ import forestry.core.recipes.RecipeUtil;
 import forestry.core.tiles.MachineDefinition;
 import forestry.core.utils.ClimateUtil;
 import forestry.core.utils.ForestryModEnvWarningCallable;
+import forestry.farming.multiblock.FarmFertilizerRegistry;
 
 @Plugin(
         pluginID = "Core",
@@ -85,6 +86,7 @@ public class PluginCore extends ForestryPlugin {
         AlleleHelper.instance = new AlleleHelper();
 
         MultiblockManager.logicFactory = new MultiblockLogicFactory();
+        MultiblockManager.farmFertilizerRegistry = new FarmFertilizerRegistry();
     }
 
     @Override

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

@@ -20,6 +20,7 @@ import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.oredict.OreDictionary;
 
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
@@ -30,6 +31,7 @@ import forestry.api.circuits.CircuitSocketType;
 import forestry.api.circuits.ICircuitLayout;
 import forestry.api.farming.Farmables;
 import forestry.api.farming.IFarmable;
+import forestry.api.multiblock.MultiblockManager;
 import forestry.core.circuits.Circuit;
 import forestry.core.circuits.CircuitLayout;
 import forestry.core.config.Constants;
@@ -402,5 +404,8 @@ public class PluginFarming extends ForestryPlugin {
                 layoutManual,
                 PluginCore.items.tubes.get(EnumElectronTube.LAPIS, 1),
                 Circuit.farmCocoaManual);
+
+        MultiblockManager.farmFertilizerRegistry
+                .addFertilizer(new ItemStack(PluginCore.items.fertilizerCompound, 1, OreDictionary.WILDCARD_VALUE));
     }
 }

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

@@ -32,6 +32,7 @@ import forestry.api.core.ForestryAPI;
 import forestry.api.farming.Farmables;
 import forestry.api.fuels.EngineBronzeFuel;
 import forestry.api.fuels.FuelManager;
+import forestry.api.multiblock.MultiblockManager;
 import forestry.api.recipes.RecipeManagers;
 import forestry.api.storage.BackpackManager;
 import forestry.api.storage.IBackpackDefinition;
@@ -94,6 +95,7 @@ public class PluginIC2 extends ForestryPlugin {
     private static ItemStack silver;
     private static ItemStack brass;
     private static ItemStack uuMatter;
+    private static ItemStack fertilizer;
 
     public static ItemStack resin;
     public static ItemStack rubberwood;
@@ -162,11 +164,13 @@ public class PluginIC2 extends ForestryPlugin {
         brass = IC2Items.getItem("bronzeIngot");
 
         uran238 = IC2Items.getItem("Uran238");
+        fertilizer = IC2Items.getItem("fertilizer");
 
         Circuit.farmRubberManual = new CircuitFarmLogic("manualRubber", FarmLogicRubber.class);
 
         ICircuitLayout layoutEngineTin = new CircuitLayout("engine.tin", CircuitSocketType.ELECTRIC_ENGINE);
         ChipsetManager.circuitRegistry.registerLayout(layoutEngineTin);
+
     }
 
     @Override
@@ -378,6 +382,10 @@ public class PluginIC2 extends ForestryPlugin {
                     'V',
                     Blocks.piston);
         }
+
+        if (PluginManager.Module.FARMING.isEnabled() && fertilizer != null) {
+            MultiblockManager.farmFertilizerRegistry.addFertilizer(fertilizer);
+        }
     }
 
     /**

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

@@ -10,6 +10,7 @@ gui.screen=ffffff
 gui.table.header=ababab
 gui.table.row=ababab
 gui.book=000000
+gui.worktable.missing=ff0000
 
 gui.beealyzer.binomial=14d50b
 gui.beealyzer.recessive=3687ec