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

* Change up how the radioactive bee works to make it a bit more reasonable.

* Remove debug code

* Fix the range of bees being off by one block. nextInt is [0,n), so we need to do n+1 to get our boundary included.

* Remove unnecessary check, fix alveary block under not using correct y and unprotect other blocks under. Also fix canMineBlock being the wrong way round.

* Fix under block protection for non-alvearies

* spotlessApply (#73)

Co-authored-by: GitHub GTNH Actions <>

* Fix condition

---------

Co-authored-by: GTNH-Colen <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

dependencies.gradle

@@ -2,8 +2,8 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha42:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha52:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.8-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/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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/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 '1.0.22'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
 }
 
 

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

@@ -49,8 +49,8 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom {
         IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
         IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier();
 
-        processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance);
-        processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance);
+        processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, 1.0F);
+        processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, 1.0F);
 
         return processedChance;
     }

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

@@ -21,7 +21,7 @@ import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
-import forestry.apiculture.blocks.BlockAlveary;
+import forestry.apiculture.multiblock.AlvearyController;
 import forestry.core.utils.DamageSourceForestry;
 import forestry.core.utils.vect.Vect;
 
@@ -36,8 +36,13 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
     @Override
     public IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
         harmEntities(genome, housing);
+        if (isMobGriefingEnabled(housing)) destroyEnvironment(genome, housing);
 
-        return destroyEnvironment(genome, storedData, housing);
+        return storedData;
+    }
+
+    private boolean isMobGriefingEnabled(IBeeHousing housing) {
+        return housing.getWorld().getGameRules().getGameRuleBooleanValue("mobGriefing");
     }
 
     private void harmEntities(IBeeGenome genome, IBeeHousing housing) {
@@ -56,7 +61,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
         }
     }
 
-    private static IEffectData destroyEnvironment(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
+    private static void destroyEnvironment(IBeeGenome genome, IBeeHousing housing) {
         World world = housing.getWorld();
         Random rand = world.rand;
 
@@ -65,43 +70,69 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
         Vect offset = area.multiply(-1 / 2.0f);
         Vect posHousing = new Vect(housing.getCoordinates());
 
+        boolean isAlveary = housing instanceof AlvearyController;
+
         for (int i = 0; i < 20; i++) {
             Vect randomPos = Vect.getRandomPositionInArea(rand, area);
-            Vect posBlock = randomPos.add(posHousing);
-            posBlock = posBlock.add(offset);
+            Vect posBlock = randomPos.add(posHousing).add(offset);
 
-            if (posBlock.y <= 1 || posBlock.y >= housing.getWorld().getActualHeight()) {
+            // Don't destroy blocks in the protected 3x3x4 area if housing is an Alveary.
+            // Stops the bee destroying itself. Silly behaviour.
+            if (isInAlvearyProtectedArea(posHousing, posBlock)) {
                 continue;
             }
 
-            // Don't destroy ourselves or blocks below us.
-            if (posBlock.x == posHousing.x && posBlock.z == posHousing.z && posBlock.y <= posHousing.y) {
-                continue;
-            }
-
-            if (world.isAirBlock(posBlock.x, posBlock.y, posBlock.z)) {
-                continue;
+            // Don't destroy the block directly below the bee.
+            if (isAlveary) {
+                if (posBlock.y == posHousing.y - 3) {
+                    continue;
+                }
+            } else {
+                if (posBlock.y == posHousing.y - 1) {
+                    continue;
+                }
             }
 
             Block block = world.getBlock(posBlock.x, posBlock.y, posBlock.z);
 
-            if (block instanceof BlockAlveary) {
-                continue;
-            }
-
+            // Never delete a tile entity. Allows far too much griefing and abuse otherwise.
             TileEntity tile = world.getTileEntity(posBlock.x, posBlock.y, posBlock.z);
-            if (tile instanceof IBeeHousing) {
+            if (tile != null) {
                 continue;
             }
 
+            // Don't let us delete blocks that are not supposed to be breakable by players.
             if (block.getBlockHardness(world, posBlock.x, posBlock.y, posBlock.z) < 0) {
                 continue;
             }
 
+            // Some mods might use this logic? Idk, just a safety check. Might stop griefing.
+            if (!world.canMineBlock(
+                    housing.getWorld().func_152378_a(housing.getOwner().getId()),
+                    posHousing.x,
+                    posHousing.y,
+                    posHousing.z)) {
+                continue;
+            }
+
             world.setBlockToAir(posBlock.x, posBlock.y, posBlock.z);
             break;
         }
+    }
 
-        return storedData;
+    private static boolean isInAlvearyProtectedArea(Vect posHousing, Vect posBlock) {
+        // Alveary protection area is a 3x3x4 area centered on the top middle, down one block.
+        int startX = posHousing.x - 1;
+        int endX = posHousing.x + 1;
+        int startZ = posHousing.z - 1;
+        int endZ = posHousing.z + 1;
+        int startY = posHousing.y - 2;
+        int endY = posHousing.y + 1;
+
+        return posBlock.x >= startX && posBlock.x <= endX
+                && posBlock.z >= startZ
+                && posBlock.z <= endZ
+                && posBlock.y >= startY
+                && posBlock.y <= endY;
     }
 }

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

@@ -25,6 +25,8 @@ 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;
@@ -34,6 +36,7 @@ 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;
@@ -43,6 +46,10 @@ 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) {
@@ -128,6 +135,15 @@ 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,6 +138,10 @@ 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,29 +159,28 @@ 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;
+        }
 
-        if (mouseButton == 0) {
+        // Default action only if the mouse click was not handled by the
+        // ledger itself.
+        if (!ledger.handleMouseClicked(x, y, mouseButton)) {
 
-            Ledger ledger = this.getAtPosition(x, y);
-
-            // 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();
+            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();
         }
     }
 

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

@@ -0,0 +1,78 @@
+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,12 +20,14 @@ 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
@@ -39,7 +41,7 @@ public class SlotCrafter extends SlotCrafting {
 
     @Override
     public boolean canTakeStack(EntityPlayer player) {
-        return crafter.canTakeStack(getSlotIndex());
+        return crafter.canTakeStack(player, getSlotIndex());
     }
 
     @Override
@@ -49,7 +51,7 @@ public class SlotCrafter extends SlotCrafting {
 
     @Override
     public boolean getHasStack() {
-        return getStack() != null && crafter.canTakeStack(getSlotIndex());
+        return getStack() != null && crafter.canTakeStack(player, getSlotIndex());
     }
 
     @Override

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

@@ -0,0 +1,100 @@
+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,6 +32,7 @@ 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,6 +27,7 @@ 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 {
@@ -47,6 +48,7 @@ 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

@@ -0,0 +1,49 @@
+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/render/TextureManager.java

@@ -51,7 +51,9 @@ 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" };
+                "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" };
         for (String str : defaultIconNames) {
             IIcon icon = registerTex(register, str);
             defaultIcons.put(str, icon);

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

@@ -0,0 +1,13 @@
+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

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

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

@@ -0,0 +1,42 @@
+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/Vect.java

@@ -73,9 +73,9 @@ public class Vect implements IVect {
     }
 
     public static Vect getRandomPositionInArea(Random random, IVect area) {
-        int x = random.nextInt(area.getX());
-        int y = random.nextInt(area.getY());
-        int z = random.nextInt(area.getZ());
+        int x = random.nextInt(area.getX() + 1);
+        int y = random.nextInt(area.getY() + 1);
+        int z = random.nextInt(area.getZ() + 1);
         return new Vect(x, y, z);
     }
 

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

@@ -24,6 +24,7 @@ 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;
@@ -207,6 +208,15 @@ 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,9 +19,12 @@ 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;
@@ -30,13 +33,16 @@ import forestry.factory.recipes.MemorizedRecipe;
 import forestry.factory.recipes.RecipeMemory;
 import forestry.factory.tiles.TileWorktable;
 
-public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWorktable> {
+public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWorktable>
+        implements IIngredientsSearchController {
 
     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;
 
@@ -60,6 +66,12 @@ 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();
@@ -82,7 +94,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(InventoryGhostCrafting.SLOT_CRAFTING_RESULT)) {
+                && !inventory.canTakeStack(player, InventoryGhostCrafting.SLOT_CRAFTING_RESULT)) {
             final MemorizedRecipe recipe = inventory.getCurrentRecipe();
 
             if (recipe != null) {
@@ -121,4 +133,14 @@ 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(int slotIndex);
+    boolean canTakeStack(EntityPlayer player, int slotIndex);
 
     boolean onCraftingStart(EntityPlayer player);
 

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

@@ -24,6 +24,8 @@ 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;
@@ -35,13 +37,14 @@ import forestry.factory.inventory.InventoryWorktable;
 import forestry.factory.recipes.MemorizedRecipe;
 import forestry.factory.recipes.RecipeMemory;
 
-public class TileWorktable extends TileBase implements ICrafterWorktable {
+public class TileWorktable extends TileBase implements ICrafterWorktable, IConfigurable {
 
     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");
@@ -58,6 +61,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
 
         craftingDisplay.writeToNBT(nbttagcompound);
         recipeMemory.writeToNBT(nbttagcompound);
+        nbttagcompound.setInteger("IngredientsStorage", ingredientsStorage.ordinal());
     }
 
     @Override
@@ -66,6 +70,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
 
         craftingDisplay.readFromNBT(nbttagcompound);
         recipeMemory.readFromNBT(nbttagcompound);
+        ingredientsStorage = IngredientsStorage.fromInt(nbttagcompound.getInteger("IngredientsStorage"));
     }
 
     /* NETWORK */
@@ -108,16 +113,20 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
         }
     }
 
+    private IInventory getIngredientsInventory(EntityPlayer player) {
+        return ingredientsStorage.getInventory(this, player);
+    }
+
     /* ICrafterWorktable */
     @Override
-    public boolean canTakeStack(int craftingSlotIndex) {
+    public boolean canTakeStack(EntityPlayer player, int craftingSlotIndex) {
         if (craftingSlotIndex == InventoryGhostCrafting.SLOT_CRAFTING_RESULT) {
-            return canCraftCurrentRecipe();
+            return canCraftCurrentRecipe(player);
         }
         return true;
     }
 
-    private boolean canCraftCurrentRecipe() {
+    private boolean canCraftCurrentRecipe(EntityPlayer player) {
         if (currentRecipe == null) {
             return false;
         }
@@ -139,7 +148,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
         }
 
         ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix());
-        ItemStack[] inventory = InventoryUtil.getStacks(this);
+        ItemStack[] inventory = InventoryUtil.getStacks(getIngredientsInventory(player));
         InventoryCraftingForestry crafting = RecipeUtil
                 .getCraftRecipe(recipeItems, inventory, worldObj, currentRecipe.getRecipeOutput());
 
@@ -152,8 +161,9 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
             return false;
         }
 
+        IInventory ingredientsInventory = getIngredientsInventory(player);
         ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix());
-        ItemStack[] inventory = InventoryUtil.getStacks(this);
+        ItemStack[] inventory = InventoryUtil.getStacks(ingredientsInventory);
         InventoryCraftingForestry crafting = RecipeUtil
                 .getCraftRecipe(recipeItems, inventory, worldObj, currentRecipe.getRecipeOutput());
         if (crafting == null) {
@@ -163,7 +173,8 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
         recipeItems = InventoryUtil.getStacks(crafting);
 
         // craft recipe should exactly match ingredients here, so no oreDict or tool matching
-        ItemStack[] removed = InventoryUtil.removeSets(this, 1, recipeItems, player, false, false, false);
+        ItemStack[] removed = InventoryUtil
+                .removeSets(ingredientsInventory, 1, recipeItems, player, false, false, false);
         if (removed == null) {
             return false;
         }
@@ -175,6 +186,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
     @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) {
@@ -202,7 +214,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
                 continue;
             }
 
-            if (!InventoryUtil.tryAddStack(this, container, true)) {
+            if (!InventoryUtil.tryAddStack(ingredientsInventory, container, true)) {
                 player.dropPlayerItemWithRandomChoice(container, false);
             }
         }
@@ -287,6 +299,14 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
         }
     }
 
+    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);
@@ -296,4 +316,14 @@ public class TileWorktable extends TileBase implements ICrafterWorktable {
     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/plugins/PluginStorage.java

@@ -96,6 +96,7 @@ 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;
 
@@ -108,7 +109,7 @@ public class PluginStorage extends ForestryPlugin {
 
         BackpackManager.backpackInterface = new BackpackInterface();
 
-        BackpackManager.backpackItems = new ArrayList[6];
+        BackpackManager.backpackItems = new ArrayList[7];
 
         BackpackManager.backpackItems[0] = minerItems;
         BackpackManager.backpackItems[1] = diggerItems;
@@ -116,6 +117,7 @@ public class PluginStorage extends ForestryPlugin {
         BackpackManager.backpackItems[3] = hunterItems;
         BackpackManager.backpackItems[4] = adventurerItems;
         BackpackManager.backpackItems[5] = builderItems;
+        BackpackManager.backpackItems[6] = coinItems;
 
         BackpackDefinition definition;
 
@@ -146,18 +148,22 @@ 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[6];
+        BackpackManager.backpackItems = new ArrayList[7];
         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
@@ -182,6 +188,7 @@ public class PluginStorage extends ForestryPlugin {
         handleBackpackConfig(config, "hunter");
         handleBackpackConfig(config, "adventurer");
         handleBackpackConfig(config, "builder");
+        handleBackpackConfig(config, "coin");
 
         config.save();
 
@@ -219,6 +226,7 @@ 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);
@@ -226,6 +234,7 @@ 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].*");
@@ -521,6 +530,7 @@ 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()) {
@@ -543,6 +553,7 @@ 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/storage/BackpackDefinition.java

@@ -192,14 +192,24 @@ public class BackpackDefinition implements IBackpackDefinition {
         int[] oreIds = OreDictionary.getOreIDs(itemStack);
         for (int oreId : oreIds) {
             if (validOreIds.contains(oreId)) {
-                validItemStacks.add(itemStackStringWild);
+                if (meta != OreDictionary.WILDCARD_VALUE) {
+                    String itemStackString = itemStackStringWild + ':' + meta;
+                    validItemStacks.add(itemStackString);
+                } else {
+                    validItemStacks.add(itemStackStringWild);
+                }
                 return true;
             }
         }
 
         for (Class<?> itemClass : validItemClasses) {
             if (itemClass.isInstance(item)) {
-                validItemStacks.add(itemStackStringWild);
+                if (meta != OreDictionary.WILDCARD_VALUE) {
+                    String itemStackString = itemStackStringWild + ':' + meta;
+                    validItemStacks.add(itemStackString);
+                } else {
+                    validItemStacks.add(itemStackStringWild);
+                }
                 return true;
             }
         }
@@ -208,7 +218,12 @@ public class BackpackDefinition implements IBackpackDefinition {
         if (block != null) {
             for (Class<?> blockClass : validBlockClasses) {
                 if (blockClass.isInstance(block)) {
-                    validItemStacks.add(itemStackStringWild);
+                    if (meta != OreDictionary.WILDCARD_VALUE) {
+                        String itemStackString = itemStackStringWild + ':' + meta;
+                        validItemStacks.add(itemStackString);
+                    } else {
+                        validItemStacks.add(itemStackStringWild);
+                    }
                     return true;
                 }
             }

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

@@ -37,6 +37,8 @@ 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
@@ -113,5 +115,13 @@ 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,6 +243,11 @@ 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
@@ -470,6 +475,9 @@ 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

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

@@ -241,6 +241,11 @@ 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,3 +45,7 @@ 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