diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 41ecd5575..9445ab113 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -64,6 +64,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple private final Set beeListeners = new HashSet(); private final Set climatisers = new HashSet(); private final Set activeComponents = new HashSet(); + private final Set allComponents = new HashSet(); // CLIENT private int breedingProgressPercent = 0; @@ -101,6 +102,11 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple return beeModifiers; } + @Override + public Iterable getComponents() { + return allComponents; + } + @Override public void onAttachedPartWithMultiblockData(IMultiblockPart part, NBTTagCompound data) { this.readFromNBT(data); @@ -108,47 +114,55 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override protected void onBlockAdded(IMultiblockPart newPart) { - if (newPart instanceof IAlvearyComponent.BeeModifier) { - IAlvearyComponent.BeeModifier alvearyBeeModifier = (IAlvearyComponent.BeeModifier) newPart; - IBeeModifier beeModifier = alvearyBeeModifier.getBeeModifier(); - beeModifiers.add(beeModifier); - } + if (newPart instanceof IAlvearyComponent) { + allComponents.add((IAlvearyComponent) newPart); - if (newPart instanceof IAlvearyComponent.BeeListener) { - IAlvearyComponent.BeeListener beeListenerSource = (IAlvearyComponent.BeeListener) newPart; - IBeeListener beeListener = beeListenerSource.getBeeListener(); - beeListeners.add(beeListener); - } + if (newPart instanceof IAlvearyComponent.BeeModifier) { + IAlvearyComponent.BeeModifier alvearyBeeModifier = (IAlvearyComponent.BeeModifier) newPart; + IBeeModifier beeModifier = alvearyBeeModifier.getBeeModifier(); + beeModifiers.add(beeModifier); + } - if (newPart instanceof IAlvearyComponent.Climatiser) { - climatisers.add((IAlvearyComponent.Climatiser) newPart); - } + if (newPart instanceof IAlvearyComponent.BeeListener) { + IAlvearyComponent.BeeListener beeListenerSource = (IAlvearyComponent.BeeListener) newPart; + IBeeListener beeListener = beeListenerSource.getBeeListener(); + beeListeners.add(beeListener); + } - if (newPart instanceof IAlvearyComponent.Active) { - activeComponents.add((IAlvearyComponent.Active) newPart); + if (newPart instanceof IAlvearyComponent.Climatiser) { + climatisers.add((IAlvearyComponent.Climatiser) newPart); + } + + if (newPart instanceof IAlvearyComponent.Active) { + activeComponents.add((IAlvearyComponent.Active) newPart); + } } } @Override protected void onBlockRemoved(IMultiblockPart oldPart) { - if (oldPart instanceof IAlvearyComponent.BeeModifier) { - IAlvearyComponent.BeeModifier alvearyBeeModifier = (IAlvearyComponent.BeeModifier) oldPart; - IBeeModifier beeModifier = alvearyBeeModifier.getBeeModifier(); - beeModifiers.remove(beeModifier); - } + if (oldPart instanceof IAlvearyComponent) { + allComponents.remove(oldPart); - if (oldPart instanceof IAlvearyComponent.BeeListener) { - IAlvearyComponent.BeeListener beeListenerSource = (IAlvearyComponent.BeeListener) oldPart; - IBeeListener beeListener = beeListenerSource.getBeeListener(); - beeListeners.remove(beeListener); - } + if (oldPart instanceof IAlvearyComponent.BeeModifier) { + IAlvearyComponent.BeeModifier alvearyBeeModifier = (IAlvearyComponent.BeeModifier) oldPart; + IBeeModifier beeModifier = alvearyBeeModifier.getBeeModifier(); + beeModifiers.remove(beeModifier); + } - if (oldPart instanceof IAlvearyComponent.Climatiser) { - climatisers.remove(oldPart); - } + if (oldPart instanceof IAlvearyComponent.BeeListener) { + IAlvearyComponent.BeeListener beeListenerSource = (IAlvearyComponent.BeeListener) oldPart; + IBeeListener beeListener = beeListenerSource.getBeeListener(); + beeListeners.remove(beeListener); + } - if (oldPart instanceof IAlvearyComponent.Active) { - activeComponents.remove(oldPart); + if (oldPart instanceof IAlvearyComponent.Climatiser) { + climatisers.remove(oldPart); + } + + if (oldPart instanceof IAlvearyComponent.Active) { + activeComponents.remove(oldPart); + } } } diff --git a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java index 318292bea..606c124c1 100644 --- a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java @@ -20,6 +20,7 @@ import net.minecraft.world.biome.BiomeGenBase; import com.mojang.authlib.GameProfile; +import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBeeHousingInventory; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; @@ -54,6 +55,11 @@ public class FakeAlvearyController implements IAlvearyController { return Collections.emptyList(); } + @Override + public Iterable getComponents() { + return Collections.emptyList(); + } + @Override public IBeeHousingInventory getBeeInventory() { return FakeBeeHousingInventory.instance; diff --git a/src/main/java/forestry/apiculture/multiblock/IAlvearyController.java b/src/main/java/forestry/apiculture/multiblock/IAlvearyController.java index d0c9bc599..eeb37a2f6 100644 --- a/src/main/java/forestry/apiculture/multiblock/IAlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/IAlvearyController.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.multiblock; +import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBeeHousing; import forestry.core.interfaces.IClimatised; import forestry.core.interfaces.IRestrictedAccessTile; @@ -20,5 +21,7 @@ import forestry.core.network.IStreamableGui; public interface IAlvearyController extends IBeeHousing, IClimatised, IRestrictedAccessTile, IStreamableGui { IInventoryAdapter getInternalInventory(); + Iterable getComponents(); + int getHealthScaled(int i); }