mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 04:52:26 +00:00
Use ISpeciesType instead of a raw int
This commit is contained in:
1 parent
9c81817baa
commit
ddbc5e96f1
27 files changed
+80
-51
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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<Container, IPagedInvento
|
||||
ySize = 202;
|
||||
|
||||
for (IIndividual individual : speciesRoot.getIndividualTemplates()) {
|
||||
iconStacks.put(individual.getIdent(), speciesRoot.getMemberStack(individual, 0));
|
||||
iconStacks.put(individual.getIdent(), speciesRoot.getMemberStack(individual, speciesRoot.getIconType()));
|
||||
}
|
||||
|
||||
breedingTracker = speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile());
|
||||
|
||||
@@ -73,7 +73,7 @@ public class EscritoireGameBoard implements INbtWritable, IStreamable {
|
||||
|
||||
for (int i = 0; i < tokenCount / 2; i++) {
|
||||
IIndividual token = root.templateAsIndividual(root.getRandomTemplate(rand));
|
||||
ItemStack pair = root.getMemberStack(token, 0);
|
||||
ItemStack pair = root.getMemberStack(token, root.getIconType());
|
||||
gameTokens.add(new EscritoireGameToken(pair));
|
||||
gameTokens.add(new EscritoireGameToken(pair));
|
||||
}
|
||||
|
||||
@@ -188,7 +188,7 @@ public class GeneticsUtil {
|
||||
return null;
|
||||
}
|
||||
|
||||
ItemStack ersatz = TreeManager.treeRoot.getMemberStack(tree, EnumGermlingType.SAPLING.ordinal());
|
||||
ItemStack ersatz = TreeManager.treeRoot.getMemberStack(tree, EnumGermlingType.SAPLING);
|
||||
ersatz.stackSize = foreign.stackSize;
|
||||
return ersatz;
|
||||
}
|
||||
|
||||
@@ -381,7 +381,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
|
||||
if (!worldObj.isRemote) {
|
||||
IButterflyRoot root = contained.getGenome().getPrimary().getRoot();
|
||||
ILepidopteristTracker tracker = root.getBreedingTracker(worldObj, player.getGameProfile());
|
||||
ItemStack itemStack = root.getMemberStack(contained.copy(), EnumFlutterType.BUTTERFLY.ordinal());
|
||||
ItemStack itemStack = root.getMemberStack(contained.copy(), EnumFlutterType.BUTTERFLY);
|
||||
|
||||
tracker.registerCatch(contained);
|
||||
ItemStackUtil.dropItemStackAsEntity(itemStack, worldObj, posX, posY, posZ);
|
||||
@@ -403,7 +403,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
|
||||
IIndividual pollen = getPollen();
|
||||
if (pollen != null) {
|
||||
ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(pollen.getClass());
|
||||
ItemStack pollenStack = root.getMemberStack(pollen, EnumGermlingType.POLLEN.ordinal());
|
||||
ItemStack pollenStack = root.getMemberStack(pollen, EnumGermlingType.POLLEN);
|
||||
ItemStackUtil.dropItemStackAsEntity(pollenStack, worldObj, posX, posY, posZ);
|
||||
}
|
||||
}
|
||||
@@ -513,6 +513,6 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
|
||||
IButterflyRoot root = species.getRoot();
|
||||
IAllele[] template = root.getTemplate(species.getUID());
|
||||
IButterfly butterfly = root.templateAsIndividual(template);
|
||||
return root.getMemberStack(butterfly, EnumFlutterType.BUTTERFLY.ordinal());
|
||||
return root.getMemberStack(butterfly, EnumFlutterType.BUTTERFLY);
|
||||
}
|
||||
}
|
||||
@@ -363,6 +363,6 @@ public enum ButterflyDefinition implements IButterflyDefinition {
|
||||
@Override
|
||||
public final ItemStack getMemberStack(EnumFlutterType flutterType) {
|
||||
IButterfly butterfly = getIndividual();
|
||||
return ButterflyManager.butterflyRoot.getMemberStack(butterfly, flutterType.ordinal());
|
||||
return ButterflyManager.butterflyRoot.getMemberStack(butterfly, flutterType);
|
||||
}
|
||||
}
|
||||
@@ -23,11 +23,13 @@ import net.minecraft.world.World;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
import forestry.api.arboriculture.EnumGermlingType;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
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.api.lepidopterology.ButterflyManager;
|
||||
import forestry.api.lepidopterology.EnumButterflyChromosome;
|
||||
import forestry.api.lepidopterology.EnumFlutterType;
|
||||
@@ -98,8 +100,13 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isMember(ItemStack stack, int type) {
|
||||
return getType(stack).ordinal() == type;
|
||||
public EnumFlutterType getIconType() {
|
||||
return EnumFlutterType.BUTTERFLY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isMember(ItemStack stack, ISpeciesType type) {
|
||||
return getType(stack) == type;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -125,10 +132,13 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getMemberStack(IIndividual butterfly, int type) {
|
||||
public ItemStack getMemberStack(IIndividual butterfly, ISpeciesType type) {
|
||||
if (!(type instanceof EnumFlutterType)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Item butterflyItem;
|
||||
switch (EnumFlutterType.VALUES[type]) {
|
||||
switch ((EnumFlutterType) type) {
|
||||
case SERUM:
|
||||
butterflyItem = PluginLepidopterology.items.serumGE;
|
||||
break;
|
||||
|
||||
@@ -108,6 +108,6 @@ public enum MothDefinition implements IButterflyDefinition {
|
||||
@Override
|
||||
public final ItemStack getMemberStack(EnumFlutterType flutterType) {
|
||||
IButterfly butterfly = getIndividual();
|
||||
return ButterflyManager.butterflyRoot.getMemberStack(butterfly, flutterType.ordinal());
|
||||
return ButterflyManager.butterflyRoot.getMemberStack(butterfly, flutterType);
|
||||
}
|
||||
}
|
||||
@@ -152,7 +152,7 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt
|
||||
|
||||
@Override
|
||||
public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) {
|
||||
return new ItemStack[]{getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM.ordinal())};
|
||||
return new ItemStack[]{getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM)};
|
||||
}
|
||||
|
||||
/* OTHER */
|
||||
|
||||
@@ -95,7 +95,7 @@ public class ItemButterflyGE extends ItemGE {
|
||||
continue;
|
||||
}
|
||||
|
||||
itemList.add(ButterflyManager.butterflyRoot.getMemberStack(individual, type.ordinal()));
|
||||
itemList.add(ButterflyManager.butterflyRoot.getMemberStack(individual, type));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ public class MatingRecipe implements IRecipe {
|
||||
private ItemStack cached;
|
||||
|
||||
public MatingRecipe() {
|
||||
unknown = ButterflyManager.butterflyRoot.getMemberStack(ButterflyManager.butterflyRoot.getIndividualTemplates().get(0), EnumFlutterType.BUTTERFLY.ordinal());
|
||||
unknown = ButterflyManager.butterflyRoot.getMemberStack(ButterflyManager.butterflyRoot.getIndividualTemplates().get(0), EnumFlutterType.BUTTERFLY);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -36,11 +36,11 @@ public class MatingRecipe implements IRecipe {
|
||||
int sera = 0;
|
||||
|
||||
for (int i = 0; i < crafting.getSizeInventory(); i++) {
|
||||
if (ButterflyManager.butterflyRoot.isMember(crafting.getStackInSlot(i), EnumFlutterType.BUTTERFLY.ordinal())) {
|
||||
if (ButterflyManager.butterflyRoot.isMember(crafting.getStackInSlot(i), EnumFlutterType.BUTTERFLY)) {
|
||||
butterflies++;
|
||||
mated = ButterflyManager.butterflyRoot.isMated(crafting.getStackInSlot(i));
|
||||
cached = crafting.getStackInSlot(i);
|
||||
} else if (ButterflyManager.butterflyRoot.isMember(crafting.getStackInSlot(i), EnumFlutterType.SERUM.ordinal())) {
|
||||
} else if (ButterflyManager.butterflyRoot.isMember(crafting.getStackInSlot(i), EnumFlutterType.SERUM)) {
|
||||
sera++;
|
||||
}
|
||||
}
|
||||
@@ -62,9 +62,9 @@ public class MatingRecipe implements IRecipe {
|
||||
IButterfly butterfly = null;
|
||||
IButterfly serum = null;
|
||||
for (int i = 0; i < crafting.getSizeInventory(); i++) {
|
||||
if (ButterflyManager.butterflyRoot.isMember(crafting.getStackInSlot(i), EnumFlutterType.BUTTERFLY.ordinal())) {
|
||||
if (ButterflyManager.butterflyRoot.isMember(crafting.getStackInSlot(i), EnumFlutterType.BUTTERFLY)) {
|
||||
butterfly = ButterflyManager.butterflyRoot.getMember(crafting.getStackInSlot(i));
|
||||
} else if (ButterflyManager.butterflyRoot.isMember(crafting.getStackInSlot(i), EnumFlutterType.SERUM.ordinal())) {
|
||||
} else if (ButterflyManager.butterflyRoot.isMember(crafting.getStackInSlot(i), EnumFlutterType.SERUM)) {
|
||||
serum = ButterflyManager.butterflyRoot.getMember(crafting.getStackInSlot(i));
|
||||
}
|
||||
}
|
||||
@@ -74,7 +74,7 @@ public class MatingRecipe implements IRecipe {
|
||||
|
||||
IButterfly mated = butterfly.copy();
|
||||
mated.mate(serum);
|
||||
return ButterflyManager.butterflyRoot.getMemberStack(mated, EnumFlutterType.BUTTERFLY.ordinal());
|
||||
return ButterflyManager.butterflyRoot.getMemberStack(mated, EnumFlutterType.BUTTERFLY);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user