update

README.md

@@ -3,9 +3,17 @@ Forestry
 
 ### What is it?
 
-This is the GTNH fork of Forestry for 1.7.10.  Do not report any issues to the original Forestry team.  This fork is maintained by the GTNH team and is not supported by the original Forestry team.
 Forestry is a modification for the game Minecraft and known primarily for its farms and bees. 
 
+### Homepage
+
+[Wiki](http://forestry.sengir.net/)
+
+[Latest Builds for 1.7.10](http://jenkins.ic2.player.to/job/Forestry_Dev/)
+
+[IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1)
+
+For those interested in developement, you can also visit #forestry-dev.
 
 ### Building
 
@@ -23,6 +31,8 @@ Beware of ugly code.
 
 Bugfixes are generally welcome. If you want to contribute something which changes game mechanics, please talk to someone with commit privileges first. Nothing is more frustrating than putting a lot of work and effort into a new game mechanic and then having the PR rejected because it doesn’t fit gameplay-wise.
 
+**If you submit a PR you must accept the [Contributor License Agreement](https://cla-assistant.io/ForestryMC/ForestryMC). There is no way around that, since otherwise changing the license later - even to something more permissive! - , becomes close to impossible.**
+
 ### License & Copyright
 
-Forestry is (c) 2011 - 2014 SirSengir and licensed under LGPL v3. See the LICENSE.txt for all the gory details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information. Forestry also contains code contributed by CovertJaguar, Player, MysteriousAges, Binnie, RichardG, cpw, the GTNH Team, and others.
+Forestry is (c) 2011 - 2014 SirSengir and licensed under LGPL v3. See the LICENSE.txt for all the gory details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information. Forestry also contains code contributed by CovertJaguar, Player, MysteriousAges, Binnie, RichardG, cpw and others.

dependencies.gradle

@@ -2,8 +2,7 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha51:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.18-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2:api')
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle.properties

@@ -117,7 +117,7 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

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

src/main/java/forestry/apiculture/blocks/BlockAlveary.java

@@ -97,7 +97,7 @@ public class BlockAlveary extends BlockStructure {
     /* TILE ENTITY CREATION */
     @Override
     public TileEntity createTileEntity(World world, int metadata) {
-        if (metadata < 0 || metadata >= Type.VALUES.length) {
+        if (metadata < 0 || metadata > Type.VALUES.length) {
             return null;
         }
 

src/main/java/forestry/apiculture/render/RenderCandleBlock.java

@@ -15,14 +15,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
-
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import forestry.apiculture.blocks.BlockCandle;
 import forestry.apiculture.tiles.TileCandle;
 import forestry.core.proxy.Proxies;
 
-@ThreadSafeISBRH(perThread = false)
 public class RenderCandleBlock implements ISimpleBlockRenderingHandler {
 
     @Override
@@ -61,7 +58,7 @@ public class RenderCandleBlock implements ISimpleBlockRenderingHandler {
         IIcon iconB = block.getTextureFromPassAndLit(1, isLit);
 
         int colour = tileCandle.getColour();
-        final Tessellator tessellator = Tessellator.instance;
+        Tessellator tessellator = Tessellator.instance;
         tessellator.setBrightness(world.getLightBrightnessForSkyBlocks(x, y, z, block.getLightValue(world, x, y, z)));
         tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
         double d0 = 0.4000000059604645D;
@@ -90,7 +87,7 @@ public class RenderCandleBlock implements ISimpleBlockRenderingHandler {
 
     private static void renderCandleAtAngle(IIcon icon, double x, double y, double z, double par8, double par10,
             int colour) {
-        final Tessellator tessellator = Tessellator.instance;
+        Tessellator tessellator = Tessellator.instance;
         double minU = icon.getMinU();
         double minV = icon.getMinV();
         double maxU = icon.getMaxU();

src/main/java/forestry/arboriculture/render/RenderFruitPodBlock.java

@@ -15,14 +15,11 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
-
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import forestry.arboriculture.blocks.BlockFruitPod;
 import forestry.arboriculture.tiles.TileFruitPod;
 import forestry.plugins.PluginArboriculture;
 
-@ThreadSafeISBRH(perThread = false)
 public class RenderFruitPodBlock implements ISimpleBlockRenderingHandler {
 
     @Override
@@ -40,7 +37,7 @@ public class RenderFruitPodBlock implements ISimpleBlockRenderingHandler {
             maturity = pod.getMaturity();
         }
 
-        final Tessellator tessellator = Tessellator.instance;
+        Tessellator tessellator = Tessellator.instance;
         tessellator.setBrightness(blockPod.getMixedBrightnessForBlock(world, x, y, z));
         tessellator.setColorOpaque_F(1.0f, 1.0f, 1.0f);
         int metadata = world.getBlockMetadata(x, y, z);

src/main/java/forestry/arboriculture/render/RenderLeavesBlock.java

@@ -14,8 +14,6 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
-
 import forestry.arboriculture.blocks.BlockForestryLeaves;
 import forestry.arboriculture.tiles.TileLeaves;
 import forestry.core.render.RenderOverlayBlock;
@@ -24,7 +22,6 @@ import forestry.plugins.PluginArboriculture;
 /**
  * Ugly but serviceable renderer for leaves, taking fruits into account.
  */
-@ThreadSafeISBRH(perThread = false)
 public class RenderLeavesBlock extends RenderOverlayBlock {
 
     @Override

src/main/java/forestry/arboriculture/render/RenderSaplingBlock.java

@@ -15,8 +15,6 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
-
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import forestry.api.arboriculture.EnumGermlingType;
 import forestry.api.arboriculture.IAlleleTreeSpecies;
@@ -24,9 +22,10 @@ import forestry.arboriculture.blocks.BlockSapling;
 import forestry.arboriculture.tiles.TileSapling;
 import forestry.plugins.PluginArboriculture;
 
-@ThreadSafeISBRH(perThread = false)
 public class RenderSaplingBlock implements ISimpleBlockRenderingHandler {
 
+    private static int renderLayer = 0;
+
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {}
 
@@ -46,8 +45,10 @@ public class RenderSaplingBlock implements ISimpleBlockRenderingHandler {
 
         IAlleleTreeSpecies species = tile.getTree().getGenome().getPrimary();
 
-        renderCrossedSquares(species, world, block, x, y, z, 0);
-        renderCrossedSquares(species, world, block, x, y, z, 1);
+        renderCrossedSquares(species, world, block, x, y, z);
+        renderLayer = 1;
+        renderCrossedSquares(species, world, block, x, y, z);
+        renderLayer = 0;
         return true;
     }
 
@@ -62,9 +63,9 @@ public class RenderSaplingBlock implements ISimpleBlockRenderingHandler {
     }
 
     private static boolean renderCrossedSquares(IAlleleTreeSpecies species, IBlockAccess world, Block block, int x,
-            int y, int z, int renderLayer) {
+            int y, int z) {
 
-        final Tessellator tess = Tessellator.instance;
+        Tessellator tess = Tessellator.instance;
 
         tess.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
         int colourMultiplier = species.getGermlingColour(EnumGermlingType.SAPLING, renderLayer);
@@ -80,14 +81,14 @@ public class RenderSaplingBlock implements ISimpleBlockRenderingHandler {
         }
 
         tess.setColorOpaque_F(r, g, b);
-        drawCrossedSquares(species, x, y, z, 1.0f, renderLayer);
+        drawCrossedSquares(species, x, y, z, 1.0f);
         return true;
     }
 
-    private static void drawCrossedSquares(IAlleleTreeSpecies species, double par3, double par5, double par7, float mod,
-            int renderLayer) {
+    private static void drawCrossedSquares(IAlleleTreeSpecies species, double par3, double par5, double par7,
+            float mod) {
 
-        final Tessellator tess = Tessellator.instance;
+        Tessellator tess = Tessellator.instance;
         IIcon icon = species.getGermlingIcon(EnumGermlingType.SAPLING, renderLayer);
 
         double d3 = (double) icon.getMinU();

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

@@ -25,8 +25,6 @@ import forestry.core.network.packets.PacketAccessUpdate;
 import forestry.core.network.packets.PacketErrorUpdate;
 import forestry.core.network.packets.PacketGuiEnergy;
 import forestry.core.network.packets.PacketGuiUpdate;
-import forestry.core.network.packets.PacketTileConfiguration;
-import forestry.core.tiles.IConfigurable;
 import forestry.core.tiles.IPowerHandler;
 import forestry.core.tiles.TilePowered;
 import forestry.core.tiles.TileUtil;
@@ -36,7 +34,6 @@ public abstract class ContainerTile<T extends TileEntity> extends ContainerFores
 
     protected final T tile;
     private final IAccessHandler accessHandler;
-    private boolean configurationChanged;
 
     protected ContainerTile(T tile) {
         this.tile = tile;
@@ -46,10 +43,6 @@ public abstract class ContainerTile<T extends TileEntity> extends ContainerFores
         } else {
             accessHandler = FakeAccessHandler.getInstance();
         }
-
-        if (tile instanceof IConfigurable) {
-            configurationChanged = true;
-        }
     }
 
     protected ContainerTile(T tileForestry, InventoryPlayer playerInventory, int xInv, int yInv) {
@@ -135,15 +128,6 @@ public abstract class ContainerTile<T extends TileEntity> extends ContainerFores
                 sendPacketToCrafters(packet);
             }
         }
-
-        if (tile instanceof IConfigurable && configurationChanged) {
-            configurationChanged = false;
-            sendPacketToCrafters(new PacketTileConfiguration(tile));
-        }
-    }
-
-    protected void markConfigurationDirty() {
-        configurationChanged = true;
     }
 
     public void onGuiEnergy(int energyStored) {

src/main/java/forestry/core/gui/ledgers/Ledger.java

@@ -138,10 +138,6 @@ public abstract class Ledger {
         return false;
     }
 
-    public boolean acceptMouseButton(int mouseButton) {
-        return mouseButton == 0;
-    }
-
     public boolean intersectsWith(int mouseX, int mouseY) {
         return mouseX >= currentShiftX && mouseX <= currentShiftX + currentWidth
                 && mouseY >= currentShiftY

src/main/java/forestry/core/gui/ledgers/LedgerManager.java

@@ -159,28 +159,29 @@ public class LedgerManager {
     }
 
     public void handleMouseClicked(int x, int y, int mouseButton) {
-        Ledger ledger = this.getAtPosition(x, y);
-        if (ledger == null || !ledger.acceptMouseButton(mouseButton)) {
-            return;
-        }
 
-        // Default action only if the mouse click was not handled by the
-        // ledger itself.
-        if (!ledger.handleMouseClicked(x, y, mouseButton)) {
+        if (mouseButton == 0) {
 
-            List<? extends Ledger> toggleLedgers;
-            if (ledgers.contains(ledger)) {
-                toggleLedgers = ledgers;
-            } else {
-                toggleLedgers = errorLedgers;
-            }
+            Ledger ledger = this.getAtPosition(x, y);
 
-            for (Ledger other : toggleLedgers) {
-                if (other != ledger && other.isOpen()) {
-                    other.toggleOpen();
+            // Default action only if the mouse click was not handled by the
+            // ledger itself.
+            if (ledger != null && !ledger.handleMouseClicked(x, y, mouseButton)) {
+
+                List<? extends Ledger> toggleLedgers;
+                if (ledgers.contains(ledger)) {
+                    toggleLedgers = ledgers;
+                } else {
+                    toggleLedgers = errorLedgers;
                 }
+
+                for (Ledger other : toggleLedgers) {
+                    if (other != ledger && other.isOpen()) {
+                        other.toggleOpen();
+                    }
+                }
+                ledger.toggleOpen();
             }
-            ledger.toggleOpen();
         }
     }
 

src/main/java/forestry/core/gui/ledgers/SearchIngregientsLedger.java

@@ -1,78 +0,0 @@
-package forestry.core.gui.ledgers;
-
-import java.util.Locale;
-
-import net.minecraft.util.IIcon;
-
-import forestry.core.render.TextureManager;
-import forestry.core.tiles.IIngredientsSearchController;
-import forestry.core.tiles.IngredientsStorage;
-import forestry.core.utils.StringUtil;
-
-public class SearchIngregientsLedger extends Ledger {
-
-    private final IIngredientsSearchController ingredientsSearch;
-
-    public SearchIngregientsLedger(LedgerManager manager, IIngredientsSearchController ingredientsSearch) {
-        super(manager, "search_ingredients");
-        this.ingredientsSearch = ingredientsSearch;
-        this.maxHeight = 36;
-    }
-
-    private boolean isSwitchButton(int mouseX, int mouseY) {
-        int shiftX = currentShiftX + 20;
-        int shiftY = currentShiftY + 8;
-        return mouseX >= shiftX && mouseX <= currentShiftX + currentWidth && mouseY >= shiftY && mouseY <= shiftY + 24;
-    }
-
-    @Override
-    public void draw(int x, int y) {
-        // Draw background
-        drawBackground(x, y);
-
-        // Draw icon
-        IIcon icon = TextureManager.getInstance().getDefault(
-                "misc/search_ingredients."
-                        + ingredientsSearch.getIngredientsStorage().toString().toLowerCase(Locale.ENGLISH));
-        drawIcon(icon, x + 3, y + 4);
-
-        // Draw description
-        if (!isFullyOpened()) {
-            return;
-        }
-
-        drawHeader(StringUtil.localize("gui.search_ingredients"), x + 22, y + 8);
-        drawText(
-                StringUtil.localize(
-                        "gui.search_ingredients."
-                                + ingredientsSearch.getIngredientsStorage().toString().toLowerCase(Locale.ENGLISH)),
-                x + 22,
-                y + 20);
-    }
-
-    @Override
-    public String getTooltip() {
-        return StringUtil.localize("gui.search_ingredients") + ": "
-                + StringUtil.localize(
-                        "gui.search_ingredients."
-                                + ingredientsSearch.getIngredientsStorage().toString().toLowerCase(Locale.ENGLISH));
-    }
-
-    @Override
-    public boolean handleMouseClicked(int x, int y, int mouseButton) {
-        if (isSwitchButton(x, y)) {
-            IngredientsStorage ingredientsStorage = ingredientsSearch.getIngredientsStorage();
-            IngredientsStorage newIngredientsStorage = mouseButton == 0 ? ingredientsStorage.next()
-                    : ingredientsStorage.previous();
-            ingredientsSearch.setIngredientsStorage(newIngredientsStorage);
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean acceptMouseButton(int mouseButton) {
-        return mouseButton == 0 || mouseButton == 1;
-    }
-}

src/main/java/forestry/core/gui/slots/SlotCrafter.java

@@ -20,14 +20,12 @@ public class SlotCrafter extends SlotCrafting {
 
     private final IInventory craftMatrix;
     private final ICrafterWorktable crafter;
-    private final EntityPlayer player;
 
     public SlotCrafter(EntityPlayer player, IInventory craftMatrix, ICrafterWorktable crafter, int slot, int xPos,
             int yPos) {
         super(player, craftMatrix, craftMatrix, slot, xPos, yPos);
         this.craftMatrix = craftMatrix;
         this.crafter = crafter;
-        this.player = player;
     }
 
     @Override
@@ -41,7 +39,7 @@ public class SlotCrafter extends SlotCrafting {
 
     @Override
     public boolean canTakeStack(EntityPlayer player) {
-        return crafter.canTakeStack(player, getSlotIndex());
+        return crafter.canTakeStack(getSlotIndex());
     }
 
     @Override
@@ -51,7 +49,7 @@ public class SlotCrafter extends SlotCrafting {
 
     @Override
     public boolean getHasStack() {
-        return getStack() != null && crafter.canTakeStack(player, getSlotIndex());
+        return getStack() != null && crafter.canTakeStack(getSlotIndex());
     }
 
     @Override

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

@@ -1,100 +0,0 @@
-package forestry.core.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-public class MergedInventories implements IInventory {
-
-    private final IInventory first;
-    private final IInventory second;
-
-    public MergedInventories(IInventory first, IInventory second) {
-        this.first = first;
-        this.second = second;
-    }
-
-    @Override
-    public int getSizeInventory() {
-        return first.getSizeInventory() + second.getSizeInventory();
-    }
-
-    @Override
-    public ItemStack getStackInSlot(int slotIn) {
-        if (slotIn < first.getSizeInventory()) {
-            return first.getStackInSlot(slotIn);
-        }
-        return second.getStackInSlot(slotIn - first.getSizeInventory());
-    }
-
-    @Override
-    public ItemStack decrStackSize(int index, int count) {
-        if (index < first.getSizeInventory()) {
-            return first.decrStackSize(index, count);
-        }
-        return second.decrStackSize(index - first.getSizeInventory(), count);
-    }
-
-    @Override
-    public ItemStack getStackInSlotOnClosing(int index) {
-        if (index < first.getSizeInventory()) {
-            return first.getStackInSlotOnClosing(index);
-        }
-        return second.getStackInSlotOnClosing(index - first.getSizeInventory());
-    }
-
-    @Override
-    public void setInventorySlotContents(int index, ItemStack stack) {
-        if (index < first.getSizeInventory()) {
-            first.setInventorySlotContents(index, stack);
-        } else {
-            second.setInventorySlotContents(index - first.getSizeInventory(), stack);
-        }
-    }
-
-    @Override
-    public String getInventoryName() {
-        return first.getInventoryName();
-    }
-
-    @Override
-    public boolean hasCustomInventoryName() {
-        return first.hasCustomInventoryName();
-    }
-
-    @Override
-    public int getInventoryStackLimit() {
-        return Math.min(first.getInventoryStackLimit(), second.getInventoryStackLimit());
-    }
-
-    @Override
-    public void markDirty() {
-        first.markDirty();
-        second.markDirty();
-    }
-
-    @Override
-    public boolean isUseableByPlayer(EntityPlayer player) {
-        return first.isUseableByPlayer(player) && second.isUseableByPlayer(player);
-    }
-
-    @Override
-    public void openInventory() {
-        first.openInventory();
-        second.openInventory();
-    }
-
-    @Override
-    public void closeInventory() {
-        first.closeInventory();
-        second.closeInventory();
-    }
-
-    @Override
-    public boolean isItemValidForSlot(int index, ItemStack stack) {
-        if (index < first.getSizeInventory()) {
-            return first.isItemValidForSlot(index, stack);
-        }
-        return second.isItemValidForSlot(index - first.getSizeInventory(), stack);
-    }
-}

src/main/java/forestry/core/network/PacketIdClient.java

@@ -32,7 +32,6 @@ public enum PacketIdClient implements IPacketId {
     ITEMSTACK_DISPLAY,
     FX_SIGNAL,
     TANK_LEVEL_UPDATE,
-    TILE_CONFIGURATION,
 
     // Core Genome
     GENOME_TRACKER_UPDATE,

src/main/java/forestry/core/network/PacketRegistryCore.java

@@ -27,7 +27,6 @@ import forestry.core.network.packets.PacketPipetteClick;
 import forestry.core.network.packets.PacketSocketUpdate;
 import forestry.core.network.packets.PacketSolderingIronClick;
 import forestry.core.network.packets.PacketTankLevelUpdate;
-import forestry.core.network.packets.PacketTileConfiguration;
 import forestry.core.network.packets.PacketTileStream;
 
 public class PacketRegistryCore extends PacketRegistry {
@@ -48,7 +47,6 @@ public class PacketRegistryCore extends PacketRegistry {
         registerClientPacket(new PacketFXSignal());
         registerClientPacket(new PacketTankLevelUpdate());
         registerClientPacket(new PacketGenomeTrackerSync());
-        registerClientPacket(new PacketTileConfiguration());
 
         registerServerPacket(new PacketGuiSelectRequest());
         registerServerPacket(new PacketPipetteClick());

src/main/java/forestry/core/network/packets/PacketTileConfiguration.java

@@ -1,49 +0,0 @@
-package forestry.core.network.packets;
-
-import java.io.IOException;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-
-import forestry.core.network.DataInputStreamForestry;
-import forestry.core.network.DataOutputStreamForestry;
-import forestry.core.network.IForestryPacketClient;
-import forestry.core.network.PacketIdClient;
-import forestry.core.proxy.Proxies;
-import forestry.core.tiles.IConfigurable;
-
-/**
- * Used to sync the tile configuration from Server to Client.
- */
-public class PacketTileConfiguration extends PacketCoordinates implements IForestryPacketClient {
-
-    private TileEntity tileEntity = null;
-
-    public PacketTileConfiguration() {}
-
-    public PacketTileConfiguration(TileEntity tileEntity) {
-        super(tileEntity);
-        this.tileEntity = tileEntity;
-    }
-
-    @Override
-    protected void writeData(DataOutputStreamForestry data) throws IOException {
-        super.writeData(data);
-        if (tileEntity instanceof IConfigurable) {
-            ((IConfigurable) tileEntity).writeConfigurationData(data);
-        }
-    }
-
-    @Override
-    public void onPacketData(DataInputStreamForestry data, EntityPlayer player) throws IOException {
-        TileEntity tile = getTarget(Proxies.common.getRenderWorld());
-        if (tile instanceof IConfigurable) {
-            ((IConfigurable) tile).readConfigurationData(data);
-        }
-    }
-
-    @Override
-    public PacketIdClient getPacketId() {
-        return PacketIdClient.TILE_CONFIGURATION;
-    }
-}

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

@@ -114,18 +114,13 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
         if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
             Point mouse = GuiDraw.getMousePosition();
-            int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
+            Point offset = guiRecipe.getRecipePosition(recipe);
+            Point relMouse = new Point(
+                    mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
+                    mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
 
-            if (recipeIndex >= 0) {
-                Point offset = guiRecipe.getRecipePosition(recipeIndex);
-                Point relMouse = new Point(
-                        mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
-                        mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
-
-                currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
-            }
+            currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
         }
-
         return currenttip;
     }
 
@@ -135,17 +130,12 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
         super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
         Point mouse = GuiDraw.getMousePosition();
-        int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
-
-        if (recipeIndex >= 0) {
-            Point offset = guiRecipe.getRecipePosition(recipeIndex);
-            Point relMouse = new Point(
-                    mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
-                    mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
-
-            currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
-        }
+        Point offset = guiRecipe.getRecipePosition(recipe);
+        Point relMouse = new Point(
+                mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
+                mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
 
+        currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
         return currenttip;
     }
 

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

@@ -14,15 +14,11 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
 
-import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
-
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import forestry.core.proxy.Proxies;
 
-@ThreadSafeISBRH(perThread = false)
 public class RenderBlock implements ISimpleBlockRenderingHandler {
 
-    // Seems to be set during registration - should be fine to not use a concurrent hashmap
     public static final HashMap<TileRendererIndex, IBlockRenderer> byBlockRenderer = new HashMap<>();
 
     @Override

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

@@ -14,11 +14,8 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
-
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
-@ThreadSafeISBRH(perThread = false)
 public abstract class RenderOverlayBlock implements ISimpleBlockRenderingHandler {
 
     protected static final double OVERLAY_SHIFT = 0.001;

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

@@ -51,9 +51,7 @@ public class TextureManager implements ITextureManager {
                 "analyzer/nocturnal", "analyzer/princess", "analyzer/pure_breed", "analyzer/pure_cave",
                 "analyzer/pure_flyer", "analyzer/pure_nocturnal", "analyzer/queen", "particles/swarm_bee",
                 "errors/errored", "errors/unknown", "slots/blocked", "slots/blocked_2", "slots/liquid",
-                "slots/container", "slots/locked", "mail/carrier.player", "mail/carrier.trader",
-                "misc/search_ingredients.internal_inventory", "misc/search_ingredients.player_inventory",
-                "misc/search_ingredients.all_inventories" };
+                "slots/container", "slots/locked", "mail/carrier.player", "mail/carrier.trader" };
         for (String str : defaultIconNames) {
             IIcon icon = registerTex(register, str);
             defaultIcons.put(str, icon);

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

@@ -1,13 +0,0 @@
-package forestry.core.tiles;
-
-import java.io.IOException;
-
-import forestry.core.network.DataInputStreamForestry;
-import forestry.core.network.DataOutputStreamForestry;
-
-public interface IConfigurable {
-
-    void writeConfigurationData(DataOutputStreamForestry data) throws IOException;
-
-    void readConfigurationData(DataInputStreamForestry data) throws IOException;
-}

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

@@ -1,8 +0,0 @@
-package forestry.core.tiles;
-
-public interface IIngredientsSearchController {
-
-    IngredientsStorage getIngredientsStorage();
-
-    void setIngredientsStorage(IngredientsStorage ingredientsStorage);
-}

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

@@ -1,42 +0,0 @@
-package forestry.core.tiles;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-
-import forestry.core.inventory.MergedInventories;
-
-public enum IngredientsStorage {
-
-    INTERNAL_INVENTORY,
-    PLAYER_INVENTORY,
-    ALL_INVENTORIES;
-
-    public static final IngredientsStorage[] VALUES = values();
-
-    public static IngredientsStorage fromInt(int value) {
-        value = value % VALUES.length;
-        if (value < 0) {
-            value += VALUES.length;
-        }
-        return VALUES[value];
-    }
-
-    public IngredientsStorage next() {
-        return fromInt(ordinal() + 1);
-    }
-
-    public IngredientsStorage previous() {
-        return fromInt(ordinal() - 1);
-    }
-
-    public IInventory getInventory(IInventory internal, EntityPlayer player) {
-        switch (this) {
-            case PLAYER_INVENTORY:
-                return player.inventory;
-            case ALL_INVENTORIES:
-                return new MergedInventories(internal, player.inventory);
-            default:
-                return internal;
-        }
-    }
-}

src/main/java/forestry/core/utils/vect/IVect.java

@@ -16,7 +16,7 @@ import forestry.api.farming.FarmDirection;
 /**
  * Represents a position or dimensions.
  */
-public interface IVect extends Comparable<IVect> {
+public interface IVect {
 
     int getX();
 
@@ -43,23 +43,4 @@ public interface IVect extends Comparable<IVect> {
     Vect asImmutable();
 
     MutableVect asMutable();
-
-    // NOTE: All classes implementing this must implement the same hashCode and equals methods as Vect
-    int hashCode();
-
-    boolean equals(Object obj);
-
-    default int compareTo(IVect other) {
-        int x = this.getX() - other.getX();
-        if (x != 0) {
-            return x;
-        }
-
-        int y = this.getY() - other.getY();
-        if (y != 0) {
-            return y;
-        }
-
-        return this.getZ() - other.getZ();
-    }
 }

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

@@ -24,7 +24,6 @@ import forestry.core.gui.slots.SlotCraftMatrix;
 import forestry.core.gui.slots.SlotCrafter;
 import forestry.core.network.packets.PacketGuiSelectRequest;
 import forestry.core.proxy.Proxies;
-import forestry.core.tiles.IngredientsStorage;
 import forestry.core.utils.ItemStackUtil;
 import forestry.core.utils.Log;
 import forestry.factory.inventory.InventoryCraftingForestry;
@@ -208,15 +207,6 @@ public class ContainerWorktable extends ContainerTile<TileWorktable> implements
                 sendPacketToCrafters(new PacketWorktableRecipeUpdate(tile));
                 break;
             }
-            case 200: { // switch ingredients storage
-                tile.setIngredientsStorage(IngredientsStorage.fromInt(secondary));
-                markConfigurationDirty();
-                break;
-            }
         }
     }
-
-    public IngredientsStorage getIngredientsStorage() {
-        return tile.getIngredientsStorage();
-    }
 }

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

@@ -19,12 +19,9 @@ import forestry.core.config.Constants;
 import forestry.core.gui.GuiForestryTitled;
 import forestry.core.gui.buttons.GuiBetterButton;
 import forestry.core.gui.buttons.StandardButtonTextureSets;
-import forestry.core.gui.ledgers.SearchIngregientsLedger;
 import forestry.core.network.packets.PacketGuiSelectRequest;
 import forestry.core.proxy.Proxies;
 import forestry.core.recipes.RecipeUtil;
-import forestry.core.tiles.IIngredientsSearchController;
-import forestry.core.tiles.IngredientsStorage;
 import forestry.core.utils.InventoryUtil;
 import forestry.factory.gui.widgets.ClearWorktable;
 import forestry.factory.gui.widgets.MemorizedRecipeSlot;
@@ -33,16 +30,13 @@ import forestry.factory.recipes.MemorizedRecipe;
 import forestry.factory.recipes.RecipeMemory;
 import forestry.factory.tiles.TileWorktable;
 
-public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWorktable>
-        implements IIngredientsSearchController {
+public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWorktable> {
 
     private static final int SPACING = 18;
     private boolean hasRecipeConflict = false;
-    private final EntityPlayer player;
 
     public GuiWorktable(EntityPlayer player, TileWorktable tile) {
         super(Constants.TEXTURE_PATH_GUI + "/worktable2.png", new ContainerWorktable(player, tile), tile);
-        this.player = player;
 
         ySize = 218;
 
@@ -66,12 +60,6 @@ public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWork
         widgetManager.add(new ClearWorktable(widgetManager, 66, 19));
     }
 
-    @Override
-    protected void addLedgers() {
-        super.addLedgers();
-        ledgerManager.add(new SearchIngregientsLedger(ledgerManager, this));
-    }
-
     @Override
     public void updateScreen() {
         super.updateScreen();
@@ -94,7 +82,7 @@ public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWork
                 .get(54 + InventoryGhostCrafting.SLOT_CRAFTING_RESULT);
 
         if (func_146978_c(itemSlot.xDisplayPosition, itemSlot.yDisplayPosition, 16, 16, mouseX, mouseY)
-                && !inventory.canTakeStack(player, InventoryGhostCrafting.SLOT_CRAFTING_RESULT)) {
+                && !inventory.canTakeStack(InventoryGhostCrafting.SLOT_CRAFTING_RESULT)) {
             final MemorizedRecipe recipe = inventory.getCurrentRecipe();
 
             if (recipe != null) {
@@ -133,14 +121,4 @@ public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWork
         int id = 100 + button.id;
         Proxies.net.sendToServer(new PacketGuiSelectRequest(id, 0));
     }
-
-    @Override
-    public IngredientsStorage getIngredientsStorage() {
-        return container.getIngredientsStorage();
-    }
-
-    @Override
-    public void setIngredientsStorage(IngredientsStorage ingredientsStorage) {
-        Proxies.net.sendToServer(new PacketGuiSelectRequest(200, ingredientsStorage.ordinal()));
-    }
 }

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

@@ -7,7 +7,7 @@ public interface ICrafterWorktable {
 
     ItemStack getResult();
 
-    boolean canTakeStack(EntityPlayer player, int slotIndex);
+    boolean canTakeStack(int slotIndex);
 
     boolean onCraftingStart(EntityPlayer player);
 

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

@@ -24,8 +24,6 @@ import forestry.core.inventory.wrappers.InventoryMapper;
 import forestry.core.network.DataInputStreamForestry;
 import forestry.core.network.DataOutputStreamForestry;
 import forestry.core.recipes.RecipeUtil;
-import forestry.core.tiles.IConfigurable;
-import forestry.core.tiles.IngredientsStorage;
 import forestry.core.tiles.TileBase;
 import forestry.core.utils.InventoryUtil;
 import forestry.core.utils.ItemStackUtil;
@@ -37,14 +35,13 @@ import forestry.factory.inventory.InventoryWorktable;
 import forestry.factory.recipes.MemorizedRecipe;
 import forestry.factory.recipes.RecipeMemory;
 
-public class TileWorktable extends TileBase implements ICrafterWorktable, IConfigurable {
+public class TileWorktable extends TileBase implements ICrafterWorktable {
 
     private final RecipeMemory recipeMemory;
     private final InventoryAdapterTile<?> craftingDisplay;
     private MemorizedRecipe currentRecipe;
     private long savedTick = 0;
     private long savedSystemTimeExpiration = 0;
-    private IngredientsStorage ingredientsStorage = IngredientsStorage.INTERNAL_INVENTORY;
 
     public TileWorktable() {
         super("worktable");
@@ -61,7 +58,6 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
 
         craftingDisplay.writeToNBT(nbttagcompound);
         recipeMemory.writeToNBT(nbttagcompound);
-        nbttagcompound.setInteger("IngredientsStorage", ingredientsStorage.ordinal());
     }
 
     @Override
@@ -70,7 +66,6 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
 
         craftingDisplay.readFromNBT(nbttagcompound);
         recipeMemory.readFromNBT(nbttagcompound);
-        ingredientsStorage = IngredientsStorage.fromInt(nbttagcompound.getInteger("IngredientsStorage"));
     }
 
     /* NETWORK */
@@ -113,20 +108,16 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
         }
     }
 
-    private IInventory getIngredientsInventory(EntityPlayer player) {
-        return ingredientsStorage.getInventory(this, player);
-    }
-
     /* ICrafterWorktable */
     @Override
-    public boolean canTakeStack(EntityPlayer player, int craftingSlotIndex) {
+    public boolean canTakeStack(int craftingSlotIndex) {
         if (craftingSlotIndex == InventoryGhostCrafting.SLOT_CRAFTING_RESULT) {
-            return canCraftCurrentRecipe(player);
+            return canCraftCurrentRecipe();
         }
         return true;
     }
 
-    private boolean canCraftCurrentRecipe(EntityPlayer player) {
+    private boolean canCraftCurrentRecipe() {
         if (currentRecipe == null) {
             return false;
         }
@@ -148,7 +139,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
         }
 
         ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix());
-        ItemStack[] inventory = InventoryUtil.getStacks(getIngredientsInventory(player));
+        ItemStack[] inventory = InventoryUtil.getStacks(this);
         InventoryCraftingForestry crafting = RecipeUtil
                 .getCraftRecipe(recipeItems, inventory, worldObj, currentRecipe.getRecipeOutput());
 
@@ -161,9 +152,8 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
             return false;
         }
 
-        IInventory ingredientsInventory = getIngredientsInventory(player);
         ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix());
-        ItemStack[] inventory = InventoryUtil.getStacks(ingredientsInventory);
+        ItemStack[] inventory = InventoryUtil.getStacks(this);
         InventoryCraftingForestry crafting = RecipeUtil
                 .getCraftRecipe(recipeItems, inventory, worldObj, currentRecipe.getRecipeOutput());
         if (crafting == null) {
@@ -173,8 +163,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
         recipeItems = InventoryUtil.getStacks(crafting);
 
         // craft recipe should exactly match ingredients here, so no oreDict or tool matching
-        ItemStack[] removed = InventoryUtil
-                .removeSets(ingredientsInventory, 1, recipeItems, player, false, false, false);
+        ItemStack[] removed = InventoryUtil.removeSets(this, 1, recipeItems, player, false, false, false);
         if (removed == null) {
             return false;
         }
@@ -186,7 +175,6 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
     @Override
     public void onCraftingComplete(EntityPlayer player) {
         IInventory craftingInventory = getCraftingDisplay();
-        IInventory ingredientsInventory = getIngredientsInventory(player);
         for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) {
             ItemStack itemStack = craftingInventory.getStackInSlot(i);
             if (itemStack == null) {
@@ -214,7 +202,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
                 continue;
             }
 
-            if (!InventoryUtil.tryAddStack(ingredientsInventory, container, true)) {
+            if (!InventoryUtil.tryAddStack(this, container, true)) {
                 player.dropPlayerItemWithRandomChoice(container, false);
             }
         }
@@ -299,14 +287,6 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
         }
     }
 
-    public IngredientsStorage getIngredientsStorage() {
-        return ingredientsStorage;
-    }
-
-    public void setIngredientsStorage(IngredientsStorage ingredientsStorage) {
-        this.ingredientsStorage = ingredientsStorage;
-    }
-
     @Override
     public Object getGui(EntityPlayer player, int data) {
         return new GuiWorktable(player, this);
@@ -316,14 +296,4 @@ public class TileWorktable extends TileBase implements ICrafterWorktable, IConfi
     public Object getContainer(EntityPlayer player, int data) {
         return new ContainerWorktable(player, this);
     }
-
-    @Override
-    public void writeConfigurationData(DataOutputStreamForestry data) throws IOException {
-        data.writeEnum(ingredientsStorage, IngredientsStorage.VALUES);
-    }
-
-    @Override
-    public void readConfigurationData(DataInputStreamForestry data) throws IOException {
-        ingredientsStorage = data.readEnum(IngredientsStorage.VALUES);
-    }
 }

src/main/java/forestry/farming/logic/CropBasicGrowthCraft.java

@@ -42,20 +42,20 @@ public class CropBasicGrowthCraft extends Crop {
 
     @Override
     protected Collection<ItemStack> harvestBlock(IVect pos) {
-        ArrayList<ItemStack> harvest = block.getDrops(world, pos.getX(), pos.getY(), pos.getZ(), meta, 0);
+        ArrayList<ItemStack> harvest = block.getDrops(world, pos.getX(), pos.getZ(), pos.getZ(), meta, 0);
         if (harvest.size() > 1) {
             harvest.remove(0); // Hops have rope as first drop.
         }
-        Proxies.common.addBlockDestroyEffects(world, pos.getX(), pos.getY(), pos.getZ(), block, 0);
+        Proxies.common.addBlockDestroyEffects(world, pos.getX(), pos.getZ(), pos.getZ(), block, 0);
         if (isGrape) {
-            world.setBlockToAir(pos.getX(), pos.getY(), pos.getZ());
+            world.setBlockToAir(pos.getX(), pos.getZ(), pos.getZ());
 
         } else {
-            world.setBlockMetadataWithNotify(pos.getX(), pos.getY(), pos.getZ(), 0, Constants.FLAG_BLOCK_SYNCH);
+            world.setBlockMetadataWithNotify(pos.getX(), pos.getZ(), pos.getZ(), 0, Constants.FLAG_BLOCK_SYNCH);
         }
 
         if (isRice) {
-            world.setBlockMetadataWithNotify(pos.getX(), pos.getY() - 1, pos.getZ(), 7, Constants.FLAG_BLOCK_SYNCH);
+            world.setBlockMetadataWithNotify(pos.getX(), pos.getZ() - 1, pos.getZ(), 7, Constants.FLAG_BLOCK_SYNCH);
         }
 
         return harvest;

src/main/java/forestry/farming/logic/CropRubber.java

@@ -31,8 +31,8 @@ public class CropRubber extends CropBlock {
     protected Collection<ItemStack> harvestBlock(IVect pos) {
         Collection<ItemStack> harvested = new ArrayList<>();
         harvested.add(PluginIC2.resin.copy());
-        Proxies.common.addBlockDestroyEffects(world, pos.getX(), pos.getY(), pos.getZ(), block, 0);
-        world.setBlock(pos.getX(), pos.getY(), pos.getZ(), block, meta + 6, Constants.FLAG_BLOCK_SYNCH);
+        Proxies.common.addBlockDestroyEffects(world, pos.getX(), pos.getZ(), pos.getZ(), block, 0);
+        world.setBlock(pos.getX(), pos.getZ(), pos.getZ(), block, meta + 6, Constants.FLAG_BLOCK_SYNCH);
         return harvested;
     }
 }

src/main/java/forestry/farming/logic/FarmLogicArboreal.java

@@ -176,6 +176,7 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous {
         for (int x = -1; x < 2; x++) {
             for (int y = -1; y < 2; y++) {
                 for (int z = -1; z < 2; z++) {
+                    // Vect candidate = position.add(x, y, z);
                     mutable.set(position).add(x, y, z);
                     if (mutable.equals(position)) {
                         continue;

src/main/java/forestry/farming/logic/FarmLogicCocoa.java

@@ -161,7 +161,7 @@ public class FarmLogicCocoa extends FarmLogic {
 
     private Collection<ICrop> getHarvestBlocks(Vect position) {
 
-        Set<Vect> seen = new HashSet<>();
+        Set<IVect> seen = new HashSet<>();
         Deque<ICrop> crops = new ArrayDeque<>();
 
         // Determine what type we want to harvest.
@@ -195,7 +195,7 @@ public class FarmLogicCocoa extends FarmLogic {
         return crops;
     }
 
-    private ArrayList<Vect> processHarvestBlock(Deque<ICrop> crops, Set<Vect> seen, Vect start, IVect position) {
+    private ArrayList<Vect> processHarvestBlock(Deque<ICrop> crops, Set<IVect> seen, Vect start, IVect position) {
 
         World world = getWorld();
 
@@ -206,6 +206,7 @@ public class FarmLogicCocoa extends FarmLogic {
         for (int i = -1; i < 2; i++) {
             for (int j = 0; j < 2; j++) {
                 for (int k = -1; k < 2; k++) {
+                    // Vect candidate = position.add(i, j, k);
                     mutable.set(position).add(i, j, k);
                     if (mutable.equals(position)) {
                         continue;

src/main/java/forestry/farming/logic/FarmLogicOrchard.java

@@ -147,7 +147,7 @@ public class FarmLogicOrchard extends FarmLogic {
 
     private Collection<ICrop> getHarvestBlocks(Vect position) {
 
-        Set<Vect> seen = new HashSet<>();
+        Set<IVect> seen = new HashSet<>();
         Deque<ICrop> crops = new ArrayDeque<>();
 
         World world = getWorld();
@@ -172,7 +172,7 @@ public class FarmLogicOrchard extends FarmLogic {
         return crops;
     }
 
-    private List<Vect> processHarvestBlock(Deque<ICrop> crops, Set<Vect> seen, IVect start, IVect position) {
+    private List<Vect> processHarvestBlock(Deque<ICrop> crops, Set<IVect> seen, IVect start, IVect position) {
         World world = getWorld();
 
         List<Vect> candidates = new ArrayList<>();

src/main/java/forestry/farming/logic/FarmLogicRubber.java

@@ -29,6 +29,7 @@ import forestry.api.farming.ICrop;
 import forestry.api.farming.IFarmHousing;
 import forestry.core.utils.ItemStackUtil;
 import forestry.core.utils.Log;
+import forestry.core.utils.vect.IVect;
 import forestry.core.utils.vect.MutableVect;
 import forestry.core.utils.vect.Vect;
 import forestry.core.utils.vect.VectUtil;
@@ -124,7 +125,7 @@ public class FarmLogicRubber extends FarmLogic {
 
     private Collection<ICrop> getHarvestBlocks(Vect position) {
 
-        Set<Vect> seen = new HashSet<>();
+        Set<IVect> seen = new HashSet<>();
         Deque<ICrop> crops = new ArrayDeque<>();
 
         World world = getWorld();
@@ -154,14 +155,15 @@ public class FarmLogicRubber extends FarmLogic {
         return crops;
     }
 
-    private ArrayList<Vect> processHarvestBlock(Deque<ICrop> crops, Set<Vect> seen, Vect position) {
+    private ArrayList<Vect> processHarvestBlock(Deque<ICrop> crops, Set<IVect> seen, Vect position) {
         World world = getWorld();
 
         ArrayList<Vect> candidates = new ArrayList<>();
 
         // Get additional candidates to return
-        final MutableVect mutable = position.asMutable();
+        final MutableVect mutable = new MutableVect();
         for (int j = 0; j < 2; j++) {
+            // Vect candidate = new Vect(position.x, position.y + j, position.z);
             mutable.y = position.y + j;
             if (mutable.equals(position)) {
                 continue;

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

@@ -12,13 +12,10 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
 
-import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
-
 import forestry.core.render.RenderOverlayBlock;
 import forestry.farming.blocks.BlockFarm;
 import forestry.plugins.PluginFarming;
 
-@ThreadSafeISBRH(perThread = false)
 public class RenderFarmBlock extends RenderOverlayBlock {
 
     @Override
@@ -44,14 +41,78 @@ public class RenderFarmBlock extends RenderOverlayBlock {
         float adjG = 0.5f;
         float adjB = 0.5f;
 
-        // spotless:off
-        renderBottomFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(0, metadata), mixedBrightness, adjR, adjG, adjB);
-        renderTopFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(1, metadata), mixedBrightness, adjR, adjG, adjB);
-        renderEastFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(2, metadata), mixedBrightness, adjR, adjG, adjB);
-        renderWestFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(3, metadata), mixedBrightness, adjR, adjG, adjB);
-        renderNorthFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(4, metadata), mixedBrightness, adjR, adjG, adjB);
-        renderSouthFace(world, block, x, y, z, renderer, BlockFarm.getOverlayTextureForBlock(5, metadata), mixedBrightness, adjR, adjG, adjB);
-        // spotless:on
+        renderBottomFace(
+                world,
+                block,
+                x,
+                y,
+                z,
+                renderer,
+                BlockFarm.getOverlayTextureForBlock(0, metadata),
+                mixedBrightness,
+                adjR,
+                adjG,
+                adjB);
+        renderTopFace(
+                world,
+                block,
+                x,
+                y,
+                z,
+                renderer,
+                BlockFarm.getOverlayTextureForBlock(1, metadata),
+                mixedBrightness,
+                adjR,
+                adjG,
+                adjB);
+        renderEastFace(
+                world,
+                block,
+                x,
+                y,
+                z,
+                renderer,
+                BlockFarm.getOverlayTextureForBlock(2, metadata),
+                mixedBrightness,
+                adjR,
+                adjG,
+                adjB);
+        renderWestFace(
+                world,
+                block,
+                x,
+                y,
+                z,
+                renderer,
+                BlockFarm.getOverlayTextureForBlock(3, metadata),
+                mixedBrightness,
+                adjR,
+                adjG,
+                adjB);
+        renderNorthFace(
+                world,
+                block,
+                x,
+                y,
+                z,
+                renderer,
+                BlockFarm.getOverlayTextureForBlock(4, metadata),
+                mixedBrightness,
+                adjR,
+                adjG,
+                adjB);
+        renderSouthFace(
+                world,
+                block,
+                x,
+                y,
+                z,
+                renderer,
+                BlockFarm.getOverlayTextureForBlock(5, metadata),
+                mixedBrightness,
+                adjR,
+                adjG,
+                adjB);
     }
 
     @Override

src/main/java/forestry/plugins/PluginLepidopterology.java

@@ -60,7 +60,6 @@ public class PluginLepidopterology extends ForestryPlugin {
     public static int spawnConstraint = 100;
     public static int entityConstraint = 1000;
     private static boolean allowPollination = true;
-    public static boolean disableButterflyLeafSpawns = false;
 
     public static ItemRegistryLepidopterology items;
     public static BlockRegistryLepidopterology blocks;
@@ -113,8 +112,7 @@ public class PluginLepidopterology extends ForestryPlugin {
 
         blocks.lepidopterology.init();
 
-        if (!PluginLepidopterology.disableButterflyLeafSpawns)
-            TreeManager.treeRoot.registerLeafTickHandler(new ButterflySpawner());
+        TreeManager.treeRoot.registerLeafTickHandler(new ButterflySpawner());
 
         RecipeSorter.register(
                 "forestry:lepidopterologymating",
@@ -129,8 +127,6 @@ public class PluginLepidopterology extends ForestryPlugin {
         spawnConstraint = config.getIntLocalized("butterfly.entities", "spawn.limit", spawnConstraint, 0, 500);
         entityConstraint = config.getIntLocalized("butterfly.entities", "maximum", entityConstraint, 0, 5000);
         allowPollination = config.getBooleanLocalized("butterfly.entities", "pollination", allowPollination);
-        disableButterflyLeafSpawns = config
-                .getBooleanLocalized("butterfly.entities", "disable.leaf.spawns", disableButterflyLeafSpawns);
 
         config.save();
     }

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

@@ -96,7 +96,6 @@ public class PluginStorage extends ForestryPlugin {
     private final ArrayList<ItemStack> hunterItems = new ArrayList<>();
     private final ArrayList<ItemStack> adventurerItems = new ArrayList<>();
     private final ArrayList<ItemStack> builderItems = new ArrayList<>();
-    private final ArrayList<ItemStack> coinItems = new ArrayList<>();
 
     public static ItemRegistryStorage items;
 
@@ -109,7 +108,7 @@ public class PluginStorage extends ForestryPlugin {
 
         BackpackManager.backpackInterface = new BackpackInterface();
 
-        BackpackManager.backpackItems = new ArrayList[7];
+        BackpackManager.backpackItems = new ArrayList[6];
 
         BackpackManager.backpackItems[0] = minerItems;
         BackpackManager.backpackItems[1] = diggerItems;
@@ -117,7 +116,6 @@ public class PluginStorage extends ForestryPlugin {
         BackpackManager.backpackItems[3] = hunterItems;
         BackpackManager.backpackItems[4] = adventurerItems;
         BackpackManager.backpackItems[5] = builderItems;
-        BackpackManager.backpackItems[6] = coinItems;
 
         BackpackDefinition definition;
 
@@ -148,22 +146,18 @@ public class PluginStorage extends ForestryPlugin {
 
         definition = new BackpackDefinition("builder", new Color(0xdd3a3a).getRGB());
         BackpackManager.definitions.put(definition.getKey(), definition);
-
-        definition = new BackpackDefinition("coin", new Color(0xffd700).getRGB());
-        BackpackManager.definitions.put(definition.getKey(), definition);
     }
 
     @Override
     @SuppressWarnings({ "unchecked" })
     protected void disabledSetupAPI() {
-        BackpackManager.backpackItems = new ArrayList[7];
+        BackpackManager.backpackItems = new ArrayList[6];
         BackpackManager.backpackItems[0] = minerItems;
         BackpackManager.backpackItems[1] = diggerItems;
         BackpackManager.backpackItems[2] = foresterItems;
         BackpackManager.backpackItems[3] = hunterItems;
         BackpackManager.backpackItems[4] = adventurerItems;
         BackpackManager.backpackItems[5] = builderItems;
-        BackpackManager.backpackItems[6] = coinItems;
     }
 
     @Override
@@ -188,7 +182,6 @@ public class PluginStorage extends ForestryPlugin {
         handleBackpackConfig(config, "hunter");
         handleBackpackConfig(config, "adventurer");
         handleBackpackConfig(config, "builder");
-        handleBackpackConfig(config, "coin");
 
         config.save();
 
@@ -226,7 +219,6 @@ public class PluginStorage extends ForestryPlugin {
         final BackpackDefinition adventurer = (BackpackDefinition) BackpackManager.definitions.get("adventurer");
         final BackpackDefinition builder = (BackpackDefinition) BackpackManager.definitions.get("builder");
         final BackpackDefinition hunter = (BackpackDefinition) BackpackManager.definitions.get("hunter");
-        final BackpackDefinition coin = (BackpackDefinition) BackpackManager.definitions.get("coin");
 
         miner.addValidItems(minerItems);
         digger.addValidItems(diggerItems);
@@ -234,7 +226,6 @@ public class PluginStorage extends ForestryPlugin {
         hunter.addValidItems(hunterItems);
         adventurer.addValidItems(adventurerItems);
         builder.addValidItems(builderItems);
-        coin.addValidItems(coinItems);
 
         final Pattern minerOreDictPattern = Pattern
                 .compile("(ore|dust|gem|ingot|nugget|crushed|cluster|denseore)[A-Z].*");
@@ -530,7 +521,6 @@ public class PluginStorage extends ForestryPlugin {
         addBackpackRecipe(items.hunterBackpack, Items.feather);
         addBackpackRecipe(items.adventurerBackpack, Items.bone);
         addBackpackRecipe(items.builderBackpack, Items.clay_ball);
-        addBackpackRecipe(items.coinBackpack, "ingotGold");
 
         // / CARPENTER
         if (PluginManager.Module.FACTORY.isEnabled()) {
@@ -553,7 +543,6 @@ public class PluginStorage extends ForestryPlugin {
             addT2BackpackRecipe(items.hunterBackpack, items.hunterBackpackT2);
             addT2BackpackRecipe(items.adventurerBackpack, items.adventurerBackpackT2);
             addT2BackpackRecipe(items.builderBackpack, items.builderBackpackT2);
-            addT2BackpackRecipe(items.coinBackpack, items.coinBackpackT2);
         }
     }
 

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

@@ -148,7 +148,7 @@ public class PluginHarvestCraft extends ForestryPlugin {
                 );
 
         ImmutableList.Builder<String> genericCropsBuilder = ImmutableList.builder();
-        genericCropsBuilder.add("cotton", "rice", "tealeaf", "coffeebean", "candleberry");
+        genericCropsBuilder.add("cotton", "rice", "tea", "coffee", "candleberry");
         genericCropsBuilder.addAll(herbs);
         genericCropsBuilder.addAll(spices);
 
@@ -281,14 +281,7 @@ public class PluginHarvestCraft extends ForestryPlugin {
         }
 
         for (String cropName : genericCrops) {
-            String seedName = cropName;
-            // Pam's Tea and Coffee have inconsistent Crop/Seed names, unlike other Pam's crops
-            if (seedName.equals("tealeaf")) {
-                seedName = "tea";
-            } else if (seedName.equals("coffeebean")) {
-                seedName = "coffee";
-            }
-            ItemStack genericCropSeed = GameRegistry.findItemStack(HC, seedName + "seedItem", 1);
+            ItemStack genericCropSeed = GameRegistry.findItemStack(HC, cropName + "seedItem", 1);
             Block genericCropBlock = GameRegistry.findBlock(HC, "pam" + cropName + "Crop");
             if (genericCropSeed != null) {
                 RecipeManagers.squeezerManager

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

@@ -37,8 +37,6 @@ public class ItemRegistryStorage extends ItemRegistry {
     public final Item adventurerBackpackT2;
     public final Item builderBackpack;
     public final Item builderBackpackT2;
-    public final Item coinBackpack;
-    public final Item coinBackpackT2;
 
     public ItemRegistryStorage() {
         // CRATE
@@ -115,13 +113,5 @@ public class ItemRegistryStorage extends ItemRegistry {
         builderBackpackT2 = registerItem(
                 BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T2),
                 "builderBagT2");
-
-        definition = BackpackManager.definitions.get("coin");
-        coinBackpack = registerItem(
-                BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T1),
-                "coinBag");
-        coinBackpackT2 = registerItem(
-                BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T2),
-                "coinBagT2");
     }
 }

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

@@ -243,11 +243,6 @@ for.gui.noeffect=No effect
 for.gui.owner=Owner
 for.gui.page=Page
 
-for.gui.search_ingredients=Search Items
-for.gui.search_ingredients.internal_inventory=Internal Inventory
-for.gui.search_ingredients.player_inventory=Player Inventory
-for.gui.search_ingredients.all_inventories=All Inventories
-
 for.gui.pipe.filter.anything=Anything
 for.gui.pipe.filter.bee=Any Bees
 for.gui.pipe.filter.cave=Cave-Dwellers
@@ -475,9 +470,6 @@ item.for.adventurerBagT2.name=Adventurer's Woven Backpack
 item.for.ambrosia.name=Ambrosia
 item.for.apatite.name=Apatite
 
-item.for.coinBag.name=Coiner's Backpack
-item.for.coinBagT2.name=Coiner's Woven Backpack
-
 item.for.apiaristBag.name=Apiarist's Backpack
 item.for.apiaristBoots.name=Apiarist's Shoes
 item.for.apiaristChest.name=Apiarist's Shirt
@@ -1692,8 +1684,6 @@ for.config.butterfly.entities.maximum=Butterfly Maximum
 for.config.butterfly.entities.maximum.comment=New butterflies will stay in item form and will not take flight once this limit is reached.
 for.config.butterfly.entities.pollination=Butterfly Pollination
 for.config.butterfly.entities.pollination.comment=Allow butterflies to pollinate leaves.
-for.config.butterfly.entities.disable.leaf.spawns=Disable Butterfly Leaf Spawns
-for.config.butterfly.entities.disable.leaf.spawns.comment=Prevent random butterflies from autonomously spawning from Forestry leaves.
 
 for.config.backpacks.item.stacks.format=Add itemStacks for the %s's backpack here in the format 'modid:name:meta'. For wildcard metadata the format is 'modid:name'.
 for.config.backpacks.ore.dict.format=Add ore dictionary names for the %s's backpack here in the format 'oreDictName'.

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

@@ -241,11 +241,6 @@ for.gui.noeffect=Нет эффекта
 for.gui.owner=Владелец
 for.gui.page=Страница
 
-for.gui.search_ingredients=Искать предметы
-for.gui.search_ingredients.internal_inventory=Встроенный инвентарь
-for.gui.search_ingredients.player_inventory=Инвентарь игрока
-for.gui.search_ingredients.all_inventories=Все инвентари
-
 for.gui.pipe.filter.anything=Всё
 for.gui.pipe.filter.bee=Любые пчелы
 for.gui.pipe.filter.cave=Пещерные

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

@@ -45,7 +45,3 @@ ledger.farm.background=2ca22c
 ledger.farm.header=e1c92f
 ledger.farm.subheader=aaafb8
 ledger.farm.text=000000
-
-ledger.search_ingredients.background=ffffff
-ledger.search_ingredients.header=587b96
-ledger.search_ingredients.text=000000