diff --git a/gradle.properties b/gradle.properties index c892b980f..5e7abb5c9 100755 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ ic2_version=2.8.17-ex112 version_major=5 version_minor=5 -version_patch=0 +version_patch=1 diff --git a/src/main/java/forestry/api/apiculture/IHiveFrame.java b/src/main/java/forestry/api/apiculture/IHiveFrame.java index d6266cf84..5cf7fdf25 100644 --- a/src/main/java/forestry/api/apiculture/IHiveFrame.java +++ b/src/main/java/forestry/api/apiculture/IHiveFrame.java @@ -20,5 +20,18 @@ public interface IHiveFrame { */ ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear); + /** + * @param frame ItemStack containing the actual frame. + * @return the {@link IBeeModifier} for this frame. + * @since Forestry 5.5.1 + */ + default IBeeModifier getBeeModifier(ItemStack frame) { + return getBeeModifier(); + } + + /** + * @deprecated since Forestry 5.5.1. Use {@link #getBeeModifier(ItemStack)} + */ + @Deprecated IBeeModifier getBeeModifier(); } diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java index eb8cc7006..22540a11e 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java @@ -33,6 +33,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import net.minecraft.util.Tuple; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -89,8 +90,11 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement beeModifiers.add(beeModifier); - for (IHiveFrame frame : inventory.getFrames()) { - beeModifiers.add(frame.getBeeModifier()); + for (Tuple frame : inventory.getFrames()) { + IHiveFrame hiveFrame = frame.getFirst(); + ItemStack stack = frame.getSecond(); + IBeeModifier beeModifier = hiveFrame.getBeeModifier(stack); + beeModifiers.add(beeModifier); } return beeModifiers; diff --git a/src/main/java/forestry/apiculture/inventory/InventoryApiary.java b/src/main/java/forestry/apiculture/inventory/InventoryApiary.java index a0947685e..181869b2e 100644 --- a/src/main/java/forestry/apiculture/inventory/InventoryApiary.java +++ b/src/main/java/forestry/apiculture/inventory/InventoryApiary.java @@ -22,6 +22,7 @@ import forestry.apiculture.InventoryBeeHousing; import forestry.core.utils.SlotUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.Tuple; public class InventoryApiary extends InventoryBeeHousing implements IApiaryInventory { public static final int SLOT_FRAMES_1 = 9; @@ -47,14 +48,15 @@ public class InventoryApiary extends InventoryBeeHousing implements IApiaryInven super.isItemValidForSlot(slotIndex, itemStack); } - public Collection getFrames() { - Collection hiveFrames = new ArrayList<>(SLOT_FRAMES_COUNT); + public Collection> getFrames() { + Collection> hiveFrames = new ArrayList<>(SLOT_FRAMES_COUNT); for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { ItemStack stackInSlot = getStackInSlot(i); Item itemInSlot = stackInSlot.getItem(); if (itemInSlot instanceof IHiveFrame) { - hiveFrames.add((IHiveFrame) itemInSlot); + IHiveFrame frame = (IHiveFrame) itemInSlot; + hiveFrames.add(new Tuple<>(frame, stackInSlot.copy())); } } diff --git a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java index c88089b3b..2639ac273 100755 --- a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java +++ b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java @@ -52,6 +52,11 @@ public class ItemHiveFrame extends ItemForestry implements IHiveFrame { } } + @Override + public IBeeModifier getBeeModifier(ItemStack frame) { + return beeModifier; + } + @Override public IBeeModifier getBeeModifier() { return beeModifier; diff --git a/src/main/java/forestry/apiculture/tiles/TileApiary.java b/src/main/java/forestry/apiculture/tiles/TileApiary.java index 57a5b9882..7b6ef2834 100644 --- a/src/main/java/forestry/apiculture/tiles/TileApiary.java +++ b/src/main/java/forestry/apiculture/tiles/TileApiary.java @@ -29,6 +29,8 @@ import forestry.apiculture.inventory.InventoryApiary; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Tuple; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -58,8 +60,11 @@ public class TileApiary extends TileBeeHousingBase implements IApiary { beeModifiers.add(beeModifier); - for (IHiveFrame frame : inventory.getFrames()) { - beeModifiers.add(frame.getBeeModifier()); + for (Tuple frame : inventory.getFrames()) { + IHiveFrame hiveFrame = frame.getFirst(); + ItemStack stack = frame.getSecond(); + IBeeModifier beeModifier = hiveFrame.getBeeModifier(stack); + beeModifiers.add(beeModifier); } return beeModifiers;