Merge remote-tracking branch 'DarkShadow44/alveary' into dev

dependencies.gradle

@@ -2,10 +2,10 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta51:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.66-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta62:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.21-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly('curse.maven:craftguide-75557:2459320')
 }

gradle.properties

@@ -96,7 +96,9 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!

settings.gradle

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

src/main/java/forestry/apiculture/InventoryBeeHousing.java

@@ -8,7 +8,10 @@
  ******************************************************************************/
 package forestry.apiculture;
 
+import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.World;
 
 import forestry.api.apiculture.BeeManager;
 import forestry.api.apiculture.EnumBeeType;
@@ -73,4 +76,27 @@ public class InventoryBeeHousing extends InventoryAdapterRestricted implements I
     public final boolean addProduct(ItemStack product, boolean all) {
         return InventoryUtil.tryAddStack(this, product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true);
     }
+
+    public void dumpInventoryIntoWorld(World world, ChunkCoordinates coordinates) {
+        if (world.isRemote) {
+            return;
+        }
+        for (int i = 0; i < SLOT_PRODUCT_COUNT; i++) {
+            ItemStack stack = getStackInSlot(i);
+            if (stack == null) {
+                continue;
+            }
+            setInventorySlotContents(i, null);
+
+            EntityItem entityitem = new EntityItem(
+                    world,
+                    coordinates.posX + 0.5,
+                    coordinates.posY + 0.5,
+                    coordinates.posZ + 0.5,
+                    stack);
+            entityitem.delayBeforeCanPickup = 10;
+            world.spawnEntityInWorld(entityitem);
+        }
+
+    }
 }

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

@@ -159,6 +159,8 @@ public class AlvearyController extends RectangularMultiblockControllerBase
                 activeComponents.remove(oldPart);
             }
         }
+
+        inventory.dumpInventoryIntoWorld(this.worldObj, oldPart.getCoordinates());
     }
 
     @Override

src/main/java/forestry/core/config/Config.java

@@ -137,6 +137,7 @@ public class Config {
     public static boolean enableHints = true;
     public static final LinkedListMultimap<String, String> hints = LinkedListMultimap.create();
     public static boolean enableEnergyStat = true;
+    public static boolean showBackpackDurability = true;
 
     public static boolean isStructureEnabled(String uid) {
         return !Config.disabledStructures.contains(uid);
@@ -301,6 +302,9 @@ public class Config {
         configCommon.moveProperty("tweaks.gui", "mail.alert", "tweaks.gui.mail.alert");
         configCommon.renameProperty("tweaks.gui.mail.alert", "mail.alert", "enabled");
 
+        showBackpackDurability = configCommon
+                .getBooleanLocalized("tweaks.gui", "showBackpackDurability", showBackpackDurability);
+
         mailAlertEnabled = configCommon.getBooleanLocalized("tweaks.gui.mail.alert", "enabled", mailAlertEnabled);
         mailAlertXPosition = configCommon.getEnumLocalized(
                 "tweaks.gui.mail.alert",

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

@@ -348,4 +348,17 @@ public class ItemBackpack extends ItemWithGui {
                 return null;
         }
     }
+
+    @Override
+    public double getDurabilityForDisplay(final ItemStack stack) {
+        final int occupied = ItemInventory.getOccupiedSlotCount(stack);
+        final int max = getBackpackSize();
+
+        return 1.0d - (occupied + 1.0d) / (max + 1.0d);
+    }
+
+    @Override
+    public boolean showDurabilityBar(final ItemStack stack) {
+        return Config.showBackpackDurability && ItemInventory.getOccupiedSlotCount(stack) > 0;
+    }
 }

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

@@ -1781,6 +1781,7 @@ for.config.crafting.stamps.disabled.comment=Disables the crafting recipe for cer
 
 for.config.tweaks=Tweaks
 
+for.config.tweaks.gui.showBackpackDurability=Shows a durability bar on backpacks indicating how full they are.
 for.config.tweaks.gui.mail.alert.enabled=Mail Alert
 for.config.tweaks.gui.mail.alert.enabled.comment=Enables the new mail alert box.
 for.config.tweaks.gui.mail.alert.xPosition=Horizontal Position