From 71481d5acec4c2c2d78fab3c0082cc9d1eafcd1a Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 1 Oct 2015 18:30:28 -0700 Subject: [PATCH] Add API helpers for using the new IBeeHousing modifiers and listeners --- api/forestry | 2 +- .../java/forestry/apiculture/BeekeepingLogic.java | 4 ++-- .../apiculture/flowers/FlowerRegistry.java | 4 ++-- .../java/forestry/apiculture/genetics/Bee.java | 11 +++++------ .../forestry/apiculture/genetics/BeeHelper.java | 14 ++++++++++++++ .../forestry/apiculture/genetics/BeeMutation.java | 3 +-- .../apiculture/genetics/BeekeepingMode.java | 8 ++++---- .../genetics/alleles/AlleleEffectNone.java | 6 +++--- .../apiculture/multiblock/AlvearyController.java | 3 +-- 9 files changed, 33 insertions(+), 22 deletions(-) diff --git a/api/forestry b/api/forestry index 87d0201ad..5c3dc357e 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit 87d0201ad926ad9d5c06a7181aaabe3587a5b97a +Subproject commit 5c3dc357e8a4e0b3da8790d43dcfda147a9f64e5 diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 0bac0512c..cce56ee36 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -73,8 +73,8 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { public BeekeepingLogic(IBeeHousing housing) { this.housing = housing; - this.beeModifier = new BeeHousingModifier(housing); - this.beeListener = new BeeHousingListener(housing); + this.beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); + this.beeListener = BeeManager.beeRoot.createBeeHousingListener(housing); } // / SAVING & LOADING diff --git a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java index 65f946ec4..0f359cd4d 100644 --- a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java +++ b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java @@ -38,6 +38,7 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.FlowerManager; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -47,7 +48,6 @@ import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; -import forestry.apiculture.BeeHousingModifier; import forestry.core.utils.vect.MutableVect; import forestry.core.utils.vect.Vect; import forestry.plugins.PluginManager; @@ -142,7 +142,7 @@ public final class FlowerRegistry implements IFlowerRegistry { Set acceptedFlowers = this.registeredFlowers.get(flowerType); World world = beeHousing.getWorld(); - IBeeModifier beeModifier = new BeeHousingModifier(beeHousing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(beeHousing); Vect area = getArea(bee.getGenome(), beeModifier); Vect housingPos = new Vect(beeHousing.getCoordinates()).add(-area.x / 2, -area.y / 2, -area.z / 2); diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 7c72b3ac3..5033e61e0 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -52,7 +52,6 @@ import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; -import forestry.apiculture.BeeHousingModifier; import forestry.arboriculture.genetics.pollination.FakePollinatable; import forestry.arboriculture.genetics.pollination.ICheckPollinatable; import forestry.core.config.Config; @@ -253,7 +252,7 @@ public class Bee extends IndividualLiving implements IBee { Set errorStates = new HashSet(); - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); // / Rain needs tolerant flyers if (world.isRaining() && !genome.getTolerantFlyer() && BiomeHelper.canRainOrSnow(biome) && !beeModifier.isSealed()) { @@ -458,7 +457,7 @@ public class Bee extends IndividualLiving implements IBee { setIsNatural(false); } - IBeeModifier beeHousingModifier = new BeeHousingModifier(housing); + IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); IBeeModifier beeModeModifier = mode.getBeeModifier(); // Bee genetic speed * beehousing * beekeeping mode @@ -630,7 +629,7 @@ public class Bee extends IndividualLiving implements IBee { @Override public IIndividual retrievePollen(IBeeHousing housing) { - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); int chance = Math.round(genome.getFlowering() * beeModifier.getFloweringModifier(getGenome(), 1f)); @@ -673,7 +672,7 @@ public class Bee extends IndividualLiving implements IBee { @Override public boolean pollinateRandom(IBeeHousing housing, IIndividual pollen) { - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); int chance = (int) (genome.getFlowering() * beeModifier.getFloweringModifier(getGenome(), 1f)); @@ -720,7 +719,7 @@ public class Bee extends IndividualLiving implements IBee { @Override public void plantFlowerRandom(IBeeHousing housing) { - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); int chance = Math.round(genome.getFlowering() * beeModifier.getFloweringModifier(getGenome(), 1f)); diff --git a/src/main/java/forestry/apiculture/genetics/BeeHelper.java b/src/main/java/forestry/apiculture/genetics/BeeHelper.java index b2e2dc45d..76953d1ec 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeHelper.java +++ b/src/main/java/forestry/apiculture/genetics/BeeHelper.java @@ -33,6 +33,8 @@ import forestry.api.apiculture.IApiaristTracker; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeeMutation; import forestry.api.apiculture.IBeeRoot; import forestry.api.apiculture.IBeekeepingLogic; @@ -42,6 +44,8 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.apiculture.BeeHousingListener; +import forestry.apiculture.BeeHousingModifier; import forestry.apiculture.BeekeepingLogic; import forestry.core.config.ForestryItem; import forestry.core.genetics.SpeciesRoot; @@ -326,6 +330,16 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { return new BeekeepingLogic(housing); } + @Override + public IBeeModifier createBeeHousingModifier(IBeeHousing housing) { + return new BeeHousingModifier(housing); + } + + @Override + public IBeeListener createBeeHousingListener(IBeeHousing housing) { + return new BeeHousingListener(housing); + } + @Override public IChromosomeType[] getKaryotype() { return EnumBeeChromosome.values(); diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java index 2f4774108..786ca58b2 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutation.java @@ -21,7 +21,6 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; -import forestry.apiculture.BeeHousingModifier; import forestry.core.genetics.mutations.Mutation; public class BeeMutation extends Mutation implements IBeeMutationCustom { @@ -48,7 +47,7 @@ public class BeeMutation extends Mutation implements IBeeMutationCustom { return 0; } - IBeeModifier beeHousingModifier = new BeeHousingModifier(housing); + IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier(); processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance); diff --git a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java index 0294d7c39..4dd3215c5 100755 --- a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java +++ b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java @@ -16,13 +16,13 @@ import java.util.Random; import net.minecraft.world.World; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.DefaultBeeModifier; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingMode; -import forestry.apiculture.BeeHousingModifier; public class BeekeepingMode implements IBeekeepingMode { @@ -84,7 +84,7 @@ public class BeekeepingMode implements IBeekeepingMode { return false; } - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); return queen.getGeneration() > 96 + rand.nextInt(6) + rand.nextInt(6) && rand.nextFloat() < 0.02f * beeModifier.getGeneticDecay(queen.getGenome(), 1f); @@ -92,7 +92,7 @@ public class BeekeepingMode implements IBeekeepingMode { @Override public boolean isOverworked(IBee queen, IBeeHousing housing) { - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); float productionModifier = beeModifier.getProductionModifier(queen.getGenome(), 1f); if (productionModifier > 16) { @@ -106,7 +106,7 @@ public class BeekeepingMode implements IBeekeepingMode { @Override public boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing) { - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); float mutationModifier = beeModifier.getMutationModifier(queen.getGenome(), queen.getMate(), 1.0f); if (mutationModifier > 10) { diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectNone.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectNone.java index a158980fd..b2d905aa7 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectNone.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectNone.java @@ -12,12 +12,12 @@ package forestry.apiculture.genetics.alleles; import net.minecraft.util.AxisAlignedBB; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; -import forestry.apiculture.BeeHousingModifier; import forestry.core.genetics.alleles.AlleleCategorized; import forestry.core.utils.vect.MutableVect; import forestry.core.utils.vect.Vect; @@ -51,7 +51,7 @@ public class AlleleEffectNone extends AlleleCategorized implements IAlleleBeeEff } protected Vect getModifiedArea(IBeeGenome genome, IBeeHousing housing) { - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); float territoryModifier = beeModifier.getTerritoryModifier(genome, 1f); MutableVect area = new MutableVect(genome.getTerritory()); @@ -71,7 +71,7 @@ public class AlleleEffectNone extends AlleleCategorized implements IAlleleBeeEff } protected AxisAlignedBB getBounding(IBeeGenome genome, IBeeHousing housing) { - IBeeModifier beeModifier = new BeeHousingModifier(housing); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); float territoryModifier = beeModifier.getTerritoryModifier(genome, 1.0f); MutableVect area = new MutableVect(genome.getTerritory()); diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index a72e21466..6d7649ec2 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -35,7 +35,6 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IClimateControlled; import forestry.apiculture.BeeHousingInventory; -import forestry.apiculture.BeeHousingModifier; import forestry.core.access.EnumAccess; import forestry.core.inventory.IInventoryAdapter; import forestry.core.multiblock.CoordTriplet; @@ -384,7 +383,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public EnumTemperature getTemperature() { - IBeeModifier beeModifier = new BeeHousingModifier(this); + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(this); if (beeModifier.isHellish() && tempChange >= 0) { return EnumTemperature.HELLISH; }