From 7de1c86d29bc430d585f0b8e9938b369467b9f67 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 13 Aug 2017 21:53:59 -0700 Subject: [PATCH] Remove the genetics dependency on botany-api --- .../src/main/java/binnie/botany/Botany.java | 9 +++++ .../binnie/botany/genetics/TolerancePh.java | 21 ++++++++++++ .../binnie/extrabees/init/ItemRegister.java | 1 - .../java/binnie/genetics/api/GeneticsApi.java | 3 ++ .../acclimatiser/IAcclimatiserManager.java | 11 +++++++ .../api/acclimatiser/IToleranceType.java | 11 +++++++ genetics/build.gradle | 3 -- .../main/java/binnie/genetics/Genetics.java | 10 ++---- .../machine/acclimatiser/Acclimatiser.java | 33 ++++++++----------- .../acclimatiser/AcclimatiserManager.java | 22 +++++++++++++ .../machine/acclimatiser/ToleranceSystem.java | 27 ++++++++++----- .../machine/acclimatiser/ToleranceType.java | 23 ++----------- .../ValidatorAcclimatiserItem.java | 3 +- 13 files changed, 116 insertions(+), 61 deletions(-) create mode 100644 botany/src/main/java/binnie/botany/genetics/TolerancePh.java create mode 100644 genetics-api/src/main/java/binnie/genetics/api/acclimatiser/IAcclimatiserManager.java create mode 100644 genetics-api/src/main/java/binnie/genetics/api/acclimatiser/IToleranceType.java create mode 100644 genetics/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserManager.java diff --git a/botany/src/main/java/binnie/botany/Botany.java b/botany/src/main/java/binnie/botany/Botany.java index d05aeeb0..3787a6f9 100644 --- a/botany/src/main/java/binnie/botany/Botany.java +++ b/botany/src/main/java/binnie/botany/Botany.java @@ -1,7 +1,10 @@ package binnie.botany; +import binnie.botany.api.genetics.EnumFlowerChromosome; +import binnie.botany.genetics.TolerancePh; import binnie.botany.genetics.gui.analyst.FlowerAnalystPagePlugin; import binnie.genetics.api.GeneticsApi; +import binnie.genetics.api.acclimatiser.IAcclimatiserManager; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -37,7 +40,13 @@ public class Botany extends BlankModuleContainer { @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { super.preInit(evt); + GeneticsApi.registerAnalystPagePlugin(new FlowerAnalystPagePlugin()); + + IAcclimatiserManager acclimatiserManager = GeneticsApi.acclimatiserManager; + acclimatiserManager.addTolerance(EnumFlowerChromosome.HUMIDITY_TOLERANCE, acclimatiserManager.getHumidityToleranceType()); + acclimatiserManager.addTolerance(EnumFlowerChromosome.TEMPERATURE_TOLERANCE, acclimatiserManager.getTemperatureToleranceType()); + acclimatiserManager.addTolerance(EnumFlowerChromosome.PH_TOLERANCE, new TolerancePh()); } @Mod.EventHandler diff --git a/botany/src/main/java/binnie/botany/genetics/TolerancePh.java b/botany/src/main/java/binnie/botany/genetics/TolerancePh.java new file mode 100644 index 00000000..755d1f3c --- /dev/null +++ b/botany/src/main/java/binnie/botany/genetics/TolerancePh.java @@ -0,0 +1,21 @@ +package binnie.botany.genetics; + +import binnie.botany.api.BotanyAPI; +import binnie.botany.api.gardening.EnumFertiliserType; +import binnie.botany.api.gardening.IGardeningManager; +import binnie.genetics.api.acclimatiser.IToleranceType; +import net.minecraft.item.ItemStack; + +public class TolerancePh implements IToleranceType { + @Override + public float getEffect(ItemStack stack) { + IGardeningManager gardening = BotanyAPI.gardening; + if (gardening.isFertiliser(EnumFertiliserType.ACID, stack)) { + return -0.5f * gardening.getFertiliserStrength(stack); + } + if (gardening.isFertiliser(EnumFertiliserType.ALKALINE, stack)) { + return 0.5f * gardening.getFertiliserStrength(stack); + } + return 0; + } +} diff --git a/extrabees/src/main/java/binnie/extrabees/init/ItemRegister.java b/extrabees/src/main/java/binnie/extrabees/init/ItemRegister.java index 7f7d0abd..21e7cc8d 100644 --- a/extrabees/src/main/java/binnie/extrabees/init/ItemRegister.java +++ b/extrabees/src/main/java/binnie/extrabees/init/ItemRegister.java @@ -1,7 +1,6 @@ package binnie.extrabees.init; import binnie.extrabees.items.ItemBeeDictionary; -import binnie.genetics.item.ItemPunnettSquare; import net.minecraft.init.Items; import net.minecraft.item.ItemBlock; diff --git a/genetics-api/src/main/java/binnie/genetics/api/GeneticsApi.java b/genetics-api/src/main/java/binnie/genetics/api/GeneticsApi.java index df49d09b..644107c0 100644 --- a/genetics-api/src/main/java/binnie/genetics/api/GeneticsApi.java +++ b/genetics-api/src/main/java/binnie/genetics/api/GeneticsApi.java @@ -5,12 +5,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import binnie.genetics.api.acclimatiser.IAcclimatiserManager; import forestry.api.genetics.IIndividual; public class GeneticsApi { private static Collection analystPagePlugins = new ArrayList<>(); private static Collection producePlugins = new ArrayList<>(); + public static IAcclimatiserManager acclimatiserManager; + public static void registerAnalystPagePlugin(IAnalystPagePlugin analystPageFactory) { analystPagePlugins.add(analystPageFactory); } diff --git a/genetics-api/src/main/java/binnie/genetics/api/acclimatiser/IAcclimatiserManager.java b/genetics-api/src/main/java/binnie/genetics/api/acclimatiser/IAcclimatiserManager.java new file mode 100644 index 00000000..fe54d85c --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/acclimatiser/IAcclimatiserManager.java @@ -0,0 +1,11 @@ +package binnie.genetics.api.acclimatiser; + +import forestry.api.genetics.IChromosomeType; + +public interface IAcclimatiserManager { + void addTolerance(final IChromosomeType chromosome, final IToleranceType type); + + IToleranceType getTemperatureToleranceType(); + + IToleranceType getHumidityToleranceType(); +} diff --git a/genetics-api/src/main/java/binnie/genetics/api/acclimatiser/IToleranceType.java b/genetics-api/src/main/java/binnie/genetics/api/acclimatiser/IToleranceType.java new file mode 100644 index 00000000..88824480 --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/acclimatiser/IToleranceType.java @@ -0,0 +1,11 @@ +package binnie.genetics.api.acclimatiser; + +import net.minecraft.item.ItemStack; + +public interface IToleranceType { + float getEffect(final ItemStack stack); + + default boolean hasEffect(final ItemStack stack) { + return this.getEffect(stack) != 0.0f; + } +} diff --git a/genetics/build.gradle b/genetics/build.gradle index 0cd75054..9bdf0dc4 100644 --- a/genetics/build.gradle +++ b/genetics/build.gradle @@ -3,7 +3,4 @@ archivesBaseName = 'genetics-' + mcversion dependencies { compile project(":core") compile project(":genetics-api") - - // TODO: remove these, they should add on to genetics instead - compile project(":botany-api") } diff --git a/genetics/src/main/java/binnie/genetics/Genetics.java b/genetics/src/main/java/binnie/genetics/Genetics.java index 362c0662..2d54bfb0 100644 --- a/genetics/src/main/java/binnie/genetics/Genetics.java +++ b/genetics/src/main/java/binnie/genetics/Genetics.java @@ -3,30 +3,23 @@ package binnie.genetics; import binnie.genetics.api.GeneticsApi; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.gui.analyst.GeneticsProducePlugin; +import binnie.genetics.machine.acclimatiser.AcclimatiserManager; import binnie.genetics.machine.sequencer.Sequencer; import com.google.common.base.Preconditions; import javax.annotation.Nullable; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import forestry.api.recipes.RecipeManagers; - import binnie.core.Binnie; import binnie.core.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; -import binnie.core.liquid.ManagerLiquid; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.IProxyCore; @@ -74,6 +67,7 @@ public class Genetics extends AbstractMod { Sequencer.fxSeqT = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.t"); Sequencer.fxSeqC = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.c"); + GeneticsApi.acclimatiserManager = new AcclimatiserManager(); GeneticsApi.registerProducePlugin(new GeneticsProducePlugin()); } diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 364f2112..0ce83b03 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -7,9 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import binnie.botany.api.BotanyAPI; -import forestry.api.apiculture.BeeManager; -import forestry.api.lepidopterology.ButterflyManager; +import binnie.genetics.api.acclimatiser.IToleranceType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -23,13 +21,9 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.EnumButterflyChromosome; -import binnie.core.Constants; -import binnie.botany.api.genetics.EnumFlowerChromosome; -import binnie.core.modules.BotanyModuleUIDs; import binnie.core.BinnieCore; import binnie.core.genetics.Tolerance; import binnie.core.liquid.FluidContainerType; -import binnie.core.modules.ModuleManager; public class Acclimatiser { public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3}; @@ -37,6 +31,7 @@ public class Acclimatiser { public static final int[] SLOT_ACCLIMATISER = new int[]{5, 6, 7}; public static final int[] SLOT_DRONE = new int[]{8, 9, 10, 11}; private static List toleranceSystems = new ArrayList<>(); + private static List toleranceTypes = new ArrayList<>(); private static Map temperatureItems = new HashMap<>(); private static Map humidityItems = new HashMap<>(); @@ -45,7 +40,7 @@ public class Acclimatiser { final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); if (root != null) { for (final ToleranceSystem system : Acclimatiser.toleranceSystems) { - if (Objects.equals(root.getUID(), system.uid) && system.type.hasEffect(acclim)) { + if (Objects.equals(root.getUID(), system.getSpeciesRootUid()) && system.getType().hasEffect(acclim)) { return system; } } @@ -53,8 +48,13 @@ public class Acclimatiser { return null; } - public static void addTolerance(final String uid, final IChromosomeType chromosome, final ToleranceType type) { - Acclimatiser.toleranceSystems.add(new ToleranceSystem(uid, chromosome, type)); + public static void addTolerance(IChromosomeType chromosome, IToleranceType type) { + Acclimatiser.toleranceSystems.add(new ToleranceSystem(chromosome, type)); + Acclimatiser.toleranceTypes.add(type); + } + + public static List getToleranceTypes() { + return toleranceTypes; } public static float getTemperatureEffect(final ItemStack item) { @@ -91,17 +91,12 @@ public class Acclimatiser { public static void setupRecipes() { if (BinnieCore.isApicultureActive()) { - addTolerance(BeeManager.beeRoot.getUID(), EnumBeeChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(BeeManager.beeRoot.getUID(), EnumBeeChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); + addTolerance(EnumBeeChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); + addTolerance(EnumBeeChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); } if (BinnieCore.isLepidopteryActive()) { - addTolerance(ButterflyManager.butterflyRoot.getUID(), EnumButterflyChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(ButterflyManager.butterflyRoot.getUID(), EnumButterflyChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); - } - if (ModuleManager.isModuleEnabled(Constants.BOTANY_MOD_ID, BotanyModuleUIDs.FLOWERS)) { - addTolerance(BotanyAPI.flowerRoot.getUID(), EnumFlowerChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(BotanyAPI.flowerRoot.getUID(), EnumFlowerChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); - addTolerance(BotanyAPI.flowerRoot.getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH); + addTolerance(EnumButterflyChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); + addTolerance(EnumButterflyChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); } addTemperatureItem(new ItemStack(Items.BLAZE_POWDER), 0.5f); addTemperatureItem(new ItemStack(Items.BLAZE_ROD), 0.75f); diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserManager.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserManager.java new file mode 100644 index 00000000..e05adeb6 --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserManager.java @@ -0,0 +1,22 @@ +package binnie.genetics.machine.acclimatiser; + +import binnie.genetics.api.acclimatiser.IAcclimatiserManager; +import binnie.genetics.api.acclimatiser.IToleranceType; +import forestry.api.genetics.IChromosomeType; + +public class AcclimatiserManager implements IAcclimatiserManager { + @Override + public void addTolerance(IChromosomeType chromosome, IToleranceType type) { + Acclimatiser.addTolerance(chromosome, type); + } + + @Override + public IToleranceType getTemperatureToleranceType() { + return ToleranceType.Temperature; + } + + @Override + public IToleranceType getHumidityToleranceType() { + return ToleranceType.Humidity; + } +} diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java index d193942d..2dc82343 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java @@ -2,6 +2,7 @@ package binnie.genetics.machine.acclimatiser; import java.util.Random; +import binnie.genetics.api.acclimatiser.IToleranceType; import net.minecraft.item.ItemStack; import forestry.api.genetics.AlleleManager; @@ -16,20 +17,20 @@ import binnie.core.genetics.Tolerance; import binnie.genetics.machine.inoculator.Inoculator; class ToleranceSystem { - String uid; - IChromosomeType chromosomeOrdinal; - ToleranceType type; + private final String speciesRootUid; + private final IChromosomeType chromosomeType; + private final IToleranceType type; - ToleranceSystem(final String uid, final IChromosomeType chromosomeOrdinal, final ToleranceType type) { - this.uid = uid; - this.chromosomeOrdinal = chromosomeOrdinal; + ToleranceSystem(final IChromosomeType chromosomeType, final IToleranceType type) { + this.speciesRootUid = chromosomeType.getSpeciesRoot().getUID(); + this.chromosomeType = chromosomeType; this.type = type; } public boolean canAlter(final ItemStack stack, final ItemStack acclim) { final IIndividual member = AlleleManager.alleleRegistry.getIndividual(stack); final IGenome genome = member.getGenome(); - final IAlleleTolerance tolAllele = (IAlleleTolerance) genome.getActiveAllele(this.chromosomeOrdinal); + final IAlleleTolerance tolAllele = (IAlleleTolerance) genome.getActiveAllele(this.chromosomeType); final Tolerance tol = Tolerance.get(tolAllele.getValue()); final float effect = this.type.getEffect(acclim); return (effect > 0.0f && tol.getBounds()[1] < 5) || (effect < 0.0f && tol.getBounds()[0] > -5); @@ -43,14 +44,22 @@ class ToleranceSystem { } final IIndividual member = AlleleManager.alleleRegistry.getIndividual(stack); final IGenome genome = member.getGenome(); - final IAlleleTolerance tolAllele = (IAlleleTolerance) genome.getActiveAllele(this.chromosomeOrdinal); + final IAlleleTolerance tolAllele = (IAlleleTolerance) genome.getActiveAllele(this.chromosomeType); final Tolerance tol = Tolerance.get(tolAllele.getValue()); final Tolerance newTol = Acclimatiser.alterTolerance(tol, effect); if (rand.nextFloat() > 1.0f / (-newTol.getBounds()[0] + newTol.getBounds()[1])) { return stack; } final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); - Inoculator.setGene(new Gene(newTol.getAllele(), this.chromosomeOrdinal, root), stack, rand.nextInt(2)); + Inoculator.setGene(new Gene(newTol.getAllele(), this.chromosomeType, root), stack, rand.nextInt(2)); return stack; } + + public String getSpeciesRootUid() { + return speciesRootUid; + } + + public IToleranceType getType() { + return type; + } } diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java index 4bea01b8..5395a42e 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java @@ -1,14 +1,11 @@ package binnie.genetics.machine.acclimatiser; -import binnie.botany.api.BotanyAPI; -import binnie.botany.api.gardening.EnumFertiliserType; -import binnie.botany.api.gardening.IGardeningManager; +import binnie.genetics.api.acclimatiser.IToleranceType; import net.minecraft.item.ItemStack; -public enum ToleranceType { +public enum ToleranceType implements IToleranceType { Temperature, - Humidity, - PH; + Humidity; public float getEffect(final ItemStack stack) { switch (this) { @@ -18,21 +15,7 @@ public enum ToleranceType { case Humidity: { return Acclimatiser.getHumidityEffect(stack); } - case PH: { - IGardeningManager gardening = BotanyAPI.gardening; - if (gardening.isFertiliser(EnumFertiliserType.ACID, stack)) { - return -0.5f * gardening.getFertiliserStrength(stack); - } - if (gardening.isFertiliser(EnumFertiliserType.ALKALINE, stack)) { - return 0.5f * gardening.getFertiliserStrength(stack); - } - break; - } } return 0.0f; } - - public boolean hasEffect(final ItemStack stack) { - return this.getEffect(stack) != 0.0f; - } } diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java index e6669431..62656ec7 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ValidatorAcclimatiserItem.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.acclimatiser; +import binnie.genetics.api.acclimatiser.IToleranceType; import net.minecraft.item.ItemStack; import binnie.core.machines.inventory.SlotValidator; @@ -12,7 +13,7 @@ public class ValidatorAcclimatiserItem extends SlotValidator { @Override public boolean isValid(final ItemStack stack) { - for (final ToleranceType type : ToleranceType.values()) { + for (final IToleranceType type : Acclimatiser.getToleranceTypes()) { if (type.hasEffect(stack)) { return true; }