diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index cb54b0b48..25aa0b3b6 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -41,7 +41,6 @@ import forestry.api.genetics.IIndividual; import forestry.apiculture.network.packets.PacketBeeLogicActive; import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity; import forestry.core.config.Constants; -import forestry.core.config.ForestryItem; import forestry.core.errors.EnumErrorCode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; @@ -169,9 +168,9 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { errorLogic.setCondition(!hasSpace, EnumErrorCode.NO_SPACE_INVENTORY); ItemStack queenStack = beeInventory.getQueen(); - + EnumBeeType beeType = BeeManager.beeRoot.getType(queenStack); // check if we're breeding - if (ForestryItem.beePrincessGE.isItemEqual(queenStack)) { + if (beeType == EnumBeeType.PRINCESS) { boolean hasDrone = BeeManager.beeRoot.isDrone(beeInventory.getDrone()); errorLogic.setCondition(!hasDrone, EnumErrorCode.NO_DRONE); @@ -179,7 +178,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { return !errorLogic.hasErrors(); } - if (ForestryItem.beeQueenGE.isItemEqual(queenStack)) { + if (beeType == EnumBeeType.QUEEN) { if (!isQueenAlive(queenStack)) { IBee dyingQueen = BeeManager.beeRoot.getMember(queenStack); Collection spawned = killQueen(dyingQueen, housing, beeListener); @@ -218,7 +217,8 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { public void doWork() { IBeeHousingInventory beeInventory = housing.getBeeInventory(); ItemStack queenStack = beeInventory.getQueen(); - if (ForestryItem.beePrincessGE.isItemEqual(queenStack)) { + EnumBeeType beeType = BeeManager.beeRoot.getType(queenStack); + if (beeType == EnumBeeType.PRINCESS) { tickBreed(); } else { queenWorkTick(queen); @@ -303,7 +303,9 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { ItemStack droneStack = beeInventory.getDrone(); ItemStack princessStack = beeInventory.getQueen(); - if (!ForestryItem.beeDroneGE.isItemEqual(droneStack) || !ForestryItem.beePrincessGE.isItemEqual(princessStack)) { + EnumBeeType droneType = BeeManager.beeRoot.getType(droneStack); + EnumBeeType princessType = BeeManager.beeRoot.getType(princessStack); + if (droneType != EnumBeeType.DRONE || princessType != EnumBeeType.PRINCESS) { beeProgress = 0; return; } @@ -322,7 +324,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { NBTTagCompound nbttagcompound = new NBTTagCompound(); princess.writeToNBT(nbttagcompound); - queenStack = ForestryItem.beeQueenGE.getItemStack(); + queenStack = new ItemStack(PluginApiculture.items.beeQueenGE); queenStack.setTagCompound(nbttagcompound); beeInventory.setQueen(queenStack); @@ -359,7 +361,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { } else { Log.warning("Tried to spawn offspring off an unmated queen. Devolving her to a princess."); - ItemStack convert = ForestryItem.beePrincessGE.getItemStack(); + ItemStack convert = new ItemStack(PluginApiculture.items.beePrincessGE); NBTTagCompound nbttagcompound = new NBTTagCompound(); queen.writeToNBT(nbttagcompound); convert.setTagCompound(nbttagcompound); diff --git a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java index 15609f647..e14117da6 100755 --- a/src/main/java/forestry/apiculture/VillageHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java @@ -30,12 +30,11 @@ import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import forestry.api.apiculture.EnumBeeType; import forestry.apiculture.genetics.BeeDefinition; -import forestry.apiculture.items.ItemHoneycomb; import forestry.apiculture.worldgen.ComponentVillageBeeHouse; import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; import forestry.core.utils.Log; +import forestry.plugins.PluginApiculture; public class VillageHandlerApiculture implements IVillageCreationHandler, IVillageTradeHandler { @@ -50,11 +49,11 @@ public class VillageHandlerApiculture implements IVillageCreationHandler, IVilla @SuppressWarnings("unchecked") @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { - recipeList.add(new MerchantRecipe(ForestryItem.beePrincessGE.getItemStack(1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.emerald, 1))); - recipeList.add(new MerchantRecipe(new ItemStack(Items.wheat, 2), ItemHoneycomb.getRandomComb(1, random, false))); + recipeList.add(new MerchantRecipe(new ItemStack(PluginApiculture.items.beePrincessGE, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.emerald, 1))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.wheat, 2), PluginApiculture.items.beeComb.getRandomComb(1, random, false))); recipeList.add(new MerchantRecipe(new ItemStack(Blocks.log, 24, OreDictionary.WILDCARD_VALUE), ForestryBlock.apiculture.getItemStack(1, Constants.DEFINITION_APIARY_META))); - recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 1), ForestryItem.frameProven.getItemStack(6))); - recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 12), ForestryItem.beePrincessGE.getItemStack(1, OreDictionary.WILDCARD_VALUE), BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 1), PluginApiculture.items.frameProven.getItemStack(6))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 12), new ItemStack(PluginApiculture.items.beePrincessGE, 1, OreDictionary.WILDCARD_VALUE), BeeDefinition.MONASTIC.getMemberStack(EnumBeeType.DRONE))); } @Override diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java index 361e4d756..832cbe66c 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java @@ -31,9 +31,9 @@ import forestry.apiculture.inventory.InventoryApiary; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.GuiId; +import forestry.plugins.PluginApiculture; public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implements IApiary { private static final IBeeModifier beeModifier = new ApiaryBeeModifier(); @@ -86,7 +86,7 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement @Override public ItemStack getCartItem() { - return ForestryItem.minecartBeehouse.getItemStack(1, 1); + return PluginApiculture.items.minecartBeehouse.getApiaryMinecart(); } @Override diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java index 981d9dde9..4c8354fea 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java @@ -26,9 +26,9 @@ import forestry.apiculture.InventoryBeeHousing; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.GuiId; +import forestry.plugins.PluginApiculture; public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase { private static final IBeeModifier beeModifier = new BeehouseBeeModifier(); @@ -68,7 +68,7 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase { @Override public ItemStack getCartItem() { - return ForestryItem.minecartBeehouse.getItemStack(1, 0); + return PluginApiculture.items.minecartBeehouse.getBeeHouseMinecart(); } /* IBeeHousing */ diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index 5ba5478ac..b009395b6 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -33,9 +33,11 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.apiculture.genetics.alleles.AlleleEffect; -import forestry.core.config.ForestryItem; +import forestry.apiculture.items.EnumHoneyComb; +import forestry.apiculture.items.EnumPollenCluster; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; +import forestry.plugins.PluginApiculture; import forestry.plugins.PluginCore; public enum BeeDefinition implements IBeeDefinition { @@ -43,7 +45,7 @@ public enum BeeDefinition implements IBeeDefinition { FOREST(BeeBranchDefinition.HONEY, "nigrocincta", true, new Color(0x19d0ec), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 0), 0.30f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f); } @Override @@ -60,7 +62,7 @@ public enum BeeDefinition implements IBeeDefinition { MEADOWS(BeeBranchDefinition.HONEY, "florea", true, new Color(0xef131e), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 0), 0.30f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f); } @Override @@ -76,7 +78,7 @@ public enum BeeDefinition implements IBeeDefinition { COMMON(BeeBranchDefinition.HONEY, "cerana", true, new Color(0xb2b2b2), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 0), 0.35f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.35f); } @Override @@ -98,7 +100,7 @@ public enum BeeDefinition implements IBeeDefinition { CULTIVATED(BeeBranchDefinition.HONEY, "mellifera", true, new Color(0x5734ec), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 0), 0.40f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f); } @Override @@ -119,7 +121,7 @@ public enum BeeDefinition implements IBeeDefinition { NOBLE(BeeBranchDefinition.NOBLE, "nobilis", false, new Color(0xec9a19), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 5), 0.20f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f); } @Override @@ -137,7 +139,7 @@ public enum BeeDefinition implements IBeeDefinition { MAJESTIC(BeeBranchDefinition.NOBLE, "regalis", true, new Color(0x7f0000), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 5), 0.30f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.30f); } @Override @@ -155,8 +157,8 @@ public enum BeeDefinition implements IBeeDefinition { IMPERIAL(BeeBranchDefinition.NOBLE, "imperatorius", false, new Color(0xa3e02f), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 5), 0.20f) - .addProduct(ForestryItem.royalJelly.getItemStack(), 0.15f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f) + .addProduct(PluginApiculture.items.royalJelly.getItemStack(), 0.15f) .setHasEffect(); } @@ -177,7 +179,7 @@ public enum BeeDefinition implements IBeeDefinition { DILIGENT(BeeBranchDefinition.INDUSTRIOUS, "sedulus", false, new Color(0xc219ec), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 3), 0.20f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f); } @Override @@ -195,7 +197,7 @@ public enum BeeDefinition implements IBeeDefinition { UNWEARY(BeeBranchDefinition.INDUSTRIOUS, "assiduus", true, new Color(0x19ec5a), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 3), 0.30f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.30f); } @Override @@ -212,8 +214,8 @@ public enum BeeDefinition implements IBeeDefinition { INDUSTRIOUS(BeeBranchDefinition.INDUSTRIOUS, "industria", false, new Color(0xffffff), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 3), 0.20f) - .addProduct(ForestryItem.pollenCluster.getItemStack(), 0.15f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f) + .addProduct(PluginApiculture.items.pollenCluster.get(EnumPollenCluster.NORMAL, 1), 0.15f) .setHasEffect(); } @@ -234,7 +236,7 @@ public enum BeeDefinition implements IBeeDefinition { STEADFAST(BeeBranchDefinition.HEROIC, "legio", false, new Color(0x4d2b15), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 1), 0.20f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.20f) .setHasEffect(); } @@ -254,7 +256,7 @@ public enum BeeDefinition implements IBeeDefinition { VALIANT(BeeBranchDefinition.HEROIC, "centurio", true, new Color(0x626bdd), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 1), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.30f) .addSpecialty(new ItemStack(Items.sugar), 0.15f); } @@ -274,7 +276,7 @@ public enum BeeDefinition implements IBeeDefinition { HEROIC(BeeBranchDefinition.HEROIC, "kraphti", false, new Color(0xb3d5e4), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 1), 0.40f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.40f) .setHasEffect(); } @@ -298,7 +300,7 @@ public enum BeeDefinition implements IBeeDefinition { SINISTER(BeeBranchDefinition.INFERNAL, "caecus", false, new Color(0xb3d5e4), new Color(0x9a2323)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 2), 0.45f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f) .setTemperature(EnumTemperature.HELLISH) .setHumidity(EnumHumidity.ARID); } @@ -321,7 +323,7 @@ public enum BeeDefinition implements IBeeDefinition { FIENDISH(BeeBranchDefinition.INFERNAL, "diabolus", true, new Color(0xd7bee5), new Color(0x9a2323)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 2), 0.55f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f) .addProduct(PluginCore.items.ash.getItemStack(), 0.15f) .setTemperature(EnumTemperature.HELLISH) .setHumidity(EnumHumidity.ARID); @@ -345,7 +347,7 @@ public enum BeeDefinition implements IBeeDefinition { DEMONIC(BeeBranchDefinition.INFERNAL, "draco", false, new Color(0xf4e400), new Color(0x9a2323)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 2), 0.45f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f) .addProduct(new ItemStack(Items.glowstone_dust), 0.15f) .setHasEffect() .setTemperature(EnumTemperature.HELLISH) @@ -370,7 +372,7 @@ public enum BeeDefinition implements IBeeDefinition { MODEST(BeeBranchDefinition.AUSTERE, "modicus", false, new Color(0xc5be86), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 7), 0.20f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f) .setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @@ -389,7 +391,7 @@ public enum BeeDefinition implements IBeeDefinition { FRUGAL(BeeBranchDefinition.AUSTERE, "permodestus", true, new Color(0xe8dcb1), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 7), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.30f) .setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @@ -413,8 +415,8 @@ public enum BeeDefinition implements IBeeDefinition { AUSTERE(BeeBranchDefinition.AUSTERE, "correpere", false, new Color(0xfffac2), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 7), 0.20f) - .addSpecialty(ForestryItem.beeComb.getItemStack(1, 10), 0.50f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f) + .addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.POWDERY, 1), 0.50f) .setHasEffect() .setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); @@ -440,7 +442,7 @@ public enum BeeDefinition implements IBeeDefinition { TROPICAL(BeeBranchDefinition.TROPICAL, "mendelia", false, new Color(0x378020), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 6), 0.20f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f) .setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @@ -459,7 +461,7 @@ public enum BeeDefinition implements IBeeDefinition { EXOTIC(BeeBranchDefinition.TROPICAL, "darwini", true, new Color(0x304903), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 6), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f) .setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @@ -478,7 +480,7 @@ public enum BeeDefinition implements IBeeDefinition { EDENIC(BeeBranchDefinition.TROPICAL, "humboldti", false, new Color(0x393d0d), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 6), 0.20f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f) .setHasEffect() .setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); @@ -502,7 +504,7 @@ public enum BeeDefinition implements IBeeDefinition { ENDED(BeeBranchDefinition.END, "notchi", false, new Color(0xe079fa), new Color(0xd9de9e)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 8), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.30f) .setTemperature(EnumTemperature.COLD); } @@ -519,7 +521,7 @@ public enum BeeDefinition implements IBeeDefinition { SPECTRAL(BeeBranchDefinition.END, "idolum", true, new Color(0xa98bed), new Color(0xd9de9e)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 8), 0.50f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.50f) .setTemperature(EnumTemperature.COLD); } @@ -536,7 +538,7 @@ public enum BeeDefinition implements IBeeDefinition { PHANTASMAL(BeeBranchDefinition.END, "lemur", false, new Color(0xcc00fa), new Color(0xd9de9e)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 8), 0.40f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.40f) .setHasEffect() .setTemperature(EnumTemperature.COLD); } @@ -558,7 +560,7 @@ public enum BeeDefinition implements IBeeDefinition { WINTRY(BeeBranchDefinition.FROZEN, "brumalis", false, new Color(0xa0ffc8), new Color(0xdaf5f3)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 4), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) .setTemperature(EnumTemperature.ICY); } @@ -577,7 +579,7 @@ public enum BeeDefinition implements IBeeDefinition { ICY(BeeBranchDefinition.FROZEN, "coagulis", true, new Color(0xa0ffff), new Color(0xdaf5f3)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 4), 0.20f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f) .addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY); } @@ -597,7 +599,7 @@ public enum BeeDefinition implements IBeeDefinition { GLACIAL(BeeBranchDefinition.FROZEN, "glacialis", false, new Color(0xefffff), new Color(0xdaf5f3)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 4), 0.20f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f) .addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.40f) .setTemperature(EnumTemperature.ICY) .setHasEffect(); @@ -620,7 +622,7 @@ public enum BeeDefinition implements IBeeDefinition { VINDICTIVE(BeeBranchDefinition.VENGEFUL, "ultio", false, new Color(0xeafff3), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 9), 0.25f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.25f) .setIsNotCounted(); } @@ -638,7 +640,7 @@ public enum BeeDefinition implements IBeeDefinition { VENGEFUL(BeeBranchDefinition.VENGEFUL, "punire", false, new Color(0xc2de00), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 9), 0.40f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f) .setIsNotCounted(); } @@ -657,7 +659,7 @@ public enum BeeDefinition implements IBeeDefinition { AVENGING(BeeBranchDefinition.VENGEFUL, "hostimentum", false, new Color(0xddff00), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 9), 0.40f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f) .setHasEffect() .setIsNotCounted(); } @@ -679,7 +681,7 @@ public enum BeeDefinition implements IBeeDefinition { LEPORINE(BeeBranchDefinition.FESTIVE, "lepus", false, new Color(0xfeff8f), new Color(0x3cd757)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 6), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f) .addProduct(new ItemStack(Items.egg), 0.10f) .setHasEffect() .setIsNotCounted(); @@ -701,7 +703,7 @@ public enum BeeDefinition implements IBeeDefinition { MERRY(BeeBranchDefinition.FESTIVE, "feliciter", false, new Color(0xffffff), new Color(0xd40000)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 4), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) .addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY) .setHasEffect() @@ -725,7 +727,7 @@ public enum BeeDefinition implements IBeeDefinition { TIPSY(BeeBranchDefinition.FESTIVE, "ebrius", false, new Color(0xffffff), new Color(0xc219ec)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 4), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) .addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY) .setHasEffect() @@ -750,7 +752,7 @@ public enum BeeDefinition implements IBeeDefinition { TRICKY(BeeBranchDefinition.FESTIVE, "libita", false, new Color(0x49413B), new Color(0xFF6A00)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 0), 0.40f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f) .addProduct(new ItemStack(Items.cookie), 0.15f) .addSpecialty(new ItemStack(Items.skull, 1, 0), 0.02f) .addSpecialty(new ItemStack(Items.skull, 1, 2), 0.02f) @@ -780,7 +782,7 @@ public enum BeeDefinition implements IBeeDefinition { RURAL(BeeBranchDefinition.AGRARIAN, "rustico", false, new Color(0xfeff8f), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 14), 0.20f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.20f); } @Override @@ -797,7 +799,7 @@ public enum BeeDefinition implements IBeeDefinition { FARMERLY(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xD39728), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 14), 0.27f); + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.27f); } @Override @@ -815,7 +817,7 @@ public enum BeeDefinition implements IBeeDefinition { AGRARIAN(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xFFCA75), new Color(0xFFE047)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 14), 0.35f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.35f) .setHasEffect(); } @@ -838,7 +840,7 @@ public enum BeeDefinition implements IBeeDefinition { MARSHY(BeeBranchDefinition.BOGGY, "adorasti", true, new Color(0x546626), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 15), 0.30f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.30f) .setHumidity(EnumHumidity.DAMP); } @@ -855,7 +857,7 @@ public enum BeeDefinition implements IBeeDefinition { MIRY(BeeBranchDefinition.BOGGY, "humidium", true, new Color(0x92AF42), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 15), 0.36f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.36f) .setHumidity(EnumHumidity.DAMP); } @@ -876,7 +878,7 @@ public enum BeeDefinition implements IBeeDefinition { BOGGY(BeeBranchDefinition.BOGGY, "paluster", true, new Color(0x698948), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 15), 0.39f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.39f) .addSpecialty(PluginCore.items.peat.getItemStack(), 0.08f) .setHumidity(EnumHumidity.DAMP); } @@ -901,8 +903,8 @@ public enum BeeDefinition implements IBeeDefinition { MONASTIC(BeeBranchDefinition.MONASTIC, "monachus", false, new Color(0x42371c), new Color(0xfff7b6)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 14), 0.30f) - .addSpecialty(ForestryItem.beeComb.getItemStack(1, 16), 0.10f) + beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.30f) + .addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.10f) .setJubilanceProvider(new JubilanceProviderHermit()); } @@ -919,7 +921,7 @@ public enum BeeDefinition implements IBeeDefinition { SECLUDED(BeeBranchDefinition.MONASTIC, "contractus", true, new Color(0x7b6634), new Color(0xfff7b6)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addSpecialty(ForestryItem.beeComb.getItemStack(1, 16), 0.20f) + beeSpecies.addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f) .setJubilanceProvider(new JubilanceProviderHermit()); } @@ -936,7 +938,7 @@ public enum BeeDefinition implements IBeeDefinition { HERMITIC(BeeBranchDefinition.MONASTIC, "anachoreta", false, new Color(0xffd46c), new Color(0xfff7b6)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addSpecialty(ForestryItem.beeComb.getItemStack(1, 16), 0.20f) + beeSpecies.addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f) .setJubilanceProvider(new JubilanceProviderHermit()) .setHasEffect(); } diff --git a/src/main/java/forestry/apiculture/genetics/BeeHelper.java b/src/main/java/forestry/apiculture/genetics/BeeHelper.java index 4ceef865a..d42621c23 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeHelper.java +++ b/src/main/java/forestry/apiculture/genetics/BeeHelper.java @@ -48,7 +48,6 @@ 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; import forestry.plugins.PluginApiculture; @@ -108,20 +107,20 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { Item beeItem; switch (EnumBeeType.VALUES[type]) { case QUEEN: - beeItem = ForestryItem.beeQueenGE.item(); + beeItem = PluginApiculture.items.beeQueenGE; // ensure a queen is always mated if (bee.getMate() == null) { bee.mate(bee); } break; case PRINCESS: - beeItem = ForestryItem.beePrincessGE.item(); + beeItem = PluginApiculture.items.beePrincessGE; break; case DRONE: - beeItem = ForestryItem.beeDroneGE.item(); + beeItem = PluginApiculture.items.beeDroneGE; break; case LARVAE: - beeItem = ForestryItem.beeLarvaeGE.item(); + beeItem = PluginApiculture.items.beeLarvaeGE; break; default: throw new RuntimeException("Cannot instantiate a bee of type " + type); @@ -140,13 +139,15 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { return EnumBeeType.NONE; } - if (ForestryItem.beeDroneGE.isItemEqual(stack)) { + Item item = stack.getItem(); + + if (PluginApiculture.items.beeDroneGE == item) { return EnumBeeType.DRONE; - } else if (ForestryItem.beePrincessGE.isItemEqual(stack)) { + } else if (PluginApiculture.items.beePrincessGE == item) { return EnumBeeType.PRINCESS; - } else if (ForestryItem.beeQueenGE.isItemEqual(stack)) { + } else if (PluginApiculture.items.beeQueenGE == item) { return EnumBeeType.QUEEN; - } else if (ForestryItem.beeLarvaeGE.isItemEqual(stack)) { + } else if (PluginApiculture.items.beeLarvaeGE == item) { return EnumBeeType.LARVAE; } diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index bf05555b5..bdf93cbc7 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -25,13 +25,12 @@ import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; import forestry.apiculture.genetics.BeeGenome; import forestry.apiculture.inventory.ItemInventoryBeealyzer; -import forestry.apiculture.items.ItemBeeGE; -import forestry.core.config.ForestryItem; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.utils.StringUtil; +import forestry.plugins.PluginApiculture; public class GuiBeealyzer extends GuiAlyzer { @@ -39,7 +38,7 @@ public class GuiBeealyzer extends GuiAlyzer { super(BeeManager.beeRoot, player, new ContainerAlyzer(inventory, player), inventory, "gui.beealyzer"); ArrayList beeList = new ArrayList<>(); - ((ItemBeeGE) ForestryItem.beeDroneGE.item()).addCreativeItems(beeList, false); + PluginApiculture.items.beeDroneGE.addCreativeItems(beeList, false); for (ItemStack beeStack : beeList) { IAlleleBeeSpecies species = BeeGenome.getSpecies(beeStack); if (species != null) { diff --git a/src/main/java/forestry/apiculture/gui/GuiImprinter.java b/src/main/java/forestry/apiculture/gui/GuiImprinter.java index d92ec97a0..e068470f8 100755 --- a/src/main/java/forestry/apiculture/gui/GuiImprinter.java +++ b/src/main/java/forestry/apiculture/gui/GuiImprinter.java @@ -21,14 +21,13 @@ import net.minecraft.item.ItemStack; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.apiculture.genetics.BeeGenome; import forestry.apiculture.inventory.ItemInventoryImprinter; -import forestry.apiculture.items.ItemBeeGE; import forestry.core.config.Constants; -import forestry.core.config.ForestryItem; import forestry.core.gui.GuiForestry; import forestry.core.gui.GuiUtil; import forestry.core.network.packets.PacketGuiSelectRequest; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; +import forestry.plugins.PluginApiculture; public class GuiImprinter extends GuiForestry { @@ -44,7 +43,7 @@ public class GuiImprinter extends GuiForestry beeList = new ArrayList<>(); - ((ItemBeeGE) ForestryItem.beeDroneGE.item()).addCreativeItems(beeList, false); + PluginApiculture.items.beeDroneGE.addCreativeItems(beeList, false); for (ItemStack beeStack : beeList) { IAlleleBeeSpecies species = BeeGenome.getSpecies(beeStack); if (species != null) { diff --git a/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java b/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java index 6cf089d26..fdfe7c8ca 100644 --- a/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java +++ b/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java @@ -27,10 +27,10 @@ import forestry.api.core.IErrorState; import forestry.apiculture.items.HabitatLocatorLogic; import forestry.apiculture.items.ItemHabitatLocator; import forestry.core.config.Config; -import forestry.core.config.ForestryItem; import forestry.core.errors.EnumErrorCode; import forestry.core.gui.IHintSource; import forestry.core.inventory.ItemInventory; +import forestry.plugins.PluginApiculture; public class ItemInventoryHabitatLocator extends ItemInventory implements IErrorSource, IHintSource { @@ -51,7 +51,8 @@ public class ItemInventoryHabitatLocator extends ItemInventory implements IError return false; } - return ForestryItem.honeyDrop.isItemEqual(itemstack) || ForestryItem.honeydew.isItemEqual(itemstack); + Item item = itemstack.getItem(); + return PluginApiculture.items.honeyDrop == item || PluginApiculture.items.honeydew == item; } @Override @@ -119,8 +120,7 @@ public class ItemInventoryHabitatLocator extends ItemInventory implements IError @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { if (slotIndex == SLOT_ENERGY) { - Item item = itemStack.getItem(); - return item == ForestryItem.honeydew.item() || item == ForestryItem.honeyDrop.item(); + return isEnergy(itemStack); } else if (slotIndex == SLOT_SPECIMEN) { return BeeManager.beeRoot.isMember(itemStack); } diff --git a/src/main/java/forestry/apiculture/items/EnumHoneyComb.java b/src/main/java/forestry/apiculture/items/EnumHoneyComb.java new file mode 100644 index 000000000..31b53cf7e --- /dev/null +++ b/src/main/java/forestry/apiculture/items/EnumHoneyComb.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.items; + +import java.awt.Color; +import java.util.Locale; + +public enum EnumHoneyComb { + HONEY(new Color(0xe8d56a), new Color(0xffa12b)), + COCOA(new Color(0x674016), new Color(0xffb62b), true), + SIMMERING(new Color(0x981919), new Color(0xffb62b)), + STRINGY(new Color(0xc8be67), new Color(0xbda93e)), + FROZEN(new Color(0xf9ffff), new Color(0xa0ffff)), + DRIPPING(new Color(0xdc7613), new Color(0xffff00)), + SILKY(new Color(0x508907), new Color(0xddff00)), + PARCHED(new Color(0xdcbe13), new Color(0xffff00)), + MYSTERIOUS(new Color(0x161616), new Color(0xe099ff), true), + IRRADIATED(new Color(0xeafff3), new Color(0xeeff00), true), + POWDERY(new Color(0xe4e4e4), new Color(0xffffff), true), + REDDENED(new Color(0x4b0000), new Color(0x6200e7), true), + DARKENED(new Color(0x353535), new Color(0x33ebcb), true), + OMEGA(new Color(0x191919), new Color(0x6dcff6), true), + WHEATEN(new Color(0xfeff8f), new Color(0xffffff), true), + MOSSY(new Color(0x2a3313), new Color(0x7e9939)), + MELLOW(new Color(0x886000), new Color(0xfff960)); + //""(new Color(0xd7bee5), new Color(0xfd58ab)); // kindof pinkish + + public static final EnumHoneyComb[] VALUES = values(); + + public final String name; + public final int primaryColor; + public final int secondaryColor; + private final boolean secret; + + EnumHoneyComb(Color primary, Color secondary) { + this(primary, secondary, false); + } + + EnumHoneyComb(Color primary, Color secondary, boolean secret) { + this.name = toString().toLowerCase(Locale.ENGLISH); + this.primaryColor = primary.getRGB(); + this.secondaryColor = secondary.getRGB(); + this.secret = secret; + } + + public boolean isSecret() { + return secret; + } +} diff --git a/src/main/java/forestry/apiculture/items/EnumHoneyDrop.java b/src/main/java/forestry/apiculture/items/EnumHoneyDrop.java new file mode 100644 index 000000000..0a2ae32ec --- /dev/null +++ b/src/main/java/forestry/apiculture/items/EnumHoneyDrop.java @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.items; + +import java.awt.Color; +import java.util.Locale; + +import forestry.core.items.ItemOverlay; + +public enum EnumHoneyDrop implements ItemOverlay.IOverlayInfo { + HONEY(new Color(0xecb42d), new Color(0xe8c814)), + CHARGED(new Color(0x800505), new Color(0x9c0707), true), + OMEGA(new Color(0x191919), new Color(0x4a8ca7), true); + + public static final EnumHoneyDrop[] VALUES = values(); + + private final String name; + private final int primaryColor; + private final int secondaryColor; + private final boolean secret; + + EnumHoneyDrop(Color primary, Color secondary) { + this(primary, secondary, false); + } + + EnumHoneyDrop(Color primary, Color secondary, boolean secret) { + this.name = toString().toLowerCase(Locale.ENGLISH); + this.primaryColor = primary.getRGB(); + this.secondaryColor = secondary.getRGB(); + this.secret = secret; + } + + @Override + public String getName() { + return name; + } + + @Override + public int getPrimaryColor() { + return primaryColor; + } + + @Override + public int getSecondaryColor() { + return secondaryColor; + } + + @Override + public boolean isSecret() { + return secret; + } +} diff --git a/src/main/java/forestry/apiculture/items/EnumPollenCluster.java b/src/main/java/forestry/apiculture/items/EnumPollenCluster.java new file mode 100644 index 000000000..4db65e489 --- /dev/null +++ b/src/main/java/forestry/apiculture/items/EnumPollenCluster.java @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.items; + +import java.awt.Color; +import java.util.Locale; + +import forestry.core.items.ItemOverlay; + +public enum EnumPollenCluster implements ItemOverlay.IOverlayInfo { + NORMAL(new Color(0xa28a25), new Color(0xa28a25)), + CRYSTALLINE(new Color(0xffffff), new Color(0xc5feff)); + + public static final EnumPollenCluster[] VALUES = values(); + + private final String name; + private final int primaryColor; + private final int secondaryColor; + + EnumPollenCluster(Color primary, Color secondary) { + this.name = toString().toLowerCase(Locale.ENGLISH); + this.primaryColor = primary.getRGB(); + this.secondaryColor = secondary.getRGB(); + } + + @Override + public String getName() { + return name; + } + + @Override + public int getPrimaryColor() { + return primaryColor; + } + + @Override + public int getSecondaryColor() { + return secondaryColor; + } + + @Override + public boolean isSecret() { + return false; + } +} diff --git a/src/main/java/forestry/apiculture/items/EnumPropolis.java b/src/main/java/forestry/apiculture/items/EnumPropolis.java new file mode 100644 index 000000000..b12cdf140 --- /dev/null +++ b/src/main/java/forestry/apiculture/items/EnumPropolis.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.items; + +import java.awt.Color; +import java.util.Locale; + +import forestry.core.items.ItemOverlay; + +public enum EnumPropolis implements ItemOverlay.IOverlayInfo { + NORMAL(new Color(0xc5b24e)), + STICKY(new Color(0xc68e57)), + PULSATING(new Color(0x2ccdb1), true), + SILKY(new Color(0xddff00)); + + public static final EnumPropolis[] VALUES = values(); + + private final String name; + private final int primaryColor; + private final boolean secret; + + EnumPropolis(Color color) { + this(color, false); + } + + EnumPropolis(Color color, boolean secret) { + this.name = toString().toLowerCase(Locale.ENGLISH); + this.primaryColor = color.getRGB(); + this.secret = secret; + } + + @Override + public String getName() { + return name; + } + + @Override + public int getPrimaryColor() { + return primaryColor; + } + + @Override + public int getSecondaryColor() { + return 0; + } + + @Override + public boolean isSecret() { + return secret; + } +} diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index bc2d202d1..fc3db834d 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -25,9 +25,9 @@ import forestry.api.apiculture.IArmorApiarist; import forestry.api.core.IArmorNaturalist; import forestry.api.core.Tabs; import forestry.core.config.Constants; -import forestry.core.config.ForestryItem; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; +import forestry.plugins.PluginApiculture; public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArmorNaturalist { @@ -39,7 +39,7 @@ public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArm @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - if (ForestryItem.apiaristLegs.isItemEqual(stack)) { + if (stack != null && stack.getItem() == PluginApiculture.items.apiaristLegs) { return Constants.ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_SECONDARY; } else { return Constants.ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_PRIMARY; diff --git a/src/main/java/forestry/apiculture/items/ItemHoneycomb.java b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java index c18eb25c4..c2cd26a66 100755 --- a/src/main/java/forestry/apiculture/items/ItemHoneycomb.java +++ b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java @@ -20,51 +20,9 @@ import net.minecraft.item.ItemStack; import forestry.api.core.Tabs; import forestry.core.config.Config; -import forestry.core.config.ForestryItem; import forestry.core.items.ItemForestryMultiPass; public class ItemHoneycomb extends ItemForestryMultiPass { - - private static class CombInfo { - - public final String name; - public final int primaryColor; - public final int secondaryColor; - public boolean isSecret = false; - - public CombInfo(String name, int primaryColor, int secondaryColor) { - this.name = name; - this.primaryColor = primaryColor; - this.secondaryColor = secondaryColor; - } - - public CombInfo setIsSecret() { - this.isSecret = true; - return this; - } - } - - private final CombInfo[] combs = new CombInfo[]{ - new CombInfo("honey", 0xe8d56a, 0xffa12b), // 0 - new CombInfo("cocoa", 0x674016, 0xffb62b).setIsSecret(), // 1 - new CombInfo("simmering", 0x981919, 0xffb62b), // 2 - new CombInfo("stringy", 0xc8be67, 0xbda93e), // 3 - new CombInfo("frozen", 0xf9ffff, 0xa0ffff), // 4 - new CombInfo("dripping", 0xdc7613, 0xffff00), // 5 - new CombInfo("silky", 0x508907, 0xddff00), // 6 - new CombInfo("parched", 0xdcbe13, 0xffff00), // 7 - new CombInfo("mysterious", 0x161616, 0xe099ff).setIsSecret(), // 8 - new CombInfo("irradiated", 0xeafff3, 0xeeff00).setIsSecret(), // 9 - new CombInfo("powdery", 0xe4e4e4, 0xffffff).setIsSecret(), // 10 - new CombInfo("reddened", 0x4b0000, 0x6200e7).setIsSecret(), // 11 - new CombInfo("darkened", 0x353535, 0x33ebcb).setIsSecret(), // 12 - new CombInfo("omega", 0x191919, 0x6dcff6).setIsSecret(), // 13 - new CombInfo("wheaten", 0xfeff8f, 0xffffff).setIsSecret(), // 14 - new CombInfo("mossy", 0x2a3313, 0x7e9939), // 15 - new CombInfo("mellow", 0x886000, 0xfff960) // 16 - // new CombInfo("", 0xd7bee5, 0xfd58ab), // kindof pinkish - }; - public ItemHoneycomb() { super(); setMaxDamage(0); @@ -84,44 +42,53 @@ public class ItemHoneycomb extends ItemForestryMultiPass { @Override public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + "." + combs[stack.getItemDamage()].name; + EnumHoneyComb honeyComb = EnumHoneyComb.VALUES[stack.getItemDamage()]; + return super.getUnlocalizedName(stack) + "." + honeyComb.name; } @Override public int getColorFromItemStack(ItemStack itemstack, int j) { + EnumHoneyComb honeyComb = EnumHoneyComb.VALUES[itemstack.getItemDamage()]; if (j == 0) { - return combs[itemstack.getItemDamage()].primaryColor; + return honeyComb.primaryColor; } else { - return combs[itemstack.getItemDamage()].secondaryColor; + return honeyComb.secondaryColor; } } @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - for (int i = 0; i < combs.length; i++) { - if (!combs[i].isSecret || Config.isDebug) { + for (int i = 0; i < EnumHoneyComb.VALUES.length; i++) { + EnumHoneyComb honeyComb = EnumHoneyComb.VALUES[i]; + if (!honeyComb.isSecret() || Config.isDebug) { itemList.add(new ItemStack(this, 1, i)); } } } - private int getRandomCombType(Random random, boolean includeSecret) { - List validCombs = new ArrayList<>(combs.length); - for (int i = 0; i < combs.length; i++) { - if (!combs[i].isSecret || includeSecret) { - validCombs.add(i); + private static EnumHoneyComb getRandomCombType(Random random, boolean includeSecret) { + List validCombs = new ArrayList<>(EnumHoneyComb.VALUES.length); + for (int i = 0; i < EnumHoneyComb.VALUES.length; i++) { + EnumHoneyComb honeyComb = EnumHoneyComb.VALUES[i]; + if (!honeyComb.isSecret() || includeSecret) { + validCombs.add(honeyComb); } } if (validCombs.isEmpty()) { - return 0; + return null; } else { return validCombs.get(random.nextInt(validCombs.size())); } } - public static ItemStack getRandomComb(int qty, Random random, boolean includeSecret) { - return ForestryItem.beeComb.getItemStack(qty, ((ItemHoneycomb) ForestryItem.beeComb.item()).getRandomCombType(random, includeSecret)); + public ItemStack getRandomComb(int amount, Random random, boolean includeSecret) { + EnumHoneyComb honeyComb = getRandomCombType(random, includeSecret); + return get(honeyComb, amount); + } + + public ItemStack get(EnumHoneyComb honeyComb, int amount) { + return new ItemStack(this, amount, honeyComb.ordinal()); } } diff --git a/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java b/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java index dfc5c1285..fbfb482e4 100644 --- a/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java @@ -105,4 +105,12 @@ public class ItemMinecartBeehouse extends ItemMinecart { itemList.add(new ItemStack(this, 1, i)); } } + + public ItemStack getBeeHouseMinecart() { + return new ItemStack(this, 1, 0); + } + + public ItemStack getApiaryMinecart() { + return new ItemStack(this, 1, 1); + } } diff --git a/src/main/java/forestry/apiculture/items/ItemPollenCluster.java b/src/main/java/forestry/apiculture/items/ItemPollenCluster.java new file mode 100644 index 000000000..dd08cf65d --- /dev/null +++ b/src/main/java/forestry/apiculture/items/ItemPollenCluster.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.items; + +import net.minecraft.item.ItemStack; + +import forestry.api.core.Tabs; +import forestry.core.items.ItemOverlay; + +public class ItemPollenCluster extends ItemOverlay { + public ItemPollenCluster() { + super(Tabs.tabApiculture, EnumPollenCluster.VALUES); + } + + public ItemStack get(EnumPollenCluster pollenCluster, int amount) { + return new ItemStack(this, amount, pollenCluster.ordinal()); + } +} diff --git a/src/main/java/forestry/apiculture/items/ItemPropolis.java b/src/main/java/forestry/apiculture/items/ItemPropolis.java new file mode 100644 index 000000000..585400343 --- /dev/null +++ b/src/main/java/forestry/apiculture/items/ItemPropolis.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.items; + +import net.minecraft.item.ItemStack; + +import forestry.api.core.Tabs; +import forestry.core.items.ItemOverlay; + +public class ItemPropolis extends ItemOverlay { + public ItemPropolis() { + super(Tabs.tabApiculture, EnumPropolis.VALUES); + } + + public ItemStack get(EnumPropolis propolis, int amount) { + return new ItemStack(this, amount, propolis.ordinal()); + } +} diff --git a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java new file mode 100644 index 000000000..05873026c --- /dev/null +++ b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java @@ -0,0 +1,104 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.items; + +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.apiculture.EnumBeeType; +import forestry.api.core.Tabs; +import forestry.core.items.ItemForestry; +import forestry.core.items.ItemOverlay; +import forestry.core.items.ItemRegistry; +import forestry.core.items.ItemScoop; +import forestry.core.items.ItemWithGui; +import forestry.core.network.GuiId; + +public class ItemRegistryApiculture extends ItemRegistry { + public final ItemBeeGE beeQueenGE; + public final ItemBeeGE beeDroneGE; + public final ItemBeeGE beePrincessGE; + public final ItemBeeGE beeLarvaeGE; + + public final ItemHabitatLocator habitatLocator; + public final ItemWithGui beealyzer; + public final ItemWithGui imprinter; + + public final ItemMinecartBeehouse minecartBeehouse; + + public final ItemHiveFrame frameUntreated; + public final ItemHiveFrame frameImpregnated; + public final ItemHiveFrame frameProven; + + public final ItemOverlay honeyDrop; + public final ItemPollenCluster pollenCluster; + public final ItemPropolis propolis; + public final ItemForestry honeydew; + public final ItemForestry royalJelly; + public final ItemForestry waxCast; + public final ItemHoneycomb beeComb; + + public final ItemArmorApiarist apiaristHat; + public final ItemArmorApiarist apiaristChest; + public final ItemArmorApiarist apiaristLegs; + public final ItemArmorApiarist apiaristBoots; + + public final ItemScoop scoop; + + public ItemRegistryApiculture() { + // / BEES + beeQueenGE = registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "beeQueenGE"); + beeDroneGE = registerItem(new ItemBeeGE(EnumBeeType.DRONE), "beeDroneGE"); + beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "beePrincessGE"); + beeLarvaeGE = registerItem(new ItemBeeGE(EnumBeeType.LARVAE), "beeLarvaeGE"); + + beealyzer = registerItem(new ItemWithGui(GuiId.BeealyzerGUI, Tabs.tabApiculture), "beealyzer"); + habitatLocator = registerItem(new ItemHabitatLocator(), "habitatLocator"); + imprinter = registerItem(new ItemWithGui(GuiId.ImprinterGUI, Tabs.tabApiculture), "imprinter"); + + minecartBeehouse = registerItem(new ItemMinecartBeehouse(), "cart.beehouse"); + + // / COMB FRAMES + frameUntreated = registerItem(new ItemHiveFrame(80, 0.9f), "frameUntreated"); + frameImpregnated = registerItem(new ItemHiveFrame(240, 0.4f), "frameImpregnated"); + frameProven = registerItem(new ItemHiveFrame(720, 0.3f), "frameProven"); + + // / BEE RESOURCES + honeyDrop = registerItem(new ItemOverlay(Tabs.tabApiculture, EnumHoneyDrop.VALUES), "honeyDrop"); + OreDictionary.registerOre("dropHoney", honeyDrop); + + pollenCluster = registerItem(new ItemPollenCluster(), "pollen"); + OreDictionary.registerOre("itemPollen", pollenCluster); + + propolis = registerItem(new ItemPropolis(), "propolis"); + + honeydew = registerItem(new ItemForestry(Tabs.tabApiculture), "honeydew"); + OreDictionary.registerOre("dropHoneydew", honeydew); + + royalJelly = registerItem(new ItemForestry(Tabs.tabApiculture), "royalJelly"); + OreDictionary.registerOre("dropRoyalJelly", royalJelly); + + waxCast = registerItem(new ItemWaxCast(), "waxCast"); + + // / BEE COMBS + beeComb = registerItem(new ItemHoneycomb(), "beeCombs"); + OreDictionary.registerOre("beeComb", beeComb.getWildcard()); + + // / APIARIST'S CLOTHES + apiaristHat = registerItem(new ItemArmorApiarist(0), "apiaristHelmet"); + apiaristChest = registerItem(new ItemArmorApiarist(1), "apiaristChest"); + apiaristLegs = registerItem(new ItemArmorApiarist(2), "apiaristLegs"); + apiaristBoots = registerItem(new ItemArmorApiarist(3), "apiaristBoots"); + + // TOOLS + scoop = registerItem(new ItemScoop(), "scoop"); + scoop.setHarvestLevel("scoop", 3); + } +} diff --git a/src/main/java/forestry/apiculture/items/ItemWaxCast.java b/src/main/java/forestry/apiculture/items/ItemWaxCast.java index 411b3a7ba..b2a2170bf 100755 --- a/src/main/java/forestry/apiculture/items/ItemWaxCast.java +++ b/src/main/java/forestry/apiculture/items/ItemWaxCast.java @@ -12,13 +12,14 @@ package forestry.apiculture.items; import net.minecraft.item.ItemStack; +import forestry.api.core.Tabs; import forestry.core.items.ICraftingPlan; import forestry.core.items.ItemForestry; public class ItemWaxCast extends ItemForestry implements ICraftingPlan { public ItemWaxCast() { - super(); + super(Tabs.tabApiculture); setMaxStackSize(1); setMaxDamage(10); setNoRepair(); diff --git a/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java index 05050cc42..15c18c8c7 100644 --- a/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java @@ -17,7 +17,6 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import forestry.apiculture.entities.EntityBee; import forestry.apiculture.render.RenderBeeEntity; import forestry.apiculture.render.RenderBeeItem; -import forestry.core.config.ForestryItem; import forestry.core.render.IBlockRenderer; import forestry.core.render.RenderAnalyzer; import forestry.plugins.PluginApiculture; @@ -29,9 +28,9 @@ public class ProxyApicultureClient extends ProxyApiculture { if (PluginApiculture.fancyRenderedBees) { RenderingRegistry.registerEntityRenderingHandler(EntityBee.class, new RenderBeeEntity()); - MinecraftForgeClient.registerItemRenderer(ForestryItem.beeDroneGE.item(), new RenderBeeItem()); - MinecraftForgeClient.registerItemRenderer(ForestryItem.beePrincessGE.item(), new RenderBeeItem()); - MinecraftForgeClient.registerItemRenderer(ForestryItem.beeQueenGE.item(), new RenderBeeItem()); + MinecraftForgeClient.registerItemRenderer(PluginApiculture.items.beeDroneGE, new RenderBeeItem()); + MinecraftForgeClient.registerItemRenderer(PluginApiculture.items.beePrincessGE, new RenderBeeItem()); + MinecraftForgeClient.registerItemRenderer(PluginApiculture.items.beeQueenGE, new RenderBeeItem()); } } diff --git a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java index 0115034c9..984316d65 100755 --- a/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java @@ -47,10 +47,10 @@ import forestry.arboriculture.worldgen.BlockTypeWood; import forestry.arboriculture.worldgen.BlockTypeWoodStairs; import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; import forestry.core.worldgen.BlockType; import forestry.core.worldgen.BlockTypeTileForestry; import forestry.core.worldgen.IBlockType; +import forestry.plugins.PluginApiculture; import forestry.plugins.PluginManager; public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { @@ -313,11 +313,11 @@ public class ComponentVillageBeeHouse extends StructureVillagePieces.House1 { private static ItemStack getRandomFrame(Random random) { float roll = random.nextFloat(); if (roll < 0.2f) { - return ForestryItem.frameUntreated.getItemStack(); + return PluginApiculture.items.frameUntreated.getItemStack(); } else if (roll < 0.4f) { - return ForestryItem.frameImpregnated.getItemStack(); + return PluginApiculture.items.frameImpregnated.getItemStack(); } else if (roll < 0.6) { - return ForestryItem.frameProven.getItemStack(); + return PluginApiculture.items.frameProven.getItemStack(); } else { return null; } diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index b5f5eb19e..e7b8ff3e0 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -128,12 +128,12 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { @Override public int getRenderPasses(int metadata) { - return 2;//type == EnumGermlingType.SAPLING ? 1 : 2; + return type == EnumGermlingType.SAPLING ? 1 : 2; } @Override public int getSpriteNumber() { - return type == EnumGermlingType.SAPLING ? SpriteSheet.BLOCKS.getSheetOrdinal() : SpriteSheet.ITEMS.getSheetOrdinal(); + return SpriteSheet.BLOCKS.getSheetOrdinal(); } @Override diff --git a/src/main/java/forestry/arboriculture/render/IconProviderGermling.java b/src/main/java/forestry/arboriculture/render/IconProviderGermling.java index 227d5af31..0d3da9e1b 100644 --- a/src/main/java/forestry/arboriculture/render/IconProviderGermling.java +++ b/src/main/java/forestry/arboriculture/render/IconProviderGermling.java @@ -15,7 +15,6 @@ import net.minecraft.util.IIcon; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.core.config.ForestryItem; import forestry.core.render.TextureManager; public class IconProviderGermling implements IGermlingIconProvider { @@ -23,6 +22,7 @@ public class IconProviderGermling implements IGermlingIconProvider { private final String name; private IIcon icon; + private IIcon[] pollenIcons; public IconProviderGermling(String uid) { this.name = uid.substring("forestry.".length()); @@ -31,12 +31,15 @@ public class IconProviderGermling implements IGermlingIconProvider { @Override public void registerIcons(IIconRegister register) { icon = TextureManager.registerTex(register, "germlings/sapling." + name); + pollenIcons = new IIcon[2]; + pollenIcons[0] = TextureManager.registerTex(register, "germlings/pollen.0"); + pollenIcons[1] = TextureManager.registerTex(register, "germlings/pollen.1"); } @Override public IIcon getIcon(EnumGermlingType type, int renderPass) { if (type == EnumGermlingType.POLLEN) { - return ForestryItem.pollenCluster.item().getIconFromDamageForRenderPass(0, renderPass); + return pollenIcons[renderPass]; } return icon; diff --git a/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java b/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java index c02b188bd..95440e410 100644 --- a/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java +++ b/src/main/java/forestry/arboriculture/render/IconProviderGermlingVanilla.java @@ -16,12 +16,13 @@ import net.minecraft.util.IIcon; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.core.config.ForestryItem; +import forestry.core.render.TextureManager; public class IconProviderGermlingVanilla implements IGermlingIconProvider { private final int vanillaMap; private IIcon icon; + private IIcon[] pollenIcons; public IconProviderGermlingVanilla(int vanillaMap) { this.vanillaMap = vanillaMap; @@ -30,12 +31,15 @@ public class IconProviderGermlingVanilla implements IGermlingIconProvider { @Override public void registerIcons(IIconRegister register) { icon = Blocks.sapling.getIcon(0, vanillaMap); + pollenIcons = new IIcon[2]; + pollenIcons[0] = TextureManager.registerTex(register, "germlings/pollen.0"); + pollenIcons[1] = TextureManager.registerTex(register, "germlings/pollen.1"); } @Override public IIcon getIcon(EnumGermlingType type, int renderPass) { if (type == EnumGermlingType.POLLEN) { - return ForestryItem.pollenCluster.item().getIconFromDamageForRenderPass(0, renderPass); + return pollenIcons[renderPass]; } return icon; diff --git a/src/main/java/forestry/core/config/Constants.java b/src/main/java/forestry/core/config/Constants.java index 53551775c..c0f07844c 100644 --- a/src/main/java/forestry/core/config/Constants.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -29,6 +29,7 @@ public class Constants implements IForestryConstants { public static final int[] FACINGS = {0, 1, 2, 3, 4, 5}; public static final int[] SLOTS_NONE = new int[0]; + public static final String[] EMPTY_STRINGS = new String[0]; // Textures public static final String TEXTURE_PATH_GUI = "textures/gui"; diff --git a/src/main/java/forestry/core/config/ForestryItem.java b/src/main/java/forestry/core/config/ForestryItem.java index 5768f18b2..0e1c18913 100755 --- a/src/main/java/forestry/core/config/ForestryItem.java +++ b/src/main/java/forestry/core/config/ForestryItem.java @@ -44,32 +44,11 @@ public enum ForestryItem { stamps, letters, catalogue, - // mailIndicator, - // Carpenter crate, - habitatLocator, - // Bees - beeQueenGE, - beeDroneGE, - beePrincessGE, - beeLarvaeGE, - beealyzer, - imprinter, - honeyDrop, - scoop, - pollenCluster, - propolis, - honeydew, - royalJelly, honeyedSlice, ambrosia, honeyPot, - waxCast, - frameUntreated, - frameImpregnated, - frameProven, - minecartBeehouse, // Trees sapling, pollenFertile, @@ -85,13 +64,6 @@ public enum ForestryItem { // Beverages beverage, infuser, - // Apiarist's Armor - apiaristHat, - apiaristChest, - apiaristLegs, - apiaristBoots, - // Combs - beeComb, // Backpacks apiaristBackpack, lepidopteristBackpack, diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index d8be0798a..fea7c438d 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -13,6 +13,7 @@ package forestry.core.genetics.alleles; import java.util.Collection; import java.util.Map; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -30,8 +31,10 @@ import forestry.api.genetics.IAlleleSpeciesCustom; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; -import forestry.core.config.ForestryItem; +import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.utils.ItemStackUtil; +import forestry.plugins.PluginApiculture; +import forestry.plugins.PluginManager; public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCustom { @@ -66,13 +69,19 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust return 0f; } - if (ForestryItem.honeyDrop.isItemEqual(itemstack)) { - return 0.5f; - } else if (ForestryItem.honeydew.isItemEqual(itemstack)) { - return 0.7f; - } else if (ForestryItem.beeComb.isItemEqual(itemstack)) { - return 0.4f; - } else if (getRoot().isMember(itemstack)) { + ItemRegistryApiculture beeItems = PluginApiculture.items; + if (beeItems != null) { + Item item = itemstack.getItem(); + if (beeItems.honeyDrop == item) { + return 0.5f; + } else if (beeItems.honeydew == item) { + return 0.7f; + } else if (beeItems.beeComb == item) { + return 0.4f; + } + } + + if (getRoot().isMember(itemstack)) { return 1.0f; } diff --git a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java index 4cd3e7d55..8759c5458 100644 --- a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java +++ b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java @@ -13,6 +13,7 @@ package forestry.core.inventory; import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -21,8 +22,10 @@ import forestry.api.core.IErrorState; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import forestry.core.config.ForestryItem; +import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.errors.EnumErrorCode; +import forestry.plugins.PluginApiculture; +import forestry.plugins.PluginManager; public abstract class ItemInventoryAlyzer extends ItemInventory implements IErrorSource { public static final int SLOT_SPECIMEN = 0; @@ -80,9 +83,11 @@ public abstract class ItemInventoryAlyzer extends ItemInventory implements IErro // Analyze if necessary if (!individual.isAnalyzed()) { - // Requires energy - if (!isEnergy(getStackInSlot(SLOT_ENERGY))) { - return; + if (PluginManager.Module.APICULTURE.isEnabled()) { + // Requires energy + if (!isEnergy(getStackInSlot(SLOT_ENERGY))) { + return; + } } individual.analyze(); @@ -124,7 +129,13 @@ public abstract class ItemInventoryAlyzer extends ItemInventory implements IErro return false; } - return ForestryItem.honeyDrop.isItemEqual(itemstack) || ForestryItem.honeydew.isItemEqual(itemstack); + ItemRegistryApiculture beeItems = PluginApiculture.items; + if (beeItems == null) { + return false; + } + + Item item = itemstack.getItem(); + return beeItems.honeyDrop == item || beeItems.honeydew == item; } private boolean hasSpecimen() { diff --git a/src/main/java/forestry/core/items/EnumElectronTube.java b/src/main/java/forestry/core/items/EnumElectronTube.java index 524ede9c1..b54cae8e6 100644 --- a/src/main/java/forestry/core/items/EnumElectronTube.java +++ b/src/main/java/forestry/core/items/EnumElectronTube.java @@ -12,7 +12,7 @@ package forestry.core.items; import java.awt.Color; -public enum EnumElectronTube { +public enum EnumElectronTube implements ItemOverlay.IOverlayInfo { COPPER(new Color(0xe3b78e)), TIN(new Color(0xE6F8FF)), BRONZE(new Color(0xddc276)), @@ -27,22 +27,39 @@ public enum EnumElectronTube { LAPIS(new Color(0x1c57c6)), ENDER(new Color(0x33adad), new Color(0x255661)); - private final ItemOverlay.OverlayInfo overlayInfo; + public static final EnumElectronTube[] VALUES = values(); - EnumElectronTube(Color color) { - this(color, Color.WHITE); + private final String name; + private final int primaryColor; + private final int secondaryColor; + + EnumElectronTube(Color primaryColor) { + this(primaryColor, Color.WHITE); } - EnumElectronTube(Color color, Color baseColor) { - this.overlayInfo = new ItemOverlay.OverlayInfo("ex-" + ordinal(), baseColor, color); + EnumElectronTube(Color primaryColor, Color secondaryColor) { + this.name = "ex-" + ordinal(); + this.primaryColor = primaryColor.getRGB(); + this.secondaryColor = secondaryColor.getRGB(); } - public static ItemOverlay.OverlayInfo[] getAllOverlayInfo() { - EnumElectronTube[] values = values(); - ItemOverlay.OverlayInfo[] overlayInfos = new ItemOverlay.OverlayInfo[values.length]; - for (EnumElectronTube electronTube : values) { - overlayInfos[electronTube.ordinal()] = electronTube.overlayInfo; - } - return overlayInfos; + @Override + public String getName() { + return name; + } + + @Override + public int getPrimaryColor() { + return primaryColor; + } + + @Override + public int getSecondaryColor() { + return secondaryColor; + } + + @Override + public boolean isSecret() { + return false; } } diff --git a/src/main/java/forestry/core/items/ItemElectronTube.java b/src/main/java/forestry/core/items/ItemElectronTube.java index 4e47c64e9..a088c6dcf 100644 --- a/src/main/java/forestry/core/items/ItemElectronTube.java +++ b/src/main/java/forestry/core/items/ItemElectronTube.java @@ -25,6 +25,7 @@ import net.minecraft.util.EnumChatFormatting; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; +import forestry.core.CreativeTabForestry; import forestry.core.circuits.SolderManager; import forestry.core.config.Config; import forestry.core.proxy.Proxies; @@ -32,8 +33,8 @@ import forestry.core.utils.StringUtil; public class ItemElectronTube extends ItemOverlay { - public ItemElectronTube(CreativeTabs tab, OverlayInfo... overlays) { - super(tab, overlays); + public ItemElectronTube() { + super(CreativeTabForestry.tabForestry, EnumElectronTube.VALUES); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -61,7 +62,7 @@ public class ItemElectronTube extends ItemOverlay { @Override public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < overlays.length; i++) { - if (Config.isDebug || !overlays[i].isSecret) { + if (Config.isDebug || !overlays[i].isSecret()) { ItemStack itemStack = new ItemStack(this, 1, i); if (Config.isDebug || getCircuits(itemStack).size() > 0) { itemList.add(itemStack); diff --git a/src/main/java/forestry/core/items/ItemForestry.java b/src/main/java/forestry/core/items/ItemForestry.java index c722e521f..df4e3185f 100755 --- a/src/main/java/forestry/core/items/ItemForestry.java +++ b/src/main/java/forestry/core/items/ItemForestry.java @@ -11,9 +11,12 @@ package forestry.core.items; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,6 +29,10 @@ public class ItemForestry extends Item { setCreativeTab(CreativeTabForestry.tabForestry); } + public ItemForestry(CreativeTabs creativeTab) { + setCreativeTab(creativeTab); + } + @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister register) { @@ -39,4 +46,8 @@ public class ItemForestry extends Item { public ItemStack getItemStack(int amount) { return new ItemStack(this, amount); } + + public ItemStack getWildcard() { + return new ItemStack(this, 1, OreDictionary.WILDCARD_VALUE); + } } diff --git a/src/main/java/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java index d0781ef86..677960b56 100755 --- a/src/main/java/forestry/core/items/ItemOverlay.java +++ b/src/main/java/forestry/core/items/ItemOverlay.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.core.items; -import java.awt.Color; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -27,38 +26,16 @@ import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; public class ItemOverlay extends ItemForestry { - - public static class OverlayInfo { - - public final String name; - public final int primaryColor; - public final int secondaryColor; - public boolean isSecret = false; - - public OverlayInfo(String name, Color primaryColor, Color secondaryColor) { - this(name, primaryColor.getRGB(), secondaryColor.getRGB()); - } - - public OverlayInfo(String name, int primaryColor, int secondaryColor) { - this.name = name; - this.primaryColor = primaryColor; - this.secondaryColor = secondaryColor; - } - - public OverlayInfo(String name, int primaryColor) { - this(name, primaryColor, 0); - } - - public OverlayInfo setIsSecret() { - isSecret = true; - return this; - } + public interface IOverlayInfo { + String getName(); + int getPrimaryColor(); + int getSecondaryColor(); + boolean isSecret(); } - protected final OverlayInfo[] overlays; + protected final IOverlayInfo[] overlays; - public ItemOverlay(CreativeTabs tab, OverlayInfo... overlays) { - super(); + public ItemOverlay(CreativeTabs tab, IOverlayInfo... overlays) { setMaxDamage(0); setHasSubtypes(true); setCreativeTab(tab); @@ -80,7 +57,7 @@ public class ItemOverlay extends ItemForestry { @Override public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < overlays.length; i++) { - if (Config.isDebug || !overlays[i].isSecret) { + if (Config.isDebug || !overlays[i].isSecret()) { itemList.add(new ItemStack(this, 1, i)); } } @@ -96,7 +73,7 @@ public class ItemOverlay extends ItemForestry { @Override public void registerIcons(IIconRegister register) { primaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".0"); - if (overlays[0].secondaryColor != 0) { + if (overlays[0].getSecondaryColor() != 0) { secondaryIcon = TextureManager.registerTex(register, StringUtil.cleanItemName(this) + ".1"); } } @@ -104,7 +81,7 @@ public class ItemOverlay extends ItemForestry { @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamageForRenderPass(int i, int j) { - if (j > 0 && overlays[i].secondaryColor != 0) { + if (j > 0 && overlays[i].getSecondaryColor() != 0) { return secondaryIcon; } else { return primaryIcon; @@ -113,7 +90,7 @@ public class ItemOverlay extends ItemForestry { @Override public int getRenderPasses(int metadata) { - return overlays[metadata].secondaryColor != 0 ? 2 : 1; + return overlays[metadata].getSecondaryColor() != 0 ? 2 : 1; } @Override @@ -127,17 +104,16 @@ public class ItemOverlay extends ItemForestry { return null; } - return super.getUnlocalizedName(stack) + "." + overlays[stack.getItemDamage()].name; + return super.getUnlocalizedName(stack) + "." + overlays[stack.getItemDamage()].getName(); } @Override public int getColorFromItemStack(ItemStack itemstack, int j) { - - if (j == 0 || overlays[itemstack.getItemDamage()].secondaryColor == 0) { - return overlays[itemstack.getItemDamage()].primaryColor; + IOverlayInfo overlayInfo = overlays[itemstack.getItemDamage()]; + if (j == 0 || overlayInfo.getSecondaryColor() == 0) { + return overlayInfo.getPrimaryColor(); } else { - return overlays[itemstack.getItemDamage()].secondaryColor; + return overlayInfo.getSecondaryColor(); } } - } diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index f47e474ca..0a4c19b99 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -137,7 +137,7 @@ public class ItemRegistryCore extends ItemRegistry { solderingIron.setMaxDamage(5).setFull3D(); registerItem(solderingIron, "solderingIron"); - tubes = registerItem(new ItemElectronTube(CreativeTabForestry.tabForestry, EnumElectronTube.getAllOverlayInfo()), "thermionicTubes"); + tubes = registerItem(new ItemElectronTube(), "thermionicTubes"); // / CARTONS carton = registerItem(new ItemForestry(), "carton"); diff --git a/src/main/java/forestry/core/items/ItemWithGui.java b/src/main/java/forestry/core/items/ItemWithGui.java index 879f78d93..ef604223a 100644 --- a/src/main/java/forestry/core/items/ItemWithGui.java +++ b/src/main/java/forestry/core/items/ItemWithGui.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.items; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -27,6 +28,11 @@ public class ItemWithGui extends ItemForestry { setMaxStackSize(1); } + public ItemWithGui(GuiId guiId, CreativeTabs creativeTabs) { + this(guiId); + setCreativeTab(creativeTabs); + } + @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { if (!world.isRemote) { diff --git a/src/main/java/forestry/mail/items/ItemStamps.java b/src/main/java/forestry/mail/items/ItemStamps.java index b00ad3a71..bef54b03c 100755 --- a/src/main/java/forestry/mail/items/ItemStamps.java +++ b/src/main/java/forestry/mail/items/ItemStamps.java @@ -19,13 +19,17 @@ import forestry.core.items.ItemOverlay; public class ItemStamps extends ItemOverlay implements IStamps { - public static class StampInfo extends OverlayInfo { - + public static class StampInfo implements IOverlayInfo { + private final String name; + private final int primaryColor; + private final int secondaryColor; private final Object craftingIngredient; private final EnumPostage postage; public StampInfo(String name, EnumPostage postage, Object crafting, int primaryColor, int secondaryColor) { - super(name, primaryColor, secondaryColor); + this.name = name; + this.primaryColor = primaryColor; + this.secondaryColor = secondaryColor; this.craftingIngredient = crafting; this.postage = postage; } @@ -38,6 +42,25 @@ public class ItemStamps extends ItemOverlay implements IStamps { return this.craftingIngredient; } + @Override + public String getName() { + return name; + } + + @Override + public int getPrimaryColor() { + return primaryColor; + } + + @Override + public int getSecondaryColor() { + return secondaryColor; + } + + @Override + public boolean isSecret() { + return false; + } } private final StampInfo[] stampInfo; diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index ce0310a3c..9f45d2397 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -24,7 +24,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; @@ -37,6 +36,7 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.FMLCommonHandler; @@ -86,14 +86,11 @@ import forestry.apiculture.genetics.BeekeepingMode; import forestry.apiculture.genetics.HiveDrop; import forestry.apiculture.genetics.JubilanceFactory; import forestry.apiculture.genetics.alleles.AlleleEffect; -import forestry.apiculture.items.ItemArmorApiarist; -import forestry.apiculture.items.ItemBeeGE; +import forestry.apiculture.items.EnumHoneyComb; +import forestry.apiculture.items.EnumPollenCluster; +import forestry.apiculture.items.EnumPropolis; import forestry.apiculture.items.ItemBlockCandle; -import forestry.apiculture.items.ItemHabitatLocator; -import forestry.apiculture.items.ItemHiveFrame; -import forestry.apiculture.items.ItemHoneycomb; -import forestry.apiculture.items.ItemMinecartBeehouse; -import forestry.apiculture.items.ItemWaxCast; +import forestry.apiculture.items.ItemRegistryApiculture; import forestry.apiculture.multiblock.TileAlveary; import forestry.apiculture.multiblock.TileAlvearyFan; import forestry.apiculture.multiblock.TileAlvearyHeater; @@ -126,12 +123,6 @@ import forestry.core.entities.EntityFXSnow; import forestry.core.fluids.Fluids; import forestry.core.items.EnumElectronTube; import forestry.core.items.ItemBlockForestry; -import forestry.core.items.ItemForestry; -import forestry.core.items.ItemOverlay; -import forestry.core.items.ItemOverlay.OverlayInfo; -import forestry.core.items.ItemScoop; -import forestry.core.items.ItemWithGui; -import forestry.core.network.GuiId; import forestry.core.network.IPacketRegistry; import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; @@ -149,11 +140,12 @@ public class PluginApiculture extends ForestryPlugin { @SidedProxy(clientSide = "forestry.apiculture.proxy.ProxyApicultureClient", serverSide = "forestry.apiculture.proxy.ProxyApiculture") public static ProxyApiculture proxy; private static final String CONFIG_CATEGORY = "apiculture"; - private static final String[] EMPTY_STRINGS = new String[0]; public static String beekeepingMode = "NORMAL"; private static float secondPrincessChance = 0; public static final int ticksPerBeeWorkCycle = 550; public static boolean fancyRenderedBees = false; + + public static ItemRegistryApiculture items; public static HiveRegistry hiveRegistry; @@ -197,67 +189,7 @@ public class PluginApiculture extends ForestryPlugin { @Override protected void registerItemsAndBlocks() { - - // / BEES - ForestryItem.beeQueenGE.registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "beeQueenGE"); - ForestryItem.beeDroneGE.registerItem(new ItemBeeGE(EnumBeeType.DRONE), "beeDroneGE"); - ForestryItem.beePrincessGE.registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "beePrincessGE"); - ForestryItem.beeLarvaeGE.registerItem(new ItemBeeGE(EnumBeeType.LARVAE), "beeLarvaeGE"); - - Item beealyzer = new ItemWithGui(GuiId.BeealyzerGUI).setCreativeTab(Tabs.tabApiculture); - ForestryItem.beealyzer.registerItem(beealyzer, "beealyzer"); - ForestryItem.habitatLocator.registerItem(new ItemHabitatLocator(), "habitatLocator"); - Item imprinter = new ItemWithGui(GuiId.ImprinterGUI).setCreativeTab(Tabs.tabApiculture).setMaxStackSize(1); - ForestryItem.imprinter.registerItem(imprinter, "imprinter"); - - ForestryItem.minecartBeehouse.registerItem(new ItemMinecartBeehouse(), "cart.beehouse"); - - // / COMB FRAMES - ForestryItem.frameUntreated.registerItem(new ItemHiveFrame(80, 0.9f), "frameUntreated"); - ForestryItem.frameImpregnated.registerItem(new ItemHiveFrame(240, 0.4f), "frameImpregnated"); - ForestryItem.frameProven.registerItem(new ItemHiveFrame(720, 0.3f), "frameProven"); - - // / BEE RESOURCES - ForestryItem.honeyDrop.registerItem(new ItemOverlay(Tabs.tabApiculture, - new OverlayInfo("honey", 0xecb42d, 0xe8c814), - new OverlayInfo("charged", 0x800505, 0x9c0707).setIsSecret(), - new OverlayInfo("omega", 0x191919, 0x4a8ca7).setIsSecret()), "honeyDrop"); - OreDictionary.registerOre("dropHoney", ForestryItem.honeyDrop.getItemStack()); - - ForestryItem.pollenCluster.registerItem(new ItemOverlay(Tabs.tabApiculture, - new OverlayInfo("normal", 0xa28a25, 0xa28a25), - new OverlayInfo("crystalline", 0xffffff, 0xc5feff)), - "pollen"); - OreDictionary.registerOre("itemPollen", ForestryItem.pollenCluster.getItemStack()); - - ForestryItem.propolis.registerItem(new ItemOverlay(Tabs.tabApiculture, - new OverlayInfo("normal", 0xc5b24e), - new OverlayInfo("sticky", 0xc68e57), - new OverlayInfo("pulsating", 0x2ccdb1).setIsSecret(), - new OverlayInfo("silky", 0xddff00)), - "propolis"); - - ForestryItem.honeydew.registerItem(new ItemForestry().setCreativeTab(Tabs.tabApiculture), "honeydew"); - OreDictionary.registerOre("dropHoneydew", ForestryItem.honeydew.getItemStack()); - - ForestryItem.royalJelly.registerItem(new ItemForestry().setCreativeTab(Tabs.tabApiculture), "royalJelly"); - OreDictionary.registerOre("dropRoyalJelly", ForestryItem.royalJelly.getItemStack()); - - ForestryItem.waxCast.registerItem(new ItemWaxCast().setCreativeTab(Tabs.tabApiculture), "waxCast"); - - // / BEE COMBS - ForestryItem.beeComb.registerItem(new ItemHoneycomb(), "beeCombs"); - OreDictionary.registerOre("beeComb", ForestryItem.beeComb.getWildcard()); - - // / APIARIST'S CLOTHES - ForestryItem.apiaristHat.registerItem(new ItemArmorApiarist(0), "apiaristHelmet"); - ForestryItem.apiaristChest.registerItem(new ItemArmorApiarist(1), "apiaristChest"); - ForestryItem.apiaristLegs.registerItem(new ItemArmorApiarist(2), "apiaristLegs"); - ForestryItem.apiaristBoots.registerItem(new ItemArmorApiarist(3), "apiaristBoots"); - - // TOOLS - ForestryItem.scoop.registerItem(new ItemScoop(), "scoop"); - ForestryItem.scoop.item().setHarvestLevel("scoop", 3); + items = new ItemRegistryApiculture(); ForestryBlock.apiculture.registerBlock(new BlockBase(Material.iron), ItemBlockForestry.class, "apiculture"); ForestryBlock.apiculture.block().setCreativeTab(Tabs.tabApiculture); @@ -366,7 +298,7 @@ public class PluginApiculture extends ForestryPlugin { for (String flowerType : FlowerManager.flowerRegistry.getFlowerTypes()) { String[] defaultAccepted = defaultAcceptedFlowers.get(flowerType); if (defaultAccepted == null) { - defaultAccepted = EMPTY_STRINGS; + defaultAccepted = Constants.EMPTY_STRINGS; } Property property = config.get("beekeeping.flowers." + flowerType, "accepted", defaultAccepted); property.comment = acceptedFlowerMessage; @@ -374,7 +306,7 @@ public class PluginApiculture extends ForestryPlugin { String[] defaultPlantable = defaultPlantableFlowers.get(flowerType); if (defaultPlantable == null) { - defaultPlantable = EMPTY_STRINGS; + defaultPlantable = Constants.EMPTY_STRINGS; } property = config.get("beekeeping.flowers." + flowerType, "plantable", defaultPlantable); property.comment = plantableFlowerMessage; @@ -386,7 +318,7 @@ public class PluginApiculture extends ForestryPlugin { } } - String[] blacklist = config.getStringListLocalized("species", "blacklist", EMPTY_STRINGS); + String[] blacklist = config.getStringListLocalized("species", "blacklist", Constants.EMPTY_STRINGS); parseBeeBlacklist(blacklist); config.save(); @@ -402,7 +334,7 @@ public class PluginApiculture extends ForestryPlugin { registerBeehiveDrops(); // Inducers for swarmer - BeeManager.inducers.put(ForestryItem.royalJelly.getItemStack(), 10); + BeeManager.inducers.put(items.royalJelly.getItemStack(), 10); GameRegistry.registerTileEntity(TileAlvearyPlain.class, "forestry.Alveary"); GameRegistry.registerTileEntity(TileSwarm.class, "forestry.Swarm"); @@ -522,24 +454,25 @@ public class PluginApiculture extends ForestryPlugin { protected void registerCrates() { ICrateRegistry crateRegistry = StorageManager.crateRegistry; crateRegistry.registerCrate(PluginCore.items.beeswax.getItemStack(), "cratedBeeswax"); - crateRegistry.registerCrate(ForestryItem.pollenCluster.getItemStack(), "cratedPollen"); - crateRegistry.registerCrate(ForestryItem.propolis.getItemStack(), "cratedPropolis"); - crateRegistry.registerCrate(ForestryItem.honeydew.getItemStack(), "cratedHoneydew"); - crateRegistry.registerCrate(ForestryItem.royalJelly.getItemStack(), "cratedRoyalJelly"); + crateRegistry.registerCrate(items.pollenCluster.get(EnumPollenCluster.NORMAL, 1), "cratedPollen"); + crateRegistry.registerCrate(items.pollenCluster.get(EnumPollenCluster.CRYSTALLINE, 1), "cratedCrystallinePollen"); + crateRegistry.registerCrate(items.propolis.getItemStack(), "cratedPropolis"); + crateRegistry.registerCrate(items.honeydew.getItemStack(), "cratedHoneydew"); + crateRegistry.registerCrate(items.royalJelly.getItemStack(), "cratedRoyalJelly"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 0), "cratedHoneycombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 1), "cratedCocoaComb"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 2), "cratedSimmeringCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 3), "cratedStringyCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 4), "cratedFrozenCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 5), "cratedDrippingCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 6), "cratedSilkyCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 7), "cratedParchedCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 8), "cratedMysteriousCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 10), "cratedPowderyCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 14), "cratedWheatenCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 15), "cratedMossyCombs"); - crateRegistry.registerCrate(ForestryItem.beeComb.getItemStack(1, 16), "cratedMellowCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.HONEY, 1), "cratedHoneycombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.COCOA, 1), "cratedCocoaComb"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.SIMMERING, 1), "cratedSimmeringCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.STRINGY, 1), "cratedStringyCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.FROZEN, 1), "cratedFrozenCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.DRIPPING, 1), "cratedDrippingCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.SILKY, 1), "cratedSilkyCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.PARCHED, 1), "cratedParchedCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), "cratedMysteriousCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.POWDERY, 1), "cratedPowderyCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.WHEATEN, 1), "cratedWheatenCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MOSSY, 1), "cratedMossyCombs"); + crateRegistry.registerCrate(items.beeComb.get(EnumHoneyComb.MELLOW, 1), "cratedMellowCombs"); crateRegistry.registerCrate(PluginCore.items.refractoryWax.getItemStack(), "cratedRefractoryWax"); } @@ -549,54 +482,54 @@ public class PluginApiculture extends ForestryPlugin { // / APIARIST'S ARMOR ItemStack wovenSilk = PluginCore.items.craftingMaterial.getWovenSilk(); - RecipeUtil.addRecipe(ForestryItem.apiaristHat.getItemStack(), + RecipeUtil.addRecipe(items.apiaristHat, "###", "# #", '#', wovenSilk); - RecipeUtil.addRecipe(ForestryItem.apiaristChest.getItemStack(), + RecipeUtil.addRecipe(items.apiaristChest, "# #", "###", "###", '#', wovenSilk); - RecipeUtil.addRecipe(ForestryItem.apiaristLegs.getItemStack(), + RecipeUtil.addRecipe(items.apiaristLegs, "###", "# #", "# #", '#', wovenSilk); - RecipeUtil.addRecipe(ForestryItem.apiaristBoots.getItemStack(), + RecipeUtil.addRecipe(items.apiaristBoots, "# #", "# #", '#', wovenSilk); // / HABITAT LOCATOR - RecipeUtil.addRecipe(ForestryItem.habitatLocator.getItemStack(), + RecipeUtil.addRecipe(items.habitatLocator, " X ", "X#X", " X ", '#', "dustRedstone", 'X', "ingotBronze"); // Bees - RecipeUtil.addRecipe(ForestryItem.scoop.getItemStack(1), + RecipeUtil.addRecipe(items.scoop, "#X#", "###", " # ", '#', "stickWood", 'X', Blocks.wool); RecipeUtil.addRecipe(new ItemStack(Items.slime_ball), "#X#", "#X#", "#X#", - '#', ForestryItem.propolis, - 'X', ForestryItem.pollenCluster); + '#', items.propolis, + 'X', items.pollenCluster.get(EnumPollenCluster.NORMAL, 1)); RecipeUtil.addRecipe(new ItemStack(Items.speckled_melon), "#X#", "#Y#", "#X#", - '#', ForestryItem.honeyDrop, - 'X', ForestryItem.honeydew, + '#', items.honeyDrop, + 'X', items.honeydew, 'Y', Items.melon); - RecipeUtil.addRecipe(ForestryItem.frameUntreated.getItemStack(), + RecipeUtil.addRecipe(items.frameUntreated, "###", "#S#", "###", '#', "stickWood", 'S', Items.string); - RecipeUtil.addRecipe(ForestryItem.frameImpregnated.getItemStack(), + RecipeUtil.addRecipe(items.frameImpregnated, "###", "#S#", "###", '#', PluginCore.items.stickImpregnated, 'S', Items.string); - RecipeUtil.addRecipe(ForestryItem.minecartBeehouse.getItemStack(1, 0), + RecipeUtil.addRecipe(items.minecartBeehouse.getBeeHouseMinecart(), "B", "C", 'B', ForestryBlock.apiculture.getItemStack(1, Constants.DEFINITION_BEEHOUSE_META), 'C', Items.minecart); - RecipeUtil.addRecipe(ForestryItem.minecartBeehouse.getItemStack(1, 1), + RecipeUtil.addRecipe(items.minecartBeehouse.getApiaryMinecart(), "B", "C", 'B', ForestryBlock.apiculture.getItemStack(1, Constants.DEFINITION_APIARY_META), @@ -606,20 +539,20 @@ public class PluginApiculture extends ForestryPlugin { if (ForestryItem.honeyedSlice.item() != null) { RecipeUtil.addRecipe(ForestryItem.honeyedSlice.getItemStack(4), "###", "#X#", "###", - '#', ForestryItem.honeyDrop, + '#', items.honeyDrop, 'X', Items.bread); } if (ForestryItem.honeyPot.item() != null) { RecipeUtil.addRecipe(ForestryItem.honeyPot.getItemStack(1), "# #", " X ", "# #", - '#', ForestryItem.honeyDrop, + '#', items.honeyDrop, 'X', ForestryItem.waxCapsule); } if (ForestryItem.ambrosia.item() != null) { RecipeUtil.addRecipe(ForestryItem.ambrosia.getItemStack(), "#Y#", "XXX", "###", - '#', ForestryItem.honeydew, - 'X', ForestryItem.royalJelly, + '#', items.honeydew, + 'X', items.royalJelly, 'Y', ForestryItem.waxCapsule); } @@ -632,7 +565,7 @@ public class PluginApiculture extends ForestryPlugin { " # ", "XYX", " # ", '#', "dustAsh", 'X', PluginCore.items.peat, - 'Y', ForestryItem.propolis); + 'Y', items.propolis); // / TORCHES RecipeUtil.addRecipe(new ItemStack(Blocks.torch, 3), @@ -641,10 +574,10 @@ public class PluginApiculture extends ForestryPlugin { 'Y', "stickWood"); RecipeUtil.addRecipe(PluginCore.items.craftingMaterial.getPulsatingMesh(), "# #", " # ", "# #", - '#', ForestryItem.propolis.getItemStack(1, 2)); + '#', items.propolis.get(EnumPropolis.PULSATING, 1)); // / WAX CAST - RecipeUtil.addRecipe(ForestryItem.waxCast.getItemStack(), + RecipeUtil.addRecipe(items.waxCast, "###", "# #", "###", @@ -707,15 +640,17 @@ public class PluginApiculture extends ForestryPlugin { if (PluginManager.Module.FACTORY.isEnabled()) { // / SQUEEZER - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeyDrop.getItemStack()}, Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP), - ForestryItem.propolis.getItemStack(), 5); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeydew.getItemStack()}, Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{PluginCore.items.phosphor.getItemStack(2), new ItemStack(Blocks.sand)}, Fluids.LAVA.getFluid(2000)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{PluginCore.items.phosphor.getItemStack(2), new ItemStack(Blocks.sand, 1, 1)}, Fluids.LAVA.getFluid(2000)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{PluginCore.items.phosphor.getItemStack(2), new ItemStack(Blocks.dirt)}, Fluids.LAVA.getFluid(1600)); + FluidStack honeyDropFluid = Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{items.honeyDrop.getItemStack()}, honeyDropFluid, items.propolis.getItemStack(), 5); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{items.honeydew.getItemStack()}, honeyDropFluid); + + ItemStack phosphor = PluginCore.items.phosphor.getItemStack(2); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.sand)}, Fluids.LAVA.getFluid(2000)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.sand, 1, 1)}, Fluids.LAVA.getFluid(2000)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.dirt)}, Fluids.LAVA.getFluid(1600)); // / CARPENTER - RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, ForestryItem.beealyzer.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, items.beealyzer.getItemStack(), "X#X", "X#X", "RDR", '#', "paneGlass", 'X', "ingotTin", @@ -724,9 +659,9 @@ public class PluginApiculture extends ForestryPlugin { RecipeManagers.carpenterManager.addRecipe(50, Fluids.HONEY.getFluid(500), null, PluginCore.items.craftingMaterial.getScentedPaneling(), " J ", "###", "WPW", '#', "plankWood", - 'J', ForestryItem.royalJelly, + 'J', items.royalJelly, 'W', PluginCore.items.beeswax, - 'P', ForestryItem.pollenCluster); + 'P', items.pollenCluster.get(EnumPollenCluster.NORMAL, 1)); RecipeManagers.carpenterManager.addRecipe(30, Fluids.WATER.getFluid(600), null, ForestryBlock.candle.getItemStack(24), " X ", @@ -743,100 +678,100 @@ public class PluginApiculture extends ForestryPlugin { // / CENTRIFUGE // Honey combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 0), ImmutableMap.of( + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.HONEY, 1), ImmutableMap.of( PluginCore.items.beeswax.getItemStack(), 1.0f, - ForestryItem.honeyDrop.getItemStack(), 0.9f + items.honeyDrop.getItemStack(), 0.9f )); // Cocoa combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 1), ImmutableMap.of( + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.COCOA, 1), ImmutableMap.of( PluginCore.items.beeswax.getItemStack(), 1.0f, new ItemStack(Items.dye, 1, 3), 0.5f )); // Simmering combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 2), ImmutableMap.of( + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.SIMMERING, 1), ImmutableMap.of( PluginCore.items.refractoryWax.getItemStack(), 1.0f, PluginCore.items.phosphor.getItemStack(2), 0.7f )); // Stringy combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 3), ImmutableMap.of( - ForestryItem.propolis.getItemStack(), 1.0f, - ForestryItem.honeyDrop.getItemStack(), 0.4f + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.STRINGY, 1), ImmutableMap.of( + items.propolis.getItemStack(), 1.0f, + items.honeyDrop.getItemStack(), 0.4f )); // Dripping combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 5), ImmutableMap.of( - ForestryItem.honeydew.getItemStack(), 1.0f, - ForestryItem.honeyDrop.getItemStack(), 0.4f + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.DRIPPING, 1), ImmutableMap.of( + items.honeydew.getItemStack(), 1.0f, + items.honeyDrop.getItemStack(), 0.4f )); // Frozen combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 4), ImmutableMap.of( + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.FROZEN, 1), ImmutableMap.of( PluginCore.items.beeswax.getItemStack(), 0.8f, - ForestryItem.honeyDrop.getItemStack(), 0.7f, + items.honeyDrop.getItemStack(), 0.7f, new ItemStack(Items.snowball), 0.4f, - ForestryItem.pollenCluster.getItemStack(1, 1), 0.2f + items.pollenCluster.get(EnumPollenCluster.CRYSTALLINE, 1), 0.2f )); // Silky combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 6), ImmutableMap.of( - ForestryItem.honeyDrop.getItemStack(), 1.0f, - ForestryItem.propolis.getItemStack(1, 3), 0.8f + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.SILKY, 1), ImmutableMap.of( + items.honeyDrop.getItemStack(), 1.0f, + items.propolis.get(EnumPropolis.SILKY, 1), 0.8f )); // Parched combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 7), ImmutableMap.of( + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.PARCHED, 1), ImmutableMap.of( PluginCore.items.beeswax.getItemStack(), 1.0f, - ForestryItem.honeyDrop.getItemStack(), 0.9f + items.honeyDrop.getItemStack(), 0.9f )); // Mysterious combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 8), ImmutableMap.of( - ForestryItem.propolis.getItemStack(1, 2), 1.0f, - ForestryItem.honeyDrop.getItemStack(), 0.4f + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), ImmutableMap.of( + items.propolis.get(EnumPropolis.PULSATING, 1), 1.0f, + items.honeyDrop.getItemStack(), 0.4f )); // Irradiated combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 9), ImmutableMap.of( + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), ImmutableMap.of( )); // Powdery combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 10), ImmutableMap.of( - ForestryItem.honeyDrop.getItemStack(), 0.2f, + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.POWDERY, 1), ImmutableMap.of( + items.honeyDrop.getItemStack(), 0.2f, PluginCore.items.beeswax.getItemStack(), 0.2f, new ItemStack(Items.gunpowder), 0.9f )); // Wheaten Combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 14), ImmutableMap.of( - ForestryItem.honeyDrop.getItemStack(), 0.2f, + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.WHEATEN, 1), ImmutableMap.of( + items.honeyDrop.getItemStack(), 0.2f, PluginCore.items.beeswax.getItemStack(), 0.2f, new ItemStack(Items.wheat), 0.8f )); // Mossy Combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 15), ImmutableMap.of( + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.MOSSY, 1), ImmutableMap.of( PluginCore.items.beeswax.getItemStack(), 1.0f, - ForestryItem.honeyDrop.getItemStack(), 0.9f + items.honeyDrop.getItemStack(), 0.9f )); // Mellow Combs - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.beeComb.getItemStack(1, 16), ImmutableMap.of( - ForestryItem.honeydew.getItemStack(), 0.6f, + RecipeManagers.centrifugeManager.addRecipe(20, items.beeComb.get(EnumHoneyComb.MELLOW, 1), ImmutableMap.of( + items.honeydew.getItemStack(), 0.6f, PluginCore.items.beeswax.getItemStack(), 0.2f, new ItemStack(Items.quartz), 0.3f )); // Silky Propolis - RecipeManagers.centrifugeManager.addRecipe(5, ForestryItem.propolis.getItemStack(1, 3), ImmutableMap.of( + RecipeManagers.centrifugeManager.addRecipe(5, items.propolis.get(EnumPropolis.SILKY, 1), ImmutableMap.of( PluginCore.items.craftingMaterial.getSilkWisp(), 0.6f, - ForestryItem.propolis.getItemStack(), 0.1f + items.propolis.getItemStack(), 0.1f )); // / FERMENTER - RecipeManagers.fermenterManager.addRecipe(ForestryItem.honeydew.getItemStack(), 500, 1.0f, Fluids.SHORT_MEAD.getFluid(1), Fluids.HONEY.getFluid(1)); + RecipeManagers.fermenterManager.addRecipe(items.honeydew.getItemStack(), 500, 1.0f, Fluids.SHORT_MEAD.getFluid(1), Fluids.HONEY.getFluid(1)); } // ANALYZER @@ -856,7 +791,7 @@ public class PluginApiculture extends ForestryPlugin { " Y ", "X X", 'Y', PluginCore.items.sturdyCasing, - 'T', ForestryItem.beealyzer, + 'T', items.beealyzer, 'X', "ingotBronze")); recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(block, 1, meta), "XTX", @@ -869,7 +804,7 @@ public class PluginApiculture extends ForestryPlugin { } private static void registerBeehiveDrops() { - ItemStack honeyComb = ForestryItem.beeComb.getItemStack(1, 0); + ItemStack honeyComb = items.beeComb.get(EnumHoneyComb.HONEY, 1); hiveRegistry.addDrops(HiveRegistry.forest, new HiveDrop(80, BeeDefinition.FOREST, honeyComb).setIgnobleShare(0.7f), new HiveDrop(8, BeeDefinition.FOREST.getRainResist(), honeyComb), @@ -881,30 +816,30 @@ public class PluginApiculture extends ForestryPlugin { new HiveDrop(3, BeeDefinition.VALIANT, honeyComb) ); - ItemStack parchedComb = ForestryItem.beeComb.getItemStack(1, 7); + ItemStack parchedComb = items.beeComb.get(EnumHoneyComb.PARCHED, 1); hiveRegistry.addDrops(HiveRegistry.desert, new HiveDrop(80, BeeDefinition.MODEST, parchedComb).setIgnobleShare(0.7f), new HiveDrop(3, BeeDefinition.VALIANT, parchedComb) ); - ItemStack silkyComb = ForestryItem.beeComb.getItemStack(1, 6); + ItemStack silkyComb = items.beeComb.get(EnumHoneyComb.SILKY, 1); hiveRegistry.addDrops(HiveRegistry.jungle, new HiveDrop(80, BeeDefinition.TROPICAL, silkyComb).setIgnobleShare(0.7f), new HiveDrop(3, BeeDefinition.VALIANT, silkyComb) ); - ItemStack mysteriousComb = ForestryItem.beeComb.getItemStack(1, 8); + ItemStack mysteriousComb = items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1); hiveRegistry.addDrops(HiveRegistry.end, new HiveDrop(90, BeeDefinition.ENDED, mysteriousComb) ); - ItemStack frozenComb = ForestryItem.beeComb.getItemStack(1, 4); + ItemStack frozenComb = items.beeComb.get(EnumHoneyComb.FROZEN, 1); hiveRegistry.addDrops(HiveRegistry.snow, new HiveDrop(80, BeeDefinition.WINTRY, frozenComb).setIgnobleShare(0.5f), new HiveDrop(3, BeeDefinition.VALIANT, frozenComb) ); - ItemStack mossyComb = ForestryItem.beeComb.getItemStack(1, 15); + ItemStack mossyComb = items.beeComb.get(EnumHoneyComb.MOSSY, 1); hiveRegistry.addDrops(HiveRegistry.swamp, new HiveDrop(80, BeeDefinition.MARSHY, mossyComb).setIgnobleShare(0.4f), new HiveDrop(3, BeeDefinition.VALIANT, mossyComb) @@ -927,11 +862,11 @@ public class PluginApiculture extends ForestryPlugin { stack.setTagCompound(tag); ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(stack, 7, 12, 12)); - ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.scoop.getItemStack(), 1, 1, 8)); - ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.propolis.getItemStack(), 2, 4, 6)); - ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(), 4, 12, 7)); - ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(1, 4), 2, 10, 7)); - ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.beeComb.getItemStack(1, 6), 1, 6, 7)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.scoop.getItemStack(), 1, 1, 8)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.propolis.get(EnumPropolis.NORMAL, 1), 2, 4, 6)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.beeComb.get(EnumHoneyComb.HONEY, 1), 4, 12, 7)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.beeComb.get(EnumHoneyComb.FROZEN, 1), 2, 10, 7)); + ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.beeComb.get(EnumHoneyComb.SILKY, 1), 1, 6, 7)); ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(BeeDefinition.FOREST.getRainResist().getMemberStack(EnumBeeType.PRINCESS), 1, 1, 5)); ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(BeeDefinition.COMMON.getMemberStack(EnumBeeType.DRONE), 1, 2, 8)); diff --git a/src/main/java/forestry/plugins/PluginErebus.java b/src/main/java/forestry/plugins/PluginErebus.java index 89280239c..9a88c1a4a 100644 --- a/src/main/java/forestry/plugins/PluginErebus.java +++ b/src/main/java/forestry/plugins/PluginErebus.java @@ -13,11 +13,13 @@ package forestry.plugins; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; +import forestry.apiculture.items.EnumPropolis; import forestry.core.config.Constants; -import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; import forestry.core.utils.ModUtil; @@ -41,10 +43,13 @@ public class PluginErebus extends ForestryPlugin { super.registerRecipes(); Item materials = GameRegistry.findItem(EREBUS, "materials"); ItemStack honeyDrip = new ItemStack(materials, 1, 21); + FluidStack honeyOutput = Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP); if (PluginManager.Module.FACTORY.isEnabled()) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{honeyDrip}, Fluids.HONEY.getFluid(Constants.FLUID_PER_HONEY_DROP), - ForestryItem.propolis.getItemStack(), 5); - + ItemStack remnants = null; + if (PluginManager.Module.APICULTURE.isEnabled()) { + remnants = PluginApiculture.items.propolis.get(EnumPropolis.NORMAL, 1); + } + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{honeyDrip}, honeyOutput, remnants, 5); } } } diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index 4eabbc26f..23af04d7e 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; @@ -33,6 +32,7 @@ import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.api.recipes.ICraftingProvider; import forestry.api.recipes.RecipeManagers; +import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.GuiHandlerBase; import forestry.core.blocks.BlockBase; import forestry.core.circuits.Circuit; @@ -401,10 +401,13 @@ public class PluginFactory extends ForestryPlugin { "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite"}; if (PluginManager.Module.APICULTURE.isEnabled()) { + ItemRegistryApiculture beeItems = PluginApiculture.items; FluidStack liquidGlass = Fluids.GLASS.getFluid(Constants.BUCKET_VOLUME); for (int i = 0; i < 16; i++) { - RecipeManagers.fabricatorManager.addRecipe(ForestryItem.waxCast.getItemStack(1, OreDictionary.WILDCARD_VALUE), liquidGlass, new ItemStack(Blocks.stained_glass, 4, 15 - i), new Object[]{"#", "X", '#', dyes[i], - 'X', ForestryItem.propolis.getItemStack(1, OreDictionary.WILDCARD_VALUE)}); + RecipeManagers.fabricatorManager.addRecipe(beeItems.waxCast.getWildcard(), liquidGlass, new ItemStack(Blocks.stained_glass, 4, 15 - i), new Object[]{ + "#", "X", + '#', dyes[i], + 'X', beeItems.propolis.getWildcard()}); } } @@ -517,23 +520,24 @@ public class PluginFactory extends ForestryPlugin { " # ", "# #", " B", '#', "ingotIron", 'B', "ingotBronze"); // RAIN SUBSTRATES - if (PluginManager.Module.APICULTURE.isEnabled()) { + ItemRegistryApiculture beeItems = PluginApiculture.items; + if (beeItems != null) { RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(1000), null, PluginCore.items.iodineCharge.getItemStack(), "Z#Z", "#Y#", "X#X", - '#', ForestryItem.pollenCluster, + '#', beeItems.pollenCluster.getWildcard(), 'X', Items.gunpowder, 'Y', ForestryItem.canEmpty, - 'Z', ForestryItem.honeyDrop); + 'Z', beeItems.honeyDrop); RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.getFluid(1000), null, PluginCore.items.craftingMaterial.getDissipationCharge(), "Z#Z", "#Y#", "X#X", - '#', ForestryItem.royalJelly, + '#', beeItems.royalJelly, 'X', Items.gunpowder, 'Y', ForestryItem.canEmpty, - 'Z', ForestryItem.honeydew); + 'Z', beeItems.honeydew); } // Ender pearl diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index f69d1d0a1..5f88f8482 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -17,6 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import forestry.api.food.BeverageManager; +import forestry.apiculture.items.EnumPollenCluster; import forestry.core.GuiHandlerBase; import forestry.core.config.Constants; import forestry.core.config.ForestryItem; @@ -73,10 +74,13 @@ public class PluginFood extends ForestryPlugin { LiquidRegistryHelper.registerLiquidContainer(Fluids.SHORT_MEAD, Constants.BUCKET_VOLUME, ForestryItem.beverage.getItemStack(), new ItemStack(Items.glass_bottle)); if (PluginManager.Module.APICULTURE.isEnabled()) { - BeverageManager.ingredientManager.addIngredient(ForestryItem.pollenCluster.getItemStack(1, 0), "Strong Curative"); - BeverageManager.ingredientManager.addIngredient(ForestryItem.pollenCluster.getItemStack(1, 1), "Weak Curative"); - BeverageManager.infuserManager.addMixture(1, ForestryItem.pollenCluster.getItemStack(1, 0), BeverageEffect.strongAntidote); - BeverageManager.infuserManager.addMixture(1, ForestryItem.pollenCluster.getItemStack(1, 1), BeverageEffect.weakAntidote); + ItemStack normalPollenCluster = PluginApiculture.items.pollenCluster.get(EnumPollenCluster.NORMAL, 1); + ItemStack crystallinePollenCluster = PluginApiculture.items.pollenCluster.get(EnumPollenCluster.CRYSTALLINE, 1); + + BeverageManager.ingredientManager.addIngredient(normalPollenCluster, "Strong Curative"); + BeverageManager.ingredientManager.addIngredient(crystallinePollenCluster, "Weak Curative"); + BeverageManager.infuserManager.addMixture(1, normalPollenCluster, BeverageEffect.strongAntidote); + BeverageManager.infuserManager.addMixture(1, crystallinePollenCluster, BeverageEffect.weakAntidote); } } diff --git a/src/main/java/forestry/plugins/PluginGrowthCraft.java b/src/main/java/forestry/plugins/PluginGrowthCraft.java index 66bbefe8c..670a92d5c 100644 --- a/src/main/java/forestry/plugins/PluginGrowthCraft.java +++ b/src/main/java/forestry/plugins/PluginGrowthCraft.java @@ -22,7 +22,6 @@ import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; import forestry.core.config.Constants; -import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ModUtil; @@ -89,15 +88,18 @@ public class PluginGrowthCraft extends ForestryPlugin { } ItemStack emptyComb = new ItemStack(GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"), 1, 0); - ItemStack fullComb = new ItemStack(GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"), 1, 1); RecipeManagers.centrifugeManager.addRecipe(20, emptyComb, ImmutableMap.of( PluginCore.items.beeswax.getItemStack(), 1.0f) ); - RecipeManagers.centrifugeManager.addRecipe(20, fullComb, ImmutableMap.of( - PluginCore.items.beeswax.getItemStack(), 1.0f, - ForestryItem.honeyDrop.getItemStack(), 0.9f, - ForestryItem.honeydew.getItemStack(), 0.1f) - ); + + if (PluginManager.Module.APICULTURE.isEnabled()) { + ItemStack fullComb = new ItemStack(GameRegistry.findItem("Growthcraft|Bees", "grc.honeyComb"), 1, 1); + RecipeManagers.centrifugeManager.addRecipe(20, fullComb, ImmutableMap.of( + PluginCore.items.beeswax.getItemStack(), 1.0f, + PluginApiculture.items.honeyDrop.getItemStack(), 0.9f, + PluginApiculture.items.honeydew.getItemStack(), 0.1f) + ); + } ItemStack bamboo = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bamboo", 1); ItemStack bambooShoot = GameRegistry.findItemStack("Growthcraft|Bamboo", "grc.bambooShoot", 1); diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index 6c6ae2849..9a5c50e0e 100644 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -35,12 +35,13 @@ import forestry.api.storage.BackpackManager; import forestry.api.storage.IBackpackDefinition; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; +import forestry.apiculture.items.EnumPropolis; +import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.blocks.BlockBase; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; -import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; import forestry.core.items.EnumElectronTube; import forestry.core.proxy.Proxies; @@ -183,8 +184,9 @@ public class PluginIC2 extends ForestryPlugin { // Remove some items from the recycler if (Recipes.recyclerBlacklist != null) { if (PluginManager.Module.APICULTURE.isEnabled()) { - Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beeQueenGE.getItemStack())); - Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beePrincessGE.getItemStack())); + ItemRegistryApiculture beeItems = PluginApiculture.items; + Recipes.recyclerBlacklist.add(new RecipeInputItemStack(new ItemStack(beeItems.beeQueenGE))); + Recipes.recyclerBlacklist.add(new RecipeInputItemStack(new ItemStack(beeItems.beePrincessGE))); } } else { Log.severe("IC2 Recipes.recyclerBlacklist not found."); @@ -268,10 +270,13 @@ public class PluginIC2 extends ForestryPlugin { RecipeUtil.addFermenterRecipes(compressedPlantBall, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.wheat") * 9, Fluids.BIOMASS); } - if (resin != null) { - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.propolis.getItemStack(), ImmutableMap.of(resin, 1.0f)); - } else { - Log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin."); + if (PluginManager.Module.APICULTURE.isEnabled()) { + if (resin != null) { + ItemRegistryApiculture beeItems = PluginApiculture.items; + RecipeManagers.centrifugeManager.addRecipe(20, beeItems.propolis.get(EnumPropolis.NORMAL, 1), ImmutableMap.of(resin, 1.0f)); + } else { + Log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin."); + } } if (rubbersapling != null) { diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index 43ef79f8d..13c3ce857 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -164,8 +164,8 @@ public class PluginMail extends ForestryPlugin { Item stampGlue; if (PluginManager.Module.APICULTURE.isEnabled()) { - RecipeUtil.addShapelessRecipe(ForestryItem.letters.getItemStack(), Items.paper, ForestryItem.propolis.getItemStack(1, OreDictionary.WILDCARD_VALUE)); - stampGlue = ForestryItem.honeyDrop.item(); + RecipeUtil.addShapelessRecipe(ForestryItem.letters.getItemStack(), Items.paper, PluginApiculture.items.propolis.getWildcard()); + stampGlue = PluginApiculture.items.honeyDrop; } else { RecipeUtil.addShapelessRecipe(ForestryItem.letters.getItemStack(), Items.paper, Items.slime_ball); stampGlue = Items.slime_ball; @@ -173,7 +173,7 @@ public class PluginMail extends ForestryPlugin { if (Config.craftingStampsEnabled) { for (int i = 0; i < stampDefinitions.length; i++) { - if (Config.collectorStamps.contains(stampDefinitions[i].name)) { + if (Config.collectorStamps.contains(stampDefinitions[i].getName())) { continue; } diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/pollen.0.png b/src/main/resources/assets/forestry/textures/blocks/germlings/pollen.0.png new file mode 100644 index 000000000..d3540914f Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/germlings/pollen.0.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/pollen.1.png b/src/main/resources/assets/forestry/textures/blocks/germlings/pollen.1.png new file mode 100644 index 000000000..834e35990 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/germlings/pollen.1.png differ