Clean up bee nocturnal and rain tolerance

This commit is contained in:
mezz committed 2016-03-04 03:53:44 -08:00
1 parent 6e3c28e07e
commit 92b1f85d84
14 files changed
+32 -37

No files matched your search

@@ -54,7 +54,7 @@ public enum EnumBeeChromosome implements IChromosomeType {
/**
* If true the bee can work during rain.
*/
TOLERANT_FLYER(IAlleleBoolean.class),
TOLERATES_RAIN(IAlleleBoolean.class),
/**
* If true, the bee can work without a clear view of the sky.
*/
@@ -33,9 +33,9 @@ public interface IBeeGenome extends IGenome {
EnumTolerance getToleranceHumid();
boolean getNocturnal();
boolean getNeverSleeps();
boolean getTolerantFlyer();
boolean getToleratesRain();
boolean getCaveDwelling();
@@ -11,13 +11,6 @@ public class BiomeHelper {
private static final Map<BiomeGenBase, Boolean> isBiomeHellishCache = new HashMap<>();
/**
* Determines if it can rain or snow in the given biome.
*/
public static boolean canRainOrSnow(BiomeGenBase biomeGenBase) {
return biomeGenBase.getEnableSnow() || biomeGenBase.canRain();
}
/**
* Determines if a given BiomeGenBase is of HELLISH temperature, since it is treated separately from actual temperature values.
* Uses the BiomeDictionary.
@@ -248,13 +248,14 @@ public class Bee extends IndividualLiving implements IBee {
public Set<IErrorState> getCanWork(IBeeHousing housing) {
World world = housing.getWorld();
BiomeGenBase biome = housing.getBiome();
BlockPos housingCoords = housing.getCoordinates();
Set<IErrorState> errorStates = new HashSet<>();
IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
// / Rain needs tolerant flyers
if (world.isRaining() && BiomeHelper.canRainOrSnow(biome) && !canFlyInRain(beeModifier)) {
if (world.isRainingAt(housingCoords) && !canFlyInRain(beeModifier)) {
errorStates.add(EnumErrorCode.IS_RAINING);
}
@@ -320,11 +321,11 @@ public class Bee extends IndividualLiving implements IBee {
}
private boolean canWorkAtNight(IBeeModifier beeModifier) {
return genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfLighted();
return genome.getPrimary().isNocturnal() || genome.getNeverSleeps() || beeModifier.isSelfLighted();
}
private boolean canWorkDuringDay() {
return !genome.getPrimary().isNocturnal() || genome.getNocturnal();
return !genome.getPrimary().isNocturnal() || genome.getNeverSleeps();
}
private boolean canWorkUnderground(IBeeModifier beeModifier) {
@@ -332,7 +333,7 @@ public class Bee extends IndividualLiving implements IBee {
}
private boolean canFlyInRain(IBeeModifier beeModifier) {
return genome.getTolerantFlyer() || beeModifier.isSealed();
return genome.getToleratesRain() || beeModifier.isSealed();
}
private boolean isSuitableBiome(BiomeGenBase biome) {
@@ -418,11 +419,11 @@ public class Bee extends IndividualLiving implements IBee {
list.add(humidTolerance);
list.add(flowers);
if (genome.getNocturnal()) {
list.add(EnumChatFormatting.RED + GenericRatings.rateActivityTime(genome.getNocturnal(), false));
if (genome.getNeverSleeps()) {
list.add(EnumChatFormatting.RED + GenericRatings.rateActivityTime(genome.getNeverSleeps(), false));
}
if (genome.getTolerantFlyer()) {
if (genome.getToleratesRain()) {
list.add(EnumChatFormatting.WHITE + StringUtil.localize("gui.flyer.tooltip"));
}
}
@@ -147,7 +147,7 @@ public enum BeeBranchDefinition implements IBranchDefinition {
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.NEVER_SLEEPS, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TOLERANT_FLYER, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TOLERATES_RAIN, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.CAVE_DWELLING, false);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST);
@@ -781,7 +781,7 @@ public enum BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.GOURD);
}
@@ -885,7 +885,7 @@ public enum BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
}
@@ -906,7 +906,7 @@ public enum BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectMycophilic);
AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGER);
@@ -130,7 +130,7 @@ public class BeeGenome extends Genome implements IBeeGenome {
}
@Override
public boolean getNocturnal() {
public boolean getNeverSleeps() {
return ((AlleleBoolean) getActiveAllele(EnumBeeChromosome.NEVER_SLEEPS)).getValue();
}
@@ -140,8 +140,8 @@ public class BeeGenome extends Genome implements IBeeGenome {
}
@Override
public boolean getTolerantFlyer() {
return ((AlleleBoolean) getActiveAllele(EnumBeeChromosome.TOLERANT_FLYER)).getValue();
public boolean getToleratesRain() {
return ((AlleleBoolean) getActiveAllele(EnumBeeChromosome.TOLERATES_RAIN)).getValue();
}
@Override
@@ -51,7 +51,7 @@ public abstract class BeeVariation implements IBeeDefinition {
@Override
protected void initializeTemplate(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
}
}
}
@@ -178,7 +178,7 @@ public class GuiBeealyzer extends GuiAlyzer {
String no = StringUtil.localize("no");
String diurnal0, diurnal1, nocturnal0, nocturnal1;
if (bee.getGenome().getNocturnal()) {
if (bee.getGenome().getNeverSleeps()) {
nocturnal0 = diurnal0 = yes;
} else {
nocturnal0 = bee.getGenome().getPrimary().isNocturnal() ? yes : no;
@@ -201,10 +201,10 @@ public class GuiBeealyzer extends GuiAlyzer {
textLayout.drawLine(nocturnal1, COLUMN_2, getColorCoding(false));
textLayout.newLineCompressed();
String primary = StringUtil.readableBoolean(bee.getGenome().getTolerantFlyer(), yes, no);
String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERANT_FLYER)).getValue(), yes, no);
String primary = StringUtil.readableBoolean(bee.getGenome().getToleratesRain(), yes, no);
String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERATES_RAIN)).getValue(), yes, no);
drawRow(StringUtil.localize("gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERANT_FLYER);
drawRow(StringUtil.localize("gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERATES_RAIN);
textLayout.newLineCompressed();
@@ -34,9 +34,9 @@ public class GenericRatings {
}
}
public static String rateActivityTime(boolean nocturnalTrait, boolean naturalNocturnal) {
public static String rateActivityTime(boolean neverSleeps, boolean naturalNocturnal) {
String active = naturalNocturnal ? StringUtil.localize("gui.nocturnal") : StringUtil.localize("gui.diurnal");
if (nocturnalTrait) {
if (neverSleeps) {
active = StringUtil.append(", ", active, naturalNocturnal ? StringUtil.localize("gui.diurnal") : StringUtil.localize("gui.nocturnal"));
}
@@ -120,7 +120,7 @@ public class AlleleHelper implements IAlleleHelper {
for (IAlleleBoolean alleleBoolean : booleans.values()) {
AlleleManager.alleleRegistry.registerAllele(alleleBoolean,
EnumBeeChromosome.NEVER_SLEEPS,
EnumBeeChromosome.TOLERANT_FLYER,
EnumBeeChromosome.TOLERATES_RAIN,
EnumBeeChromosome.CAVE_DWELLING,
EnumButterflyChromosome.NOCTURNAL,
EnumButterflyChromosome.TOLERANT_FLYER,
@@ -66,7 +66,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
// Raintanks in desert biomes are useless
if (worldObj != null) {
BiomeGenBase biome = worldObj.getBiomeGenForCoordsBody(getPos());
isValidBiome = BiomeHelper.canRainOrSnow(biome);
isValidBiome = biome.canRain();
getErrorLogic().setCondition(!isValidBiome, EnumErrorCode.NO_RAIN_BIOME);
}
@@ -117,7 +117,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
boolean hasSky = worldObj.canBlockSeeSky(getPos().add(0, 1, 0));
errorLogic.setCondition(!hasSky, EnumErrorCode.NO_SKY_RAIN_TANK);
errorLogic.setCondition(!worldObj.isRaining(), EnumErrorCode.NOT_RAINING);
errorLogic.setCondition(!worldObj.isRainingAt(getPos()), EnumErrorCode.NOT_RAINING);
if (!errorLogic.hasErrors()) {
resourceTank.fill(STACK_WATER, true);
@@ -254,7 +254,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
@Override
protected boolean updateServer(int tickCount) {
hydrationManager.updateServer(worldObj, getBiome());
hydrationManager.updateServer(worldObj, getTopCenterCoord());
if (updateOnInterval(20)) {
inventory.drainCan(tankManager);
@@ -14,6 +14,7 @@ import javax.annotation.Nonnull;
import java.io.IOException;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
@@ -40,8 +41,8 @@ public class FarmHydrationManager implements IFarmLedgerDelegate, INbtWritable,
this.climatised = climatised;
}
public void updateServer(World world, BiomeGenBase biome) {
if (world.isRaining() && BiomeHelper.canRainOrSnow(biome)) {
public void updateServer(World world, BlockPos coordinates) {
if (world.isRainingAt(coordinates)) {
if (hydrationDelay > 0) {
hydrationDelay--;
} else {