From 92b1f85d847bc5ea3584f5a217c68946f4e5afa5 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 4 Mar 2016 03:53:44 -0800 Subject: [PATCH] Clean up bee nocturnal and rain tolerance --- .../api/apiculture/EnumBeeChromosome.java | 2 +- .../java/forestry/api/apiculture/IBeeGenome.java | 4 ++-- src/main/java/forestry/api/core/BiomeHelper.java | 7 ------- .../java/forestry/apiculture/genetics/Bee.java | 15 ++++++++------- .../apiculture/genetics/BeeBranchDefinition.java | 2 +- .../apiculture/genetics/BeeDefinition.java | 6 +++--- .../forestry/apiculture/genetics/BeeGenome.java | 6 +++--- .../apiculture/genetics/BeeVariation.java | 2 +- .../forestry/apiculture/gui/GuiBeealyzer.java | 8 ++++---- .../forestry/core/genetics/GenericRatings.java | 4 ++-- .../core/genetics/alleles/AlleleHelper.java | 2 +- .../java/forestry/factory/tiles/TileRaintank.java | 4 ++-- .../farming/multiblock/FarmController.java | 2 +- .../farming/multiblock/FarmHydrationManager.java | 5 +++-- 14 files changed, 32 insertions(+), 37 deletions(-) diff --git a/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java b/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java index b92e1fc05..7a6721b54 100644 --- a/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java +++ b/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java @@ -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. */ diff --git a/src/main/java/forestry/api/apiculture/IBeeGenome.java b/src/main/java/forestry/api/apiculture/IBeeGenome.java index af2365aaf..561d40852 100644 --- a/src/main/java/forestry/api/apiculture/IBeeGenome.java +++ b/src/main/java/forestry/api/apiculture/IBeeGenome.java @@ -33,9 +33,9 @@ public interface IBeeGenome extends IGenome { EnumTolerance getToleranceHumid(); - boolean getNocturnal(); + boolean getNeverSleeps(); - boolean getTolerantFlyer(); + boolean getToleratesRain(); boolean getCaveDwelling(); diff --git a/src/main/java/forestry/api/core/BiomeHelper.java b/src/main/java/forestry/api/core/BiomeHelper.java index 00c9a91f1..753ffa508 100644 --- a/src/main/java/forestry/api/core/BiomeHelper.java +++ b/src/main/java/forestry/api/core/BiomeHelper.java @@ -11,13 +11,6 @@ public class BiomeHelper { private static final Map 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. diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 1d4f5e2a9..9079b14ee 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -248,13 +248,14 @@ public class Bee extends IndividualLiving implements IBee { public Set getCanWork(IBeeHousing housing) { World world = housing.getWorld(); BiomeGenBase biome = housing.getBiome(); + BlockPos housingCoords = housing.getCoordinates(); Set 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")); } } diff --git a/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java index 0735eb173..1d2401f26 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java @@ -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); diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index 8351719f6..4940a366f 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -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); diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index fe79176db..92e26e95c 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -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 diff --git a/src/main/java/forestry/apiculture/genetics/BeeVariation.java b/src/main/java/forestry/apiculture/genetics/BeeVariation.java index af8395da6..13ad09b0f 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeVariation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeVariation.java @@ -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); } } } diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 3de803d0d..32251d5c0 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -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(); diff --git a/src/main/java/forestry/core/genetics/GenericRatings.java b/src/main/java/forestry/core/genetics/GenericRatings.java index 7aa5b3477..882594358 100755 --- a/src/main/java/forestry/core/genetics/GenericRatings.java +++ b/src/main/java/forestry/core/genetics/GenericRatings.java @@ -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")); } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java index e8bb94c22..01cfd5b2c 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java @@ -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, diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java index d4b045c42..516595897 100644 --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -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); diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 4fb897e4a..0c2bd8947 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -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); diff --git a/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java b/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java index bc439e87a..d530968c6 100644 --- a/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java +++ b/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java @@ -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 {