From ddbc5e96f1f577815d3e60677168c451b2e8cf58 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 12 Mar 2016 17:00:42 -0800 Subject: [PATCH] Use ISpeciesType instead of a raw int --- .../forestry/api/genetics/ISpeciesRoot.java | 7 +++++-- .../api/lepidopterology/IButterflyRoot.java | 3 --- .../forestry/apiculture/BeekeepingLogic.java | 4 ++-- .../apiculture/blocks/BlockBeehives.java | 4 ++-- .../apiculture/commands/CommandBeeGive.java | 2 +- .../apiculture/genetics/BeeDefinition.java | 2 +- .../forestry/apiculture/genetics/BeeRoot.java | 17 +++++++++++++---- .../apiculture/genetics/BeeVariation.java | 2 +- .../forestry/apiculture/items/ItemBeeGE.java | 2 +- .../multiblock/TileAlvearySieve.java | 2 +- .../multiblock/TileAlvearySwarmer.java | 2 +- .../worldgen/ComponentVillageBeeHouse.java | 2 +- .../blocks/BlockForestryLeaves.java | 6 +++--- .../arboriculture/blocks/BlockSapling.java | 4 ++-- .../arboriculture/genetics/TreeDefinition.java | 2 +- .../arboriculture/genetics/TreeRoot.java | 17 +++++++++++++---- .../arboriculture/items/ItemGermlingGE.java | 2 +- .../core/gui/GuiNaturalistInventory.java | 3 ++- .../core/tiles/EscritoireGameBoard.java | 2 +- .../java/forestry/core/utils/GeneticsUtil.java | 2 +- .../entities/EntityButterfly.java | 6 +++--- .../genetics/ButterflyDefinition.java | 2 +- .../genetics/ButterflyRoot.java | 18 ++++++++++++++---- .../genetics/MothDefinition.java | 2 +- .../alleles/AlleleButterflySpecies.java | 2 +- .../lepidopterology/items/ItemButterflyGE.java | 2 +- .../lepidopterology/recipes/MatingRecipe.java | 12 ++++++------ 27 files changed, 80 insertions(+), 51 deletions(-) diff --git a/src/main/java/forestry/api/genetics/ISpeciesRoot.java b/src/main/java/forestry/api/genetics/ISpeciesRoot.java index fe9da26c1..fc11ecbd5 100644 --- a/src/main/java/forestry/api/genetics/ISpeciesRoot.java +++ b/src/main/java/forestry/api/genetics/ISpeciesRoot.java @@ -51,7 +51,7 @@ public interface ISpeciesRoot { * @param type Integer denoting the type needed to match. (i.e. butterfly vs. butterfly serum; bee queens, princesses, drones; etc.) * @return true if the itemstack contains an {@link IIndividual} of this class, false otherwise. */ - boolean isMember(ItemStack stack, int type); + boolean isMember(ItemStack stack, ISpeciesType type); /** * Used to check whether the given {@link IIndividual} is member of this class. @@ -67,7 +67,10 @@ public interface ISpeciesRoot { @Nullable ISpeciesType getType(ItemStack itemStack); - ItemStack getMemberStack(IIndividual individual, int type); + /** Species type used to represent this species in icons */ + ISpeciesType getIconType(); + + ItemStack getMemberStack(IIndividual individual, ISpeciesType type); /* BREEDING TRACKER */ IBreedingTracker getBreedingTracker(World world, GameProfile player); diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java b/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java index 1bed1d2ea..503bb9cd7 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java @@ -31,9 +31,6 @@ public interface IButterflyRoot extends ISpeciesRoot { @Override IButterfly getMember(NBTTagCompound compound); - @Override - ItemStack getMemberStack(IIndividual butterfly, int type); - /* GENOME CONVERSION */ @Override IButterfly templateAsIndividual(IAllele[] template); diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 5e9825a98..040b5460c 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -395,7 +395,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { count--; IBee heiress = queen.spawnPrincess(beeHousing); if (heiress != null) { - ItemStack princess = BeeManager.beeRoot.getMemberStack(heiress, EnumBeeType.PRINCESS.ordinal()); + ItemStack princess = BeeManager.beeRoot.getMemberStack(heiress, EnumBeeType.PRINCESS); breedingTracker.registerPrincess(heiress); offspring.push(princess); } @@ -404,7 +404,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { // Drones IBee[] drones = queen.spawnDrones(beeHousing); for (IBee drone : drones) { - ItemStack droneStack = BeeManager.beeRoot.getMemberStack(drone, EnumBeeType.DRONE.ordinal()); + ItemStack droneStack = BeeManager.beeRoot.getMemberStack(drone, EnumBeeType.DRONE); breedingTracker.registerDrone(drone); offspring.push(droneStack); } diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeehives.java b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java index 6dda23738..830022986 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java @@ -124,7 +124,7 @@ public class BlockBeehives extends BlockContainer implements IItemModelRegister bee.setIsNatural(false); } - ItemStack princess = BeeManager.beeRoot.getMemberStack(bee, EnumBeeType.PRINCESS.ordinal()); + ItemStack princess = BeeManager.beeRoot.getMemberStack(bee, EnumBeeType.PRINCESS); drops.add(princess); hasPrincess = true; break; @@ -136,7 +136,7 @@ public class BlockBeehives extends BlockContainer implements IItemModelRegister for (IHiveDrop drop : hiveDrops) { if (random.nextDouble() < drop.getChance(world, pos, fortune)) { IBee bee = drop.getBeeType(world, pos); - ItemStack drone = BeeManager.beeRoot.getMemberStack(bee, EnumBeeType.DRONE.ordinal()); + ItemStack drone = BeeManager.beeRoot.getMemberStack(bee, EnumBeeType.DRONE); drops.add(drone); break; } diff --git a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java index 294a0feb7..e310db144 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java +++ b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java @@ -93,7 +93,7 @@ public class CommandBeeGive extends SubCommand { bee.mate(bee); } - ItemStack beeStack = BeeManager.beeRoot.getMemberStack(bee, beeType.ordinal()); + ItemStack beeStack = BeeManager.beeRoot.getMemberStack(bee, beeType); player.dropPlayerItemWithRandomChoice(beeStack, true); CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.bee.give.given", player.getName(), bee.getGenome().getPrimary().getName(), beeType.getName()); diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index 0c15d0fc7..3bb23fed7 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -1057,7 +1057,7 @@ public enum BeeDefinition implements IBeeDefinition { @Override public final ItemStack getMemberStack(EnumBeeType beeType) { IBee bee = getIndividual(); - return BeeManager.beeRoot.getMemberStack(bee, beeType.ordinal()); + return BeeManager.beeRoot.getMemberStack(bee, beeType); } public final IBeeDefinition getRainResist() { diff --git a/src/main/java/forestry/apiculture/genetics/BeeRoot.java b/src/main/java/forestry/apiculture/genetics/BeeRoot.java index ca75a135d..7d2ed4b62 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeRoot.java +++ b/src/main/java/forestry/apiculture/genetics/BeeRoot.java @@ -46,6 +46,7 @@ import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesType; import forestry.apiculture.BeeHousingListener; import forestry.apiculture.BeeHousingModifier; import forestry.apiculture.BeekeepingLogic; @@ -89,8 +90,8 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { } @Override - public boolean isMember(ItemStack stack, int type) { - return getType(stack).ordinal() == type; + public boolean isMember(ItemStack stack, ISpeciesType type) { + return getType(stack) == type; } @Override @@ -99,14 +100,17 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { } @Override - public ItemStack getMemberStack(IIndividual individual, int type) { + public ItemStack getMemberStack(IIndividual individual, ISpeciesType type) { if (!isMember(individual)) { return null; } IBee bee = (IBee) individual; + if (!(type instanceof EnumBeeType)) { + return null; + } Item beeItem; - switch (EnumBeeType.VALUES[type]) { + switch ((EnumBeeType) type) { case QUEEN: beeItem = PluginApiculture.items.beeQueenGE; // ensure a queen is always mated @@ -156,6 +160,11 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { return null; } + @Override + public EnumBeeType getIconType() { + return EnumBeeType.DRONE; + } + @Override public boolean isDrone(ItemStack stack) { return getType(stack) == EnumBeeType.DRONE; diff --git a/src/main/java/forestry/apiculture/genetics/BeeVariation.java b/src/main/java/forestry/apiculture/genetics/BeeVariation.java index 13ad09b0f..686e38a47 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeVariation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeVariation.java @@ -41,7 +41,7 @@ public abstract class BeeVariation implements IBeeDefinition { @Override public final ItemStack getMemberStack(EnumBeeType beeType) { IBee bee = getIndividual(); - return BeeManager.beeRoot.getMemberStack(bee, beeType.ordinal()); + return BeeManager.beeRoot.getMemberStack(bee, beeType); } public static class RainResist extends BeeVariation { diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index 7bd5cdcbe..e49f333a3 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -108,7 +108,7 @@ public class ItemBeeGE extends ItemGE { continue; } - ItemStack beeStack = BeeManager.beeRoot.getMemberStack(bee, type.ordinal()); + ItemStack beeStack = BeeManager.beeRoot.getMemberStack(bee, type); if (beeStack != null) { itemList.add(beeStack); } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java index 28aec24ed..fa4205855 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java @@ -77,7 +77,7 @@ public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.B ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(pollen.getClass()); - ItemStack pollenStack = speciesRoot.getMemberStack(pollen, EnumGermlingType.POLLEN.ordinal()); + ItemStack pollenStack = speciesRoot.getMemberStack(pollen, EnumGermlingType.POLLEN); if (pollenStack != null) { inventory.storePollenStack(pollenStack); return true; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index 32e1b7a8f..37ac793ba 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -93,7 +93,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, // Queue swarm spawn IBee princess = BeeManager.beeRoot.getMember(princessStack); princess.setIsNatural(false); - pendingSpawns.push(BeeManager.beeRoot.getMemberStack(princess, EnumBeeType.PRINCESS.ordinal())); + pendingSpawns.push(BeeManager.beeRoot.getMemberStack(princess, EnumBeeType.PRINCESS)); } @Override diff --git a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java index 04c908408..1ab5907af 100755 --- a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java @@ -334,7 +334,7 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { private static ItemStack getRandomVillageBeeStack(World world, BlockPos pos, EnumBeeType beeType) { IBee randomVillageBee = getRandomVillageBee(world, pos); - return BeeManager.beeRoot.getMemberStack(randomVillageBee, beeType.ordinal()); + return BeeManager.beeRoot.getMemberStack(randomVillageBee, beeType); } private static IBee getRandomVillageBee(World world, BlockPos pos) { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index db673456f..a9d7154c8 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -159,7 +159,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP for (ITree sapling : saplings) { if (sapling != null) { - prod.add(TreeManager.treeRoot.getMemberStack(sapling, EnumGermlingType.SAPLING.ordinal())); + prod.add(TreeManager.treeRoot.getMemberStack(sapling, EnumGermlingType.SAPLING)); } } @@ -315,8 +315,8 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP ItemStack heldItem = player.getHeldItem(); TileEntity tile = world.getTileEntity(pos); IButterfly caterpillar = tile instanceof TileLeaves ? ((TileLeaves) tile).getCaterpillar() : null; - if (heldItem != null && heldItem.getItem() instanceof IToolScoop && caterpillar != null) { - ItemStack butterfly = ButterflyManager.butterflyRoot.getMemberStack(caterpillar, EnumFlutterType.CATERPILLAR.ordinal()); + if (heldItem != null && (heldItem.getItem() instanceof IToolScoop) && caterpillar != null) { + ItemStack butterfly = ButterflyManager.butterflyRoot.getMemberStack(caterpillar, EnumFlutterType.CATERPILLAR); ItemStackUtil.dropItemStackAsEntity(butterfly, world, pos); ((TileLeaves) tile).setCaterpillar(null); return true; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java index 6da644611..d20fcd19f 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java @@ -157,7 +157,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat if (sapling == null || sapling.getTree() == null) { return null; } - return TreeManager.treeRoot.getMemberStack(sapling.getTree(), EnumGermlingType.SAPLING.ordinal()); + return TreeManager.treeRoot.getMemberStack(sapling.getTree(), EnumGermlingType.SAPLING); } @Override @@ -178,7 +178,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat TileSapling sapling = getSaplingTile(world, pos); if (sapling != null && sapling.getTree() != null) { - ItemStack saplingStack = TreeManager.treeRoot.getMemberStack(sapling.getTree(), EnumGermlingType.SAPLING.ordinal()); + ItemStack saplingStack = TreeManager.treeRoot.getMemberStack(sapling.getTree(), EnumGermlingType.SAPLING); ItemStackUtil.dropItemStackAsEntity(saplingStack, world, pos); } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index bd620271d..65cf7d3cb 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -1104,7 +1104,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe @Override public final ItemStack getMemberStack(EnumGermlingType treeType) { ITree tree = getIndividual(); - return TreeManager.treeRoot.getMemberStack(tree, treeType.ordinal()); + return TreeManager.treeRoot.getMemberStack(tree, treeType); } public static void preInit() { diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java index 252173c23..edd7033f8 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -52,6 +52,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesType; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.blocks.BlockFruitPod; import forestry.arboriculture.blocks.BlockSapling; @@ -107,8 +108,8 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { } @Override - public boolean isMember(ItemStack stack, int type) { - return getType(stack).ordinal() == type; + public boolean isMember(ItemStack stack, ISpeciesType type) { + return getType(stack) == type; } @Override @@ -134,6 +135,11 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { return null; } + @Override + public EnumGermlingType getIconType() { + return EnumGermlingType.SAPLING; + } + @Override public ITree getTree(World world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); @@ -167,13 +173,16 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { } @Override - public ItemStack getMemberStack(IIndividual tree, int type) { + public ItemStack getMemberStack(IIndividual tree, ISpeciesType type) { if (!isMember(tree)) { return null; } + if (!(type instanceof EnumGermlingType)) { + return null; + } Item germlingItem; - switch (EnumGermlingType.VALUES[type]) { + switch ((EnumGermlingType) type) { case SAPLING: germlingItem = PluginArboriculture.items.sapling; break; diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index b8219481d..6adb9a1ee 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -103,7 +103,7 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { continue; } - itemList.add(TreeManager.treeRoot.getMemberStack(individual, type.ordinal())); + itemList.add(TreeManager.treeRoot.getMemberStack(individual, type)); } } diff --git a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java index abc45ebaf..57aad2c24 100755 --- a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java @@ -28,6 +28,7 @@ import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesType; import forestry.core.config.Constants; import forestry.core.genetics.mutations.EnumMutateChance; import forestry.core.gui.buttons.GuiBetterButton; @@ -55,7 +56,7 @@ public class GuiNaturalistInventory extends GuiForestry