diff --git a/src/main/java/forestry/api/apiculture/DefaultBeeModifier.java b/src/main/java/forestry/api/apiculture/DefaultBeeModifier.java index 9beb31b1a..c9a2834b7 100644 --- a/src/main/java/forestry/api/apiculture/DefaultBeeModifier.java +++ b/src/main/java/forestry/api/apiculture/DefaultBeeModifier.java @@ -43,6 +43,10 @@ public class DefaultBeeModifier implements IBeeModifier { return false; } + public boolean isSelfUnlighted() { + return false; + } + public boolean isSunlightSimulated() { return false; } diff --git a/src/main/java/forestry/api/apiculture/IBeeModifier.java b/src/main/java/forestry/api/apiculture/IBeeModifier.java index fd44927f9..6e72c7c44 100644 --- a/src/main/java/forestry/api/apiculture/IBeeModifier.java +++ b/src/main/java/forestry/api/apiculture/IBeeModifier.java @@ -54,10 +54,17 @@ public interface IBeeModifier { boolean isSealed(); /** - * @return Boolean indicating if housing can ignore darkness/night + * @return Boolean indicating if housing can ignore darkness/night. Cannot be used together with SelfUnlighted */ boolean isSelfLighted(); + /** + * @return Boolean indicating if housing can ignore lightness/day. Cannot be used together with SelfLighted + */ + default boolean isSelfUnlighted() { + return false; + } + /** * @return Boolean indicating if housing can ignore not seeing the sky */ diff --git a/src/main/java/forestry/apiculture/BeeHousingModifier.java b/src/main/java/forestry/apiculture/BeeHousingModifier.java index aaeb5b3be..f02d53fd1 100644 --- a/src/main/java/forestry/apiculture/BeeHousingModifier.java +++ b/src/main/java/forestry/apiculture/BeeHousingModifier.java @@ -94,6 +94,16 @@ public class BeeHousingModifier implements IBeeModifier { return false; } + @Override + public boolean isSelfUnlighted() { + for (IBeeModifier modifier : beeHousing.getBeeModifiers()) { + if (modifier.isSelfUnlighted()) { + return true; + } + } + return false; + } + @Override public boolean isSunlightSimulated() { for (IBeeModifier modifier : beeHousing.getBeeModifiers()) { diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 2c0d547c6..7eb92f450 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -248,7 +248,7 @@ public class Bee extends IndividualLiving implements IBee { // / Night or darkness requires nocturnal species if (world.isDaytime()) { - if (!canWorkDuringDay()) { + if (!canWorkDuringDay(beeModifier)) { errorStates.add(EnumErrorCode.NOT_NIGHT); } } else { @@ -258,7 +258,7 @@ public class Bee extends IndividualLiving implements IBee { } if (housing.getBlockLightValue() > Constants.APIARY_MIN_LEVEL_LIGHT) { - if (!canWorkDuringDay()) { + if (!canWorkDuringDay(beeModifier)) { errorStates.add(EnumErrorCode.NOT_GLOOMY); } } else { @@ -308,12 +308,16 @@ public class Bee extends IndividualLiving implements IBee { return errorStates; } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") private boolean canWorkAtNight(IBeeModifier beeModifier) { - return genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfLighted(); + return (genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfLighted()) + && !(beeModifier.isSelfUnlighted() && beeModifier.isSelfLighted()); } - private boolean canWorkDuringDay() { - return !genome.getPrimary().isNocturnal() || genome.getNocturnal(); + @SuppressWarnings("BooleanMethodIsAlwaysInverted") + private boolean canWorkDuringDay(IBeeModifier beeModifier) { + return (!genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfUnlighted()) + && !(beeModifier.isSelfUnlighted() && beeModifier.isSelfLighted()); } private boolean canWorkUnderground(IBeeModifier beeModifier) {