From f1069a91f1b2ea9469775696c097dd6fb484e6e8 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 29 Jan 2023 10:24:49 -0800 Subject: [PATCH] [ci skip] spotlessApply with the new settings --- src/main/java/magicbees/api/MagicBeesAPI.java | 1 + .../magicbees/api/bees/AuraChargeType.java | 3 +- .../api/bees/IMagicApiaryAuraProvider.java | 24 +- .../bees/ITransmutationEffectController.java | 4 +- .../api/bees/ITransmutationEffectLogic.java | 23 +- src/main/java/magicbees/bees/Allele.java | 165 +- .../java/magicbees/bees/AlleleEffect.java | 15 +- src/main/java/magicbees/bees/AlleleFloat.java | 1 + .../java/magicbees/bees/AlleleFlower.java | 1 + src/main/java/magicbees/bees/AuraCharge.java | 4 +- .../magicbees/bees/BeeClassification.java | 9 +- .../java/magicbees/bees/BeeGenomeManager.java | 13 +- .../magicbees/bees/BeeIconColourProvider.java | 4 +- .../java/magicbees/bees/BeeIconProvider.java | 12 +- src/main/java/magicbees/bees/BeeManager.java | 27 +- src/main/java/magicbees/bees/BeeMutation.java | 834 ++++----- .../java/magicbees/bees/BeeProductHelper.java | 120 +- src/main/java/magicbees/bees/BeeSpecies.java | 1560 +++-------------- .../java/magicbees/bees/HiveDescription.java | 84 +- src/main/java/magicbees/bees/HiveDrop.java | 11 +- .../bees/MoonPhaseMutationBonus.java | 21 +- .../bees/MoonPhaseMutationRestriction.java | 21 +- .../allele/effect/AlleleEffectCrumbling.java | 12 +- .../bees/allele/effect/AlleleEffectCure.java | 13 +- .../allele/effect/AlleleEffectEmpowering.java | 21 +- .../effect/AlleleEffectNodeConversion.java | 15 +- .../allele/effect/AlleleEffectNodeRepair.java | 19 +- .../effect/AlleleEffectPlaceholder.java | 2 +- .../allele/effect/AlleleEffectPotion.java | 12 +- .../allele/effect/AlleleEffectRecharge.java | 19 +- .../allele/effect/AlleleEffectSpawnMob.java | 38 +- .../effect/AlleleEffectSpawnMobWeighted.java | 11 +- .../allele/effect/AlleleEffectSpawnWisp.java | 39 +- .../effect/AlleleEffectTransmuting.java | 18 +- .../bees/allele/effect/EffectData.java | 4 +- .../effect/TransmutationEffectController.java | 10 +- .../TransmutationEffectLBotaniaLiving.java | 1 + .../effect/TransmutationEffectRailcraft.java | 6 +- .../effect/TransmutationEffectVanilla.java | 2 + .../allele/flowerProvider/FlowerProvider.java | 6 +- .../FlowerProviderArsMagicaFlower.java | 18 +- .../FlowerProviderAuraNode.java | 13 +- .../FlowerProviderBookshelf.java | 7 +- .../flowerProvider/FlowerProviderBotania.java | 16 +- .../FlowerProviderThaumcraftFlower.java | 18 +- .../java/magicbees/block/BlockEffectJar.java | 11 +- .../magicbees/block/BlockEnchantedEarth.java | 11 +- src/main/java/magicbees/block/BlockHive.java | 12 +- .../magicbees/block/BlockMagicApiary.java | 11 +- .../block/BlockManaAuraProvider.java | 6 +- .../magicbees/block/BlockVisAuraProvider.java | 6 +- .../java/magicbees/block/types/HiveType.java | 25 +- .../java/magicbees/block/types/PlankType.java | 4 +- .../client/gui/ContainerEffectJar.java | 9 +- .../magicbees/client/gui/ContainerMB.java | 1 + .../client/gui/ContainerMagicApiary.java | 23 +- .../magicbees/client/gui/GUIEffectJar.java | 8 +- .../java/magicbees/client/gui/GUIHandler.java | 4 +- .../java/magicbees/client/gui/GuiFactory.java | 4 +- .../magicbees/client/gui/GuiMagicApiary.java | 13 +- .../magicbees/client/gui/ModGuiConfig.java | 20 +- .../magicbees/client/gui/SlotCustomItems.java | 2 + .../java/magicbees/client/gui/SlotFrame.java | 4 +- .../java/magicbees/client/gui/UIScreens.java | 3 +- .../client/model/ModelEffectJar.java | 18 +- .../client/model/ModelVisAuraProvider.java | 22 +- .../client/render/RendererEffectJar.java | 6 +- .../render/RendererVisAuraProvider.java | 6 +- src/main/java/magicbees/item/ItemCapsule.java | 22 +- src/main/java/magicbees/item/ItemComb.java | 14 +- src/main/java/magicbees/item/ItemDrop.java | 14 +- src/main/java/magicbees/item/ItemGrafter.java | 8 +- .../java/magicbees/item/ItemMagicHive.java | 7 +- .../magicbees/item/ItemMagicHiveFrame.java | 15 +- .../magicbees/item/ItemManasteelGrafter.java | 21 +- .../magicbees/item/ItemManasteelScoop.java | 27 +- .../magicbees/item/ItemMiscResources.java | 16 +- .../java/magicbees/item/ItemMoonDial.java | 24 +- .../magicbees/item/ItemMysteriousMagnet.java | 25 +- src/main/java/magicbees/item/ItemNugget.java | 17 +- src/main/java/magicbees/item/ItemPollen.java | 14 +- .../java/magicbees/item/ItemPropolis.java | 14 +- .../magicbees/item/ItemThaumiumGrafter.java | 16 +- .../magicbees/item/ItemThaumiumScoop.java | 18 +- .../java/magicbees/item/ItemVoidGrafter.java | 26 +- .../java/magicbees/item/ItemVoidScoop.java | 29 +- src/main/java/magicbees/item/ItemWax.java | 14 +- .../magicbees/item/types/CapsuleType.java | 5 +- .../java/magicbees/item/types/CombType.java | 40 +- .../java/magicbees/item/types/DropType.java | 4 +- .../java/magicbees/item/types/FluidType.java | 5 +- .../magicbees/item/types/HiveFrameType.java | 29 +- .../java/magicbees/item/types/NuggetType.java | 8 +- .../java/magicbees/item/types/PollenType.java | 4 +- .../magicbees/item/types/PropolisType.java | 4 +- .../magicbees/item/types/ResourceType.java | 6 +- .../java/magicbees/item/types/WaxType.java | 1 + src/main/java/magicbees/main/ClientProxy.java | 19 +- src/main/java/magicbees/main/CommonProxy.java | 1 + src/main/java/magicbees/main/Config.java | 30 +- src/main/java/magicbees/main/MagicBees.java | 16 +- .../magicbees/main/utils/BlockInterface.java | 4 +- .../java/magicbees/main/utils/BlockUtil.java | 1 + .../magicbees/main/utils/ChunkCoords.java | 1 + .../magicbees/main/utils/CraftingManager.java | 211 ++- .../java/magicbees/main/utils/IMCManager.java | 15 +- .../magicbees/main/utils/ItemInterface.java | 4 +- .../magicbees/main/utils/ItemStackUtils.java | 11 +- .../main/utils/LocalizationManager.java | 1 + .../java/magicbees/main/utils/LogHelper.java | 4 +- .../java/magicbees/main/utils/MoonPhase.java | 1 + .../magicbees/main/utils/TabMagicBees.java | 6 +- .../magicbees/main/utils/VersionInfo.java | 4 +- .../compat/AppliedEnergisticsHelper.java | 11 +- .../main/utils/compat/ArsMagicaHelper.java | 4 +- .../main/utils/compat/BotaniaHelper.java | 88 +- .../compat/EquivalentExchangeHelper.java | 4 +- .../main/utils/compat/ExtraBeesHelper.java | 7 +- .../main/utils/compat/ForestryHelper.java | 51 +- .../utils/compat/RedstoneArsenalHelper.java | 11 +- .../main/utils/compat/ThaumcraftHelper.java | 545 +++--- .../main/utils/compat/ThermalModsHelper.java | 18 +- .../botania/BotaniaAPIDistanceHelper.java | 69 +- .../compat/botania/BotaniaSignature.java | 1 + .../botania/SpeciesRecipeElvenTrade.java | 15 +- .../botania/SpeciesRecipeManaInfusion.java | 8 +- .../utils/compat/botania/SubTileBeegonia.java | 47 +- .../compat/botania/SubTileHibeescus.java | 15 +- .../compat/botania/SubTileHiveacynth.java | 22 +- .../utils/compat/thaumcraft/NodeHelper.java | 27 +- .../error/InvalidEventTypeIndexException.java | 1 + .../main/utils/net/EventAuraChargeUpdate.java | 9 +- .../magicbees/main/utils/net/EventBase.java | 9 +- .../magicbees/main/utils/net/EventCoords.java | 1 + .../main/utils/net/EventFlagsUpdate.java | 9 +- .../main/utils/net/EventInventoryUpdate.java | 9 +- .../main/utils/net/NetworkEventHandler.java | 33 +- .../magicbees/storage/BackpackDefinition.java | 8 +- .../magicbees/tileentity/AuraCharges.java | 3 + .../tileentity/EffectJarHousing.java | 24 +- .../tileentity/ITileEntityAuraCharged.java | 1 + .../tileentity/TileEntityEffectJar.java | 10 +- .../tileentity/TileEntityMagicApiary.java | 76 +- .../TileEntityManaAuraProvider.java | 11 +- .../tileentity/TileEntityVisAuraProvider.java | 6 +- .../world/feature/FeatureOreVein.java | 3 + .../world/feature/HiveGenOblivion.java | 4 +- .../world/feature/HiveGenUnderground.java | 5 +- 148 files changed, 2268 insertions(+), 3179 deletions(-) diff --git a/src/main/java/magicbees/api/MagicBeesAPI.java b/src/main/java/magicbees/api/MagicBeesAPI.java index e5666d3..0496b51 100644 --- a/src/main/java/magicbees/api/MagicBeesAPI.java +++ b/src/main/java/magicbees/api/MagicBeesAPI.java @@ -3,6 +3,7 @@ package magicbees.api; import magicbees.api.bees.ITransmutationEffectController; public class MagicBeesAPI { + // Use this object during or after the Mod.Init phase to add your logic to the Transmutation bee effect. public static ITransmutationEffectController transmutationEffectController; diff --git a/src/main/java/magicbees/api/bees/AuraChargeType.java b/src/main/java/magicbees/api/bees/AuraChargeType.java index 90cb8e0..9c5dd3d 100644 --- a/src/main/java/magicbees/api/bees/AuraChargeType.java +++ b/src/main/java/magicbees/api/bees/AuraChargeType.java @@ -3,6 +3,5 @@ package magicbees.api.bees; public enum AuraChargeType { MUTATION, DEATH, - PRODUCTION, - ; + PRODUCTION,; } diff --git a/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java b/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java index 758b76e..6de8086 100644 --- a/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java +++ b/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java @@ -1,44 +1,40 @@ package magicbees.api.bees; /** - * Allows a tile entity to provide a Magic Apiary with 'aura' to boost bee production, mutation rate, - * or decrease bee lifespan. + * Allows a tile entity to provide a Magic Apiary with 'aura' to boost bee production, mutation rate, or decrease bee + * lifespan. * * @author MysteriousAges */ public interface IMagicApiaryAuraProvider { /** - * Requests a mutation charge from the aura provider. If true is returned, the - * aura provider should decrement its internal charge by one. If there are no - * charges remaining, it should return false. + * Requests a mutation charge from the aura provider. If true is returned, the aura provider should decrement its + * internal charge by one. If there are no charges remaining, it should return false. * * @return True if a charge is given; false otherwise. */ boolean getMutationCharge(); /** - * Requests a mutation charge from the aura provider. If true is returned, the - * aura provider should decrement its internal charge by one. If there are no - * charges remaining, it should return false. + * Requests a mutation charge from the aura provider. If true is returned, the aura provider should decrement its + * internal charge by one. If there are no charges remaining, it should return false. * * @return True if a charge is given; false otherwise. */ boolean getDeathRateCharge(); /** - * Requests a mutation charge from the aura provider. If true is returned, the - * aura provider should decrement its internal charge by one. If there are no - * charges remaining, it should return false. + * Requests a mutation charge from the aura provider. If true is returned, the aura provider should decrement its + * internal charge by one. If there are no charges remaining, it should return false. * * @return True if a charge is given; false otherwise. */ boolean getProductionCharge(); /** - * Requests a mutation charge from the aura provider. If true is returned, the - * aura provider should decrement its internal charge by one. If there are no - * charges remaining, it should return false. + * Requests a mutation charge from the aura provider. If true is returned, the aura provider should decrement its + * internal charge by one. If there are no charges remaining, it should return false. * * @return True if a charge is given; false otherwise. */ diff --git a/src/main/java/magicbees/api/bees/ITransmutationEffectController.java b/src/main/java/magicbees/api/bees/ITransmutationEffectController.java index c5333e3..28d03ac 100644 --- a/src/main/java/magicbees/api/bees/ITransmutationEffectController.java +++ b/src/main/java/magicbees/api/bees/ITransmutationEffectController.java @@ -1,12 +1,12 @@ package magicbees.api.bees; /** - * Manages adding custom ITransmutationEffectLogic instances into the bee effect - * system. + * Manages adding custom ITransmutationEffectLogic instances into the bee effect system. * * @author MysteriousAges * */ public interface ITransmutationEffectController { + public void addEffectLogic(ITransmutationEffectLogic logic); } diff --git a/src/main/java/magicbees/api/bees/ITransmutationEffectLogic.java b/src/main/java/magicbees/api/bees/ITransmutationEffectLogic.java index 64737ab..60e743b 100644 --- a/src/main/java/magicbees/api/bees/ITransmutationEffectLogic.java +++ b/src/main/java/magicbees/api/bees/ITransmutationEffectLogic.java @@ -5,27 +5,26 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; /** - * Class to control plugin logic for the Transmutation bee effect. Turns blocks - * into other blocks based on biome, time of day, or whatever is deemed - * appropriate at the time. + * Class to control plugin logic for the Transmutation bee effect. Turns blocks into other blocks based on biome, time + * of day, or whatever is deemed appropriate at the time. * * @author MysteriousAges * */ public interface ITransmutationEffectLogic { + /** - * Allows an external mod to add transmutation logic to the Transmuting bee effect. - * Called from a list of ITransmutationEffectLogic until one returns true. You can - * implement more than one transmutation effect in a single implementation of the - * interface. Function checks for a series of conditions based on block ID/meta, or + * Allows an external mod to add transmutation logic to the Transmuting bee effect. Called from a list of + * ITransmutationEffectLogic until one returns true. You can implement more than one transmutation effect in a + * single implementation of the interface. Function checks for a series of conditions based on block ID/meta, or * biome information, or world information. * - * @param world World object - * @param biome Biome information for current coordinates + * @param world World object + * @param biome Biome information for current coordinates * @param sourceBlock ItemStack representing the block at current coordinates - * @param x Current X coordinate to attempt a transmute - * @param y Current Y coordinate to attempt a transmute - * @param z Current Z coordinate to attempt a transmute + * @param x Current X coordinate to attempt a transmute + * @param y Current Y coordinate to attempt a transmute + * @param z Current Z coordinate to attempt a transmute * @return true if a block was changed. */ public boolean tryTransmutation(World world, BiomeGenBase biome, ItemStack sourceBlock, int x, int y, int z); diff --git a/src/main/java/magicbees/bees/Allele.java b/src/main/java/magicbees/bees/Allele.java index 501661d..ea33ad1 100644 --- a/src/main/java/magicbees/bees/Allele.java +++ b/src/main/java/magicbees/bees/Allele.java @@ -1,15 +1,5 @@ package magicbees.bees; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.IAlleleBeeEffect; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleEffect; -import forestry.api.genetics.IAlleleFlowers; -import forestry.api.genetics.IAlleleRegistry; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IFlowerProvider; import magicbees.api.MagicBeesAPI; import magicbees.bees.allele.effect.AlleleEffectCrumbling; import magicbees.bees.allele.effect.AlleleEffectCure; @@ -37,8 +27,20 @@ import magicbees.main.utils.compat.ArsMagicaHelper; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.ThermalModsHelper; + import net.minecraft.potion.Potion; + import thaumcraft.api.nodes.NodeType; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleEffect; +import forestry.api.genetics.IAlleleFlowers; +import forestry.api.genetics.IAlleleRegistry; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IFlowerProvider; public class Allele implements IAllele { @@ -120,50 +122,35 @@ public class Allele implements IAllele { effectSlowSpeed = new AlleleEffectPotion("SlowSpeed", Potion.moveSlowdown, 3, false).setMalicious(); effectWithering = new AlleleEffectPotion("Withering", Potion.wither, 10, false).setMalicious(); - TransmutationEffectController controller = - new TransmutationEffectController(new TransmutationEffectRailcraft(), new TransmutationEffectVanilla()); + TransmutationEffectController controller = new TransmutationEffectController( + new TransmutationEffectRailcraft(), + new TransmutationEffectVanilla()); MagicBeesAPI.transmutationEffectController = controller; effectTransmuting = new AlleleEffectTransmuting("Transmuting", true, controller, 200); effectCrumbling = new AlleleEffectCrumbling("Crumbling", true); effectInvisibility = new AlleleEffectPotion("Invisibility", Potion.invisibility, 10, false); - spawnGhast = new AlleleEffectSpawnMob("Ghastly", false, "Ghast", "mob.ghast.moan") - .setThrottle(2060) - .setChanceToSpawn(10) - .setMaxMobsInSpawnZone(1); - spawnSpider = new AlleleEffectSpawnMob("Spidery", false, "Spider", "mob.spider.step") - .setThrottle(400) - .setChanceToSpawn(70) + spawnGhast = new AlleleEffectSpawnMob("Ghastly", false, "Ghast", "mob.ghast.moan").setThrottle(2060) + .setChanceToSpawn(10).setMaxMobsInSpawnZone(1); + spawnSpider = new AlleleEffectSpawnMob("Spidery", false, "Spider", "mob.spider.step").setThrottle(400) + .setChanceToSpawn(70).setMaxMobsInSpawnZone(4); + spawnBlaze = new AlleleEffectSpawnMob("Ablaze", false, "Blaze", "mob.blaze.breathe").setThrottle(800) + .setChanceToSpawn(60).setMaxMobsInSpawnZone(2); + spawnWolf = new AlleleEffectSpawnMob("Canine", false, "Wolf", "mob.wolf.panting").setThrottle(650) + .setChanceToSpawn(40).setMaxMobsInSpawnZone(2); + spawnPig = new AlleleEffectSpawnMob("Porcine", true, "Pig", "mob.pig.say").setThrottle(350) .setMaxMobsInSpawnZone(4); - spawnBlaze = new AlleleEffectSpawnMob("Ablaze", false, "Blaze", "mob.blaze.breathe") - .setThrottle(800) - .setChanceToSpawn(60) - .setMaxMobsInSpawnZone(2); - spawnWolf = new AlleleEffectSpawnMob("Canine", false, "Wolf", "mob.wolf.panting") - .setThrottle(650) - .setChanceToSpawn(40) - .setMaxMobsInSpawnZone(2); - spawnPig = new AlleleEffectSpawnMob("Porcine", true, "Pig", "mob.pig.say") - .setThrottle(350) - .setMaxMobsInSpawnZone(4); - spawnCow = new AlleleEffectSpawnMob("Bovine", true, "Cow", "mob.cow.say") - .setThrottle(640) + spawnCow = new AlleleEffectSpawnMob("Bovine", true, "Cow", "mob.cow.say").setThrottle(640) .setMaxMobsInSpawnZone(3); - spawnChicken = new AlleleEffectSpawnMob("Chicken", true, "Chicken", "mob.chicken.hurt") - .setThrottle(20) + spawnChicken = new AlleleEffectSpawnMob("Chicken", true, "Chicken", "mob.chicken.hurt").setThrottle(20) .setMaxMobsInSpawnZone(20); - spawnSheep = new AlleleEffectSpawnMob("Sheep", false, "Sheep", "mob.sheep.say") - .setThrottle(450) + spawnSheep = new AlleleEffectSpawnMob("Sheep", false, "Sheep", "mob.sheep.say").setThrottle(450) .setMaxMobsInSpawnZone(5); - spawnCat = new AlleleEffectSpawnMob("Catty", false, "Ozelot", "mob.cat.meow") - .setThrottle(702) - .setChanceToSpawn(60) - .setMaxMobsInSpawnZone(2); - spawnHorse = new AlleleEffectSpawnMob("Horse", false, "EntityHorse", "mob.horse.idle") - .setThrottle(450) - .setChanceToSpawn(59) - .setMaxMobsInSpawnZone(2); + spawnCat = new AlleleEffectSpawnMob("Catty", false, "Ozelot", "mob.cat.meow").setThrottle(702) + .setChanceToSpawn(60).setMaxMobsInSpawnZone(2); + spawnHorse = new AlleleEffectSpawnMob("Horse", false, "EntityHorse", "mob.horse.idle").setThrottle(450) + .setChanceToSpawn(59).setMaxMobsInSpawnZone(2); if (ThaumcraftHelper.isActive()) { flowerThaumcraft = new AlleleFlower(FLOWERS_THAUMCRAFT_PLANT, new FlowerProviderThaumcraftFlower(), false); @@ -172,27 +159,32 @@ public class Allele implements IAllele { effectVisRecharge = new AlleleEffectRecharge(EFFECT_VIS_RECHARGE, false); effectNodeEmpower = new AlleleEffectEmpowering(EFFECT_NODE_EMPOWER, false); effectNodeRepair = new AlleleEffectNodeRepair(EFFECT_NODE_REPAIR, false); - effectNodeConversionTaint = - new AlleleEffectNodeConversion(EFFECT_NODE_TAINTING, NodeType.TAINTED, false, 250); + effectNodeConversionTaint = new AlleleEffectNodeConversion( + EFFECT_NODE_TAINTING, + NodeType.TAINTED, + false, + 250); effectNodeConversionPure = new AlleleEffectNodeConversion(EFFECT_NODE_PURIFYING, NodeType.PURE, false, 250); - effectNodeConversionHungry = - new AlleleEffectNodeConversion(EFFECT_NODE_RAVENING, NodeType.HUNGRY, false, 2); + effectNodeConversionHungry = new AlleleEffectNodeConversion( + EFFECT_NODE_RAVENING, + NodeType.HUNGRY, + false, + 2); spawnBrainyZombie = new AlleleEffectSpawnMob( - EFFECT_BRAINY, false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID) - .setAggrosPlayerOnSpawn() - .setThrottle(800) - .setSpawnsOnPlayerNear(null) - .setMaxMobsInSpawnZone(2); + EFFECT_BRAINY, + false, + ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID).setAggrosPlayerOnSpawn().setThrottle(800) + .setSpawnsOnPlayerNear(null).setMaxMobsInSpawnZone(2); spawnBats = new AlleleEffectSpawnMob(EFFECT_BATTY, false, ThaumcraftHelper.Entity.FIREBAT.entityID) - .setThrottle(300) - .setSpawnsOnPlayerNear("Bat"); + .setThrottle(300).setSpawnsOnPlayerNear("Bat"); spawnWisp = new AlleleEffectSpawnWisp( - EFFECT_WISPY, false, ThaumcraftHelper.Entity.WISP.entityID, "thaumcraft.wisplive") - .setThrottle(1800) - .setChanceToSpawn(79); + EFFECT_WISPY, + false, + ThaumcraftHelper.Entity.WISP.entityID, + "thaumcraft.wisplive").setThrottle(1800).setChanceToSpawn(79); } else { spawnBats = new AlleleEffectSpawnMob(EFFECT_BATTY, false, "Bat").setThrottle(150); @@ -226,15 +218,15 @@ public class Allele implements IAllele { EFFECT_MANA_DRAIN, true, 20, - new String[] {ArsMagicaHelper.Name + ".MobManaCreeper", ArsMagicaHelper.Name + ".ManaVortex"}, - new int[] {60, 2}); + new String[] { ArsMagicaHelper.Name + ".MobManaCreeper", ArsMagicaHelper.Name + ".ManaVortex" }, + new int[] { 60, 2 }); spawnWispOrHecate = new AlleleEffectSpawnMobWeighted( EFFECT_AM_WISP, true, 20, - new String[] {ArsMagicaHelper.Name + ".MobWisp", ArsMagicaHelper.Name + ".MobHecate"}, - new int[] {40, 3}); + new String[] { ArsMagicaHelper.Name + ".MobWisp", ArsMagicaHelper.Name + ".MobHecate" }, + new int[] { 40, 3 }); } else { flowerArsMagica = new AlleleFlower(FLOWER_ARS_MAGICA_PLANT, vanillaFlowers, false); spawnManaDrainer = new AlleleEffectPlaceholder(EFFECT_MANA_DRAIN, true); @@ -244,26 +236,20 @@ public class Allele implements IAllele { // TODO TE spawning if (ThermalModsHelper.isActive()) { spawnBlizz = new AlleleEffectSpawnMob( - EFFECT_TE_BLIZZY, - true, - ThermalModsHelper.Entity.BLIZZ.entityID, - ThermalModsHelper.Entity.BLIZZ.soundName) - .setThrottle(100) - .setChanceToSpawn(80); + EFFECT_TE_BLIZZY, + true, + ThermalModsHelper.Entity.BLIZZ.entityID, + ThermalModsHelper.Entity.BLIZZ.soundName).setThrottle(100).setChanceToSpawn(80); spawnBlitz = new AlleleEffectSpawnMob( - EFFECT_TE_BLITZ, - true, - ThermalModsHelper.Entity.BLITZ.entityID, - ThermalModsHelper.Entity.BLITZ.soundName) - .setThrottle(100) - .setChanceToSpawn(80); + EFFECT_TE_BLITZ, + true, + ThermalModsHelper.Entity.BLITZ.entityID, + ThermalModsHelper.Entity.BLITZ.soundName).setThrottle(100).setChanceToSpawn(80); spawnBasalz = new AlleleEffectSpawnMob( - EFFECT_TE_BASALZ, - true, - ThermalModsHelper.Entity.BASALZ.entityID, - ThermalModsHelper.Entity.BASALZ.soundName) - .setThrottle(100) - .setChanceToSpawn(80); + EFFECT_TE_BASALZ, + true, + ThermalModsHelper.Entity.BASALZ.entityID, + ThermalModsHelper.Entity.BASALZ.soundName).setThrottle(100).setChanceToSpawn(80); } else { spawnBlizz = new AlleleEffectPlaceholder(EFFECT_TE_BLIZZY, true); spawnBlitz = new AlleleEffectPlaceholder(EFFECT_TE_BLITZ, true); @@ -279,23 +265,24 @@ public class Allele implements IAllele { registry.registerDeprecatedAlleleReplacement("magicbees.effectNodeFlux", effectNodeConversionTaint); registry.registerDeprecatedAlleleReplacement("magicbees.effectNodeCharge", effectNodeEmpower); registry.registerDeprecatedAlleleReplacement( - "magicbees.speciesTCAttractive", BeeSpecies.TC_EMPOWERING.getSpecies()); + "magicbees.speciesTCAttractive", + BeeSpecies.TC_EMPOWERING.getSpecies()); registry.registerDeprecatedAlleleReplacement( - "magicbees.speciesBMBloodyBMBloody", BeeSpecies.EARTHY.getSpecies()); + "magicbees.speciesBMBloodyBMBloody", + BeeSpecies.EARTHY.getSpecies()); registry.registerDeprecatedAlleleReplacement( - "magicbees.speciesBMBloodyBMBound", BeeSpecies.ARCANE.getSpecies()); + "magicbees.speciesBMBloodyBMBound", + BeeSpecies.ARCANE.getSpecies()); } public static IAlleleBeeSpecies getBaseSpecies(String name) { - return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele( - (new StringBuilder()).append("forestry.species").append(name).toString()); + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry + .getAllele((new StringBuilder()).append("forestry.species").append(name).toString()); } public static IAlleleBeeSpecies getExtraSpecies(String name) { - return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele((new StringBuilder()) - .append("extrabees.species.") - .append(name.toLowerCase()) - .toString()); + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry + .getAllele((new StringBuilder()).append("extrabees.species.").append(name.toLowerCase()).toString()); } public static IAllele getBaseAllele(String name) { diff --git a/src/main/java/magicbees/bees/AlleleEffect.java b/src/main/java/magicbees/bees/AlleleEffect.java index e8d1239..4888d46 100644 --- a/src/main/java/magicbees/bees/AlleleEffect.java +++ b/src/main/java/magicbees/bees/AlleleEffect.java @@ -1,16 +1,19 @@ package magicbees.bees; +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChunkCoordinates; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; -import java.util.List; -import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect { + protected int throttle; protected boolean combinable; @@ -58,8 +61,8 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect { } @SuppressWarnings("unchecked") - protected List getEntitiesWithinRange( - IBeeGenome genome, IBeeHousing housing, Class entityClass) { + protected List getEntitiesWithinRange(IBeeGenome genome, IBeeHousing housing, + Class entityClass) { // Get the size of the affected area int[] area = genome.getTerritory(); ChunkCoordinates coords = housing.getCoordinates(); diff --git a/src/main/java/magicbees/bees/AlleleFloat.java b/src/main/java/magicbees/bees/AlleleFloat.java index 0d39aa2..79cdaab 100644 --- a/src/main/java/magicbees/bees/AlleleFloat.java +++ b/src/main/java/magicbees/bees/AlleleFloat.java @@ -4,6 +4,7 @@ import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IChromosomeType; public class AlleleFloat extends Allele implements IAlleleFloat { + private float value; public AlleleFloat(String id, float val, boolean isDominant, IChromosomeType... chromosomeTypes) { diff --git a/src/main/java/magicbees/bees/AlleleFlower.java b/src/main/java/magicbees/bees/AlleleFlower.java index a4c4a59..1e9860d 100644 --- a/src/main/java/magicbees/bees/AlleleFlower.java +++ b/src/main/java/magicbees/bees/AlleleFlower.java @@ -5,6 +5,7 @@ import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IFlowerProvider; public class AlleleFlower extends Allele implements IAlleleFlowers { + private IFlowerProvider provider; public AlleleFlower(String uid, IFlowerProvider flowerProvider, boolean isDominant) { diff --git a/src/main/java/magicbees/bees/AuraCharge.java b/src/main/java/magicbees/bees/AuraCharge.java index 9ed9464..cf456ff 100644 --- a/src/main/java/magicbees/bees/AuraCharge.java +++ b/src/main/java/magicbees/bees/AuraCharge.java @@ -3,10 +3,10 @@ package magicbees.bees; import magicbees.api.bees.AuraChargeType; public enum AuraCharge { + MUTATION(AuraChargeType.MUTATION, 850, 11), DEATH(AuraChargeType.DEATH, 400, 5), - PRODUCTION(AuraChargeType.PRODUCTION, 300, 3), - ; + PRODUCTION(AuraChargeType.PRODUCTION, 300, 3),; public final AuraChargeType type; public final int duration; diff --git a/src/main/java/magicbees/bees/BeeClassification.java b/src/main/java/magicbees/bees/BeeClassification.java index 9cdd477..a715c42 100644 --- a/src/main/java/magicbees/bees/BeeClassification.java +++ b/src/main/java/magicbees/bees/BeeClassification.java @@ -1,12 +1,14 @@ package magicbees.bees; +import java.util.ArrayList; + +import magicbees.main.utils.LocalizationManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import java.util.ArrayList; -import magicbees.main.utils.LocalizationManager; public enum BeeClassification implements IClassification { + VEILED("Veiled", "Velatapis"), ARCANE("Arcane", "Arcanapis"), SUPERNATURAL("Supernatural", "Occultapis"), @@ -35,8 +37,7 @@ public enum BeeClassification implements IClassification { BLOODY("Bloody", "Sanguis"), - BOTANICAL("Botanical", "Botanica"), - ; + BOTANICAL("Botanical", "Botanica"),; private String uID; private String latin; diff --git a/src/main/java/magicbees/bees/BeeGenomeManager.java b/src/main/java/magicbees/bees/BeeGenomeManager.java index 9a4cb8d..d0fb2fa 100644 --- a/src/main/java/magicbees/bees/BeeGenomeManager.java +++ b/src/main/java/magicbees/bees/BeeGenomeManager.java @@ -1,13 +1,15 @@ package magicbees.bees; +import magicbees.main.utils.ItemInterface; +import magicbees.main.utils.compat.ExtraBeesHelper; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.genetics.IAllele; -import magicbees.main.utils.ItemInterface; -import magicbees.main.utils.compat.ExtraBeesHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; /** * Simply a class to hold all the functions to manage species' default genomes. @@ -15,6 +17,7 @@ import net.minecraft.nbt.NBTTagList; * @author MysteriousAges */ public class BeeGenomeManager { + // Basic genome for All thaumic bees. private static IAllele[] getTemplateModBase() { IAllele[] genome = new IAllele[EnumBeeChromosome.values().length]; diff --git a/src/main/java/magicbees/bees/BeeIconColourProvider.java b/src/main/java/magicbees/bees/BeeIconColourProvider.java index 76b3164..911f1c2 100644 --- a/src/main/java/magicbees/bees/BeeIconColourProvider.java +++ b/src/main/java/magicbees/bees/BeeIconColourProvider.java @@ -1,10 +1,12 @@ package magicbees.bees; -import forestry.api.apiculture.IBeeIconColourProvider; import java.awt.Color; +import forestry.api.apiculture.IBeeIconColourProvider; + public enum BeeIconColourProvider implements IBeeIconColourProvider { RAINBOW { + @Override public int getIconColour(int renderPass) { if (renderPass == 0) { diff --git a/src/main/java/magicbees/bees/BeeIconProvider.java b/src/main/java/magicbees/bees/BeeIconProvider.java index 548232d..0d6ddd6 100644 --- a/src/main/java/magicbees/bees/BeeIconProvider.java +++ b/src/main/java/magicbees/bees/BeeIconProvider.java @@ -1,15 +1,19 @@ package magicbees.bees; +import java.util.Locale; + +import magicbees.main.CommonProxy; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBeeIconProvider; -import java.util.Locale; -import magicbees.main.CommonProxy; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; public enum BeeIconProvider implements IBeeIconProvider { + SKULKING(CommonProxy.DOMAIN + ":bees/skulking/"), DOCTORAL(CommonProxy.DOMAIN + ":bees/doctoral/"); diff --git a/src/main/java/magicbees/bees/BeeManager.java b/src/main/java/magicbees/bees/BeeManager.java index fc86f26..f762f7f 100644 --- a/src/main/java/magicbees/bees/BeeManager.java +++ b/src/main/java/magicbees/bees/BeeManager.java @@ -1,5 +1,18 @@ package magicbees.bees; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; + +import magicbees.block.types.HiveType; +import magicbees.item.types.DropType; +import magicbees.main.Config; +import magicbees.main.utils.Tuple; +import magicbees.main.utils.compat.ExtraBeesHelper; + +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; @@ -7,22 +20,12 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import magicbees.block.types.HiveType; -import magicbees.item.types.DropType; -import magicbees.main.Config; -import magicbees.main.utils.Tuple; -import magicbees.main.utils.compat.ExtraBeesHelper; -import net.minecraft.item.ItemStack; public class BeeManager { + public static IBeeRoot beeRoot; - private static List> worldgenSpeciesWeights = - new ArrayList>(); + private static List> worldgenSpeciesWeights = new ArrayList>(); private static double worldgenSpeciesWeightsTotal = 0; public static void getBeeRoot() { diff --git a/src/main/java/magicbees/bees/BeeMutation.java b/src/main/java/magicbees/bees/BeeMutation.java index 3eac22b..1bc9df7 100644 --- a/src/main/java/magicbees/bees/BeeMutation.java +++ b/src/main/java/magicbees/bees/BeeMutation.java @@ -1,8 +1,5 @@ package magicbees.bees; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeMutationCustom; -import forestry.api.apiculture.IBeeMutationFactory; import magicbees.main.utils.LogHelper; import magicbees.main.utils.MoonPhase; import magicbees.main.utils.compat.AppliedEnergisticsHelper; @@ -14,12 +11,18 @@ import magicbees.main.utils.compat.ForestryHelper; import magicbees.main.utils.compat.RedstoneArsenalHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.ThermalModsHelper; + import net.minecraft.init.Blocks; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; import net.minecraftforge.oredict.OreDictionary; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeMutationCustom; +import forestry.api.apiculture.IBeeMutationFactory; + public class BeeMutation { + private static IBeeMutationFactory beeMutationFactory = forestry.api.apiculture.BeeManager.beeMutationFactory; public static void setupMutations() { @@ -28,10 +31,10 @@ public class BeeMutation { // Forestry + These -> Common - BeeSpecies[] magicMundane = - new BeeSpecies[] {BeeSpecies.MYSTICAL, BeeSpecies.SORCEROUS, BeeSpecies.UNUSUAL, BeeSpecies.ATTUNED}; - String[] forestryMundane = new String[] {"Forest", "Meadows", "Modest", "Wintry", "Tropical", "Marshy"}; - String[] binnieMundane = new String[] {"marble", "rock", "water", "basalt"}; + BeeSpecies[] magicMundane = new BeeSpecies[] { BeeSpecies.MYSTICAL, BeeSpecies.SORCEROUS, BeeSpecies.UNUSUAL, + BeeSpecies.ATTUNED }; + String[] forestryMundane = new String[] { "Forest", "Meadows", "Modest", "Wintry", "Tropical", "Marshy" }; + String[] binnieMundane = new String[] { "marble", "rock", "water", "basalt" }; for (BeeSpecies species : magicMundane) { for (String str : forestryMundane) { @@ -61,7 +64,10 @@ public class BeeMutation { ForestryHelper.getTemplateForestryForSpecies("Cultivated"), 12); beeMutationFactory.createMutation( - species.getSpecies(), Allele.getBaseSpecies("Cultivated"), BeeSpecies.ELDRITCH.getGenome(), 12); + species.getSpecies(), + Allele.getBaseSpecies("Cultivated"), + BeeSpecies.ELDRITCH.getGenome(), + 12); } beeMutationFactory.createMutation( @@ -74,13 +80,11 @@ public class BeeMutation { BeeSpecies.ESOTERIC.getSpecies(), BeeSpecies.MYSTERIOUS.getGenome(), 8); - beeMutationFactory - .createMutation( - BeeSpecies.ESOTERIC.getSpecies(), - BeeSpecies.MYSTERIOUS.getSpecies(), - BeeSpecies.ARCANE.getGenome(), - 8) - .addMutationCondition( + beeMutationFactory.createMutation( + BeeSpecies.ESOTERIC.getSpecies(), + BeeSpecies.MYSTERIOUS.getSpecies(), + BeeSpecies.ARCANE.getGenome(), + 8).addMutationCondition( new MoonPhaseMutationBonus(MoonPhase.WAXING_CRESCENT, MoonPhase.WAXING_GIBBOUS, 1.2f)); beeMutationFactory.createMutation( @@ -89,14 +93,15 @@ public class BeeMutation { BeeSpecies.CHARMED.getGenome(), 10); beeMutationFactory.createMutation( - BeeSpecies.ELDRITCH.getSpecies(), BeeSpecies.CHARMED.getSpecies(), BeeSpecies.ENCHANTED.getGenome(), 8); - beeMutationFactory - .createMutation( - BeeSpecies.CHARMED.getSpecies(), - BeeSpecies.ENCHANTED.getSpecies(), - BeeSpecies.SUPERNATURAL.getGenome(), - 8) - .addMutationCondition( + BeeSpecies.ELDRITCH.getSpecies(), + BeeSpecies.CHARMED.getSpecies(), + BeeSpecies.ENCHANTED.getGenome(), + 8); + beeMutationFactory.createMutation( + BeeSpecies.CHARMED.getSpecies(), + BeeSpecies.ENCHANTED.getSpecies(), + BeeSpecies.SUPERNATURAL.getGenome(), + 8).addMutationCondition( new MoonPhaseMutationBonus(MoonPhase.WANING_GIBBOUS, MoonPhase.WANING_CRESCENT, 1.2f)); beeMutationFactory.createMutation( @@ -105,150 +110,162 @@ public class BeeMutation { BeeSpecies.ETHEREAL.getGenome(), 7); - beeMutationFactory - .createMutation( - BeeSpecies.SUPERNATURAL.getSpecies(), - BeeSpecies.ETHEREAL.getSpecies(), - BeeSpecies.WINDY.getGenome(), - 14) - .requireResource("treeLeaves"); - beeMutationFactory - .createMutation( - BeeSpecies.SUPERNATURAL.getSpecies(), - BeeSpecies.ETHEREAL.getSpecies(), - BeeSpecies.WATERY.getGenome(), - 14) - .requireResource(Blocks.water, 0); - beeMutationFactory - .createMutation( - BeeSpecies.SUPERNATURAL.getSpecies(), - BeeSpecies.ETHEREAL.getSpecies(), - BeeSpecies.EARTHY.getGenome(), - 14) - .requireResource(Blocks.brick_block, 0); - beeMutationFactory - .createMutation( - BeeSpecies.SUPERNATURAL.getSpecies(), - BeeSpecies.ETHEREAL.getSpecies(), - BeeSpecies.FIREY.getGenome(), - 14) - .requireResource(Blocks.lava, 0); + beeMutationFactory.createMutation( + BeeSpecies.SUPERNATURAL.getSpecies(), + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.WINDY.getGenome(), + 14).requireResource("treeLeaves"); + beeMutationFactory.createMutation( + BeeSpecies.SUPERNATURAL.getSpecies(), + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.WATERY.getGenome(), + 14).requireResource(Blocks.water, 0); + beeMutationFactory.createMutation( + BeeSpecies.SUPERNATURAL.getSpecies(), + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.EARTHY.getGenome(), + 14).requireResource(Blocks.brick_block, 0); + beeMutationFactory.createMutation( + BeeSpecies.SUPERNATURAL.getSpecies(), + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.FIREY.getGenome(), + 14).requireResource(Blocks.lava, 0); beeMutationFactory.createMutation( - BeeSpecies.ETHEREAL.getSpecies(), BeeSpecies.ATTUNED.getSpecies(), BeeSpecies.AWARE.getGenome(), 10); + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.ATTUNED.getSpecies(), + BeeSpecies.AWARE.getGenome(), + 10); beeMutationFactory.createMutation( - BeeSpecies.ETHEREAL.getSpecies(), BeeSpecies.AWARE.getSpecies(), BeeSpecies.SPIRIT.getGenome(), 8); + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.AWARE.getSpecies(), + BeeSpecies.SPIRIT.getGenome(), + 8); beeMutationFactory.createMutation( - BeeSpecies.ATTUNED.getSpecies(), BeeSpecies.AWARE.getSpecies(), BeeSpecies.SPIRIT.getGenome(), 8); + BeeSpecies.ATTUNED.getSpecies(), + BeeSpecies.AWARE.getSpecies(), + BeeSpecies.SPIRIT.getGenome(), + 8); beeMutationFactory.createMutation( - BeeSpecies.AWARE.getSpecies(), BeeSpecies.SPIRIT.getSpecies(), BeeSpecies.SOUL.getGenome(), 7); + BeeSpecies.AWARE.getSpecies(), + BeeSpecies.SPIRIT.getSpecies(), + BeeSpecies.SOUL.getGenome(), + 7); beeMutationFactory.createMutation( - Allele.getBaseSpecies("Monastic"), BeeSpecies.ARCANE.getSpecies(), BeeSpecies.PUPIL.getGenome(), 10); + Allele.getBaseSpecies("Monastic"), + BeeSpecies.ARCANE.getSpecies(), + BeeSpecies.PUPIL.getGenome(), + 10); beeMutationFactory.createMutation( - BeeSpecies.ARCANE.getSpecies(), BeeSpecies.PUPIL.getSpecies(), BeeSpecies.SCHOLARLY.getGenome(), 8); + BeeSpecies.ARCANE.getSpecies(), + BeeSpecies.PUPIL.getSpecies(), + BeeSpecies.SCHOLARLY.getGenome(), + 8); beeMutationFactory.createMutation( - BeeSpecies.PUPIL.getSpecies(), BeeSpecies.SCHOLARLY.getSpecies(), BeeSpecies.SAVANT.getGenome(), 6); + BeeSpecies.PUPIL.getSpecies(), + BeeSpecies.SCHOLARLY.getSpecies(), + BeeSpecies.SAVANT.getGenome(), + 6); beeMutationFactory.createMutation( - Allele.getBaseSpecies("Imperial"), BeeSpecies.ETHEREAL.getSpecies(), BeeSpecies.TIMELY.getGenome(), 8); + Allele.getBaseSpecies("Imperial"), + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.TIMELY.getGenome(), + 8); beeMutationFactory.createMutation( - Allele.getBaseSpecies("Imperial"), BeeSpecies.TIMELY.getSpecies(), BeeSpecies.LORDLY.getGenome(), 8); + Allele.getBaseSpecies("Imperial"), + BeeSpecies.TIMELY.getSpecies(), + BeeSpecies.LORDLY.getGenome(), + 8); beeMutationFactory.createMutation( - BeeSpecies.TIMELY.getSpecies(), BeeSpecies.LORDLY.getSpecies(), BeeSpecies.DOCTORAL.getGenome(), 7); - - beeMutationFactory - .createMutation( - BeeSpecies.INFERNAL.getSpecies(), - BeeSpecies.ELDRITCH.getSpecies(), - BeeSpecies.HATEFUL.getGenome(), - 9) - .restrictBiomeType(BiomeDictionary.Type.NETHER); - beeMutationFactory - .createMutation( - BeeSpecies.INFERNAL.getSpecies(), - BeeSpecies.HATEFUL.getSpecies(), - BeeSpecies.SPITEFUL.getGenome(), - 7) - .restrictBiomeType(BiomeDictionary.Type.NETHER); - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Demonic"), - BeeSpecies.SPITEFUL.getSpecies(), - BeeSpecies.WITHERING.getGenome(), - 6) - .restrictBiomeType(BiomeDictionary.Type.NETHER); + BeeSpecies.TIMELY.getSpecies(), + BeeSpecies.LORDLY.getSpecies(), + BeeSpecies.DOCTORAL.getGenome(), + 7); beeMutationFactory.createMutation( - Allele.getBaseSpecies("Modest"), BeeSpecies.ELDRITCH.getSpecies(), BeeSpecies.SKULKING.getGenome(), 12); + BeeSpecies.INFERNAL.getSpecies(), + BeeSpecies.ELDRITCH.getSpecies(), + BeeSpecies.HATEFUL.getGenome(), + 9).restrictBiomeType(BiomeDictionary.Type.NETHER); + beeMutationFactory.createMutation( + BeeSpecies.INFERNAL.getSpecies(), + BeeSpecies.HATEFUL.getSpecies(), + BeeSpecies.SPITEFUL.getGenome(), + 7).restrictBiomeType(BiomeDictionary.Type.NETHER); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Demonic"), + BeeSpecies.SPITEFUL.getSpecies(), + BeeSpecies.WITHERING.getGenome(), + 6).restrictBiomeType(BiomeDictionary.Type.NETHER); + + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Modest"), + BeeSpecies.ELDRITCH.getSpecies(), + BeeSpecies.SKULKING.getGenome(), + 12); beeMutationFactory.createMutation( Allele.getBaseSpecies("Tropical"), BeeSpecies.SKULKING.getSpecies(), BeeSpecies.SPIDERY.getGenome(), 10); beeMutationFactory.createMutation( - BeeSpecies.BATTY.getSpecies(), BeeSpecies.ETHEREAL.getSpecies(), BeeSpecies.GHASTLY.getGenome(), 9); - beeMutationFactory - .createMutation( - BeeSpecies.GHASTLY.getSpecies(), - BeeSpecies.HATEFUL.getSpecies(), - BeeSpecies.SMOULDERING.getGenome(), - 7) - .restrictBiomeType(BiomeDictionary.Type.NETHER); - beeMutationFactory - .createMutation( - BeeSpecies.SKULKING.getSpecies(), - BeeSpecies.MYSTERIOUS.getSpecies(), - BeeSpecies.BIGBAD.getGenome(), - 7) - .addMutationCondition(new MoonPhaseMutationRestriction(MoonPhase.FULL)); - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Common"), - BeeSpecies.SKULKING.getSpecies(), - BeeSpecies.CHICKEN.getGenome(), - 12) - .restrictBiomeType(Type.FOREST); - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Common"), - BeeSpecies.SKULKING.getSpecies(), - BeeSpecies.BEEF.getGenome(), - 12) - .restrictBiomeType(Type.PLAINS); - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Common"), - BeeSpecies.SKULKING.getSpecies(), - BeeSpecies.PORK.getGenome(), - 12) - .restrictBiomeType(Type.MOUNTAIN); - beeMutationFactory - .createMutation( - BeeSpecies.PORK.getSpecies(), - BeeSpecies.SKULKING.getSpecies(), - BeeSpecies.SHEEPISH.getGenome(), - 13) - .restrictBiomeType(Type.PLAINS); - beeMutationFactory - .createMutation( - BeeSpecies.BEEF.getSpecies(), - BeeSpecies.SHEEPISH.getSpecies(), - BeeSpecies.HORSE.getGenome(), - 12) - .restrictBiomeType(Type.PLAINS); - beeMutationFactory - .createMutation( - BeeSpecies.CHICKEN.getSpecies(), - BeeSpecies.SPIDERY.getSpecies(), - BeeSpecies.CATTY.getGenome(), - 15) - .restrictBiomeType(Type.JUNGLE); + BeeSpecies.BATTY.getSpecies(), + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.GHASTLY.getGenome(), + 9); beeMutationFactory.createMutation( - BeeSpecies.SKULKING.getSpecies(), BeeSpecies.WINDY.getSpecies(), BeeSpecies.BATTY.getGenome(), 9); + BeeSpecies.GHASTLY.getSpecies(), + BeeSpecies.HATEFUL.getSpecies(), + BeeSpecies.SMOULDERING.getGenome(), + 7).restrictBiomeType(BiomeDictionary.Type.NETHER); + beeMutationFactory.createMutation( + BeeSpecies.SKULKING.getSpecies(), + BeeSpecies.MYSTERIOUS.getSpecies(), + BeeSpecies.BIGBAD.getGenome(), + 7).addMutationCondition(new MoonPhaseMutationRestriction(MoonPhase.FULL)); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Common"), + BeeSpecies.SKULKING.getSpecies(), + BeeSpecies.CHICKEN.getGenome(), + 12).restrictBiomeType(Type.FOREST); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Common"), + BeeSpecies.SKULKING.getSpecies(), + BeeSpecies.BEEF.getGenome(), + 12).restrictBiomeType(Type.PLAINS); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Common"), + BeeSpecies.SKULKING.getSpecies(), + BeeSpecies.PORK.getGenome(), + 12).restrictBiomeType(Type.MOUNTAIN); + beeMutationFactory.createMutation( + BeeSpecies.PORK.getSpecies(), + BeeSpecies.SKULKING.getSpecies(), + BeeSpecies.SHEEPISH.getGenome(), + 13).restrictBiomeType(Type.PLAINS); + beeMutationFactory.createMutation( + BeeSpecies.BEEF.getSpecies(), + BeeSpecies.SHEEPISH.getSpecies(), + BeeSpecies.HORSE.getGenome(), + 12).restrictBiomeType(Type.PLAINS); + beeMutationFactory.createMutation( + BeeSpecies.CHICKEN.getSpecies(), + BeeSpecies.SPIDERY.getSpecies(), + BeeSpecies.CATTY.getGenome(), + 15).restrictBiomeType(Type.JUNGLE); + beeMutationFactory.createMutation( + BeeSpecies.SKULKING.getSpecies(), + BeeSpecies.WINDY.getSpecies(), + BeeSpecies.BATTY.getGenome(), + 9); if (ThaumcraftHelper.isActive()) { beeMutationFactory.createMutation( - BeeSpecies.SKULKING.getSpecies(), BeeSpecies.PUPIL.getSpecies(), BeeSpecies.BRAINY.getGenome(), 9); + BeeSpecies.SKULKING.getSpecies(), + BeeSpecies.PUPIL.getSpecies(), + BeeSpecies.BRAINY.getGenome(), + 9); } else { beeMutationFactory.createMutation( BeeSpecies.SKULKING.getSpecies(), @@ -268,24 +285,31 @@ public class BeeMutation { BeeSpecies.ABANDONED.getGenome(), 8); beeMutationFactory.createMutation( - BeeSpecies.NAMELESS.getSpecies(), BeeSpecies.ABANDONED.getSpecies(), BeeSpecies.FORLORN.getGenome(), 6); - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Imperial"), - BeeSpecies.ABANDONED.getSpecies(), - BeeSpecies.DRACONIC.getGenome(), - 6) - .restrictBiomeType(BiomeDictionary.Type.END); + BeeSpecies.NAMELESS.getSpecies(), + BeeSpecies.ABANDONED.getSpecies(), + BeeSpecies.FORLORN.getGenome(), + 6); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Imperial"), + BeeSpecies.ABANDONED.getSpecies(), + BeeSpecies.DRACONIC.getGenome(), + 6).restrictBiomeType(BiomeDictionary.Type.END); beeMutationFactory.createMutation( - BeeSpecies.UNUSUAL.getSpecies(), BeeSpecies.ELDRITCH.getSpecies(), BeeSpecies.MUTABLE.getGenome(), 12); + BeeSpecies.UNUSUAL.getSpecies(), + BeeSpecies.ELDRITCH.getSpecies(), + BeeSpecies.MUTABLE.getGenome(), + 12); beeMutationFactory.createMutation( BeeSpecies.UNUSUAL.getSpecies(), BeeSpecies.MUTABLE.getSpecies(), BeeSpecies.TRANSMUTING.getGenome(), 9); beeMutationFactory.createMutation( - BeeSpecies.UNUSUAL.getSpecies(), BeeSpecies.MUTABLE.getSpecies(), BeeSpecies.CRUMBLING.getGenome(), 9); + BeeSpecies.UNUSUAL.getSpecies(), + BeeSpecies.MUTABLE.getSpecies(), + BeeSpecies.CRUMBLING.getGenome(), + 9); beeMutationFactory.createMutation( BeeSpecies.MYSTICAL.getSpecies(), @@ -294,39 +318,32 @@ public class BeeMutation { 15); if (BeeSpecies.COPPER.isActive()) { - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Industrious"), - Allele.getBaseSpecies("Meadows"), - BeeSpecies.COPPER.getGenome(), - 12) - .requireResource("blockCopper"); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Industrious"), + Allele.getBaseSpecies("Meadows"), + BeeSpecies.COPPER.getGenome(), + 12).requireResource("blockCopper"); } if (BeeSpecies.TIN.isActive()) { - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Industrious"), - Allele.getBaseSpecies("Forest"), - BeeSpecies.TIN.getGenome(), - 12) - .requireResource("blockTin"); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Industrious"), + Allele.getBaseSpecies("Forest"), + BeeSpecies.TIN.getGenome(), + 12).requireResource("blockTin"); } - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Common"), - Allele.getBaseSpecies("Industrious"), - BeeSpecies.IRON.getGenome(), - 12) - .requireResource(Blocks.iron_block, 0); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Common"), + Allele.getBaseSpecies("Industrious"), + BeeSpecies.IRON.getGenome(), + 12).requireResource(Blocks.iron_block, 0); if (BeeSpecies.LEAD.isActive()) { - baseA = (BeeSpecies.TIN.isActive()) - ? BeeSpecies.TIN.getSpecies() + baseA = (BeeSpecies.TIN.isActive()) ? BeeSpecies.TIN.getSpecies() : (BeeSpecies.COPPER.isActive()) ? BeeSpecies.COPPER.getSpecies() : BeeSpecies.IRON.getSpecies(); - mutation = beeMutationFactory.createMutation( - baseA, Allele.getBaseSpecies("Common"), BeeSpecies.LEAD.getGenome(), 10); + mutation = beeMutationFactory + .createMutation(baseA, Allele.getBaseSpecies("Common"), BeeSpecies.LEAD.getGenome(), 10); if (OreDictionary.getOres("blockLead").size() > 0) { mutation.requireResource("blockLead"); } @@ -343,57 +360,46 @@ public class BeeMutation { } } - baseA = (BeeSpecies.EE_MINIUM.isActive()) - ? BeeSpecies.EE_MINIUM.getSpecies() + baseA = (BeeSpecies.EE_MINIUM.isActive()) ? BeeSpecies.EE_MINIUM.getSpecies() : Allele.getBaseSpecies("Imperial"); baseB = (BeeSpecies.LEAD.isActive()) ? BeeSpecies.LEAD.getSpecies() : BeeSpecies.IRON.getSpecies(); - beeMutationFactory - .createMutation(baseA, baseB, BeeSpecies.GOLD.getGenome(), 8) + beeMutationFactory.createMutation(baseA, baseB, BeeSpecies.GOLD.getGenome(), 8) .requireResource(Blocks.gold_block, 0); if (BeeSpecies.ALUMINUM.isActive()) { - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Industrious"), - Allele.getBaseSpecies("Cultivated"), - BeeSpecies.ALUMINUM.getGenome(), - 10) - .requireResource("blockAluminum"); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Industrious"), + Allele.getBaseSpecies("Cultivated"), + BeeSpecies.ALUMINUM.getGenome(), + 10).requireResource("blockAluminum"); } if (BeeSpecies.ARDITE.isActive()) { - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Industrious"), - BeeSpecies.INFERNAL.getSpecies(), - BeeSpecies.ARDITE.getGenome(), - 9) - .requireResource("blockArdite"); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Industrious"), + BeeSpecies.INFERNAL.getSpecies(), + BeeSpecies.ARDITE.getGenome(), + 9).requireResource("blockArdite"); } if (BeeSpecies.COBALT.isActive()) { boolean hasTConCobalt = OreDictionary.getOres("nuggetCobalt").size() > 0 && OreDictionary.getOres("blockCobalt").size() > 0; - boolean hasNaturalCobalt = - OreDictionary.getOres("nuggetNaturalCobalt").size() > 0 - && OreDictionary.getOres("blockNaturalCobalt").size() > 0; + boolean hasNaturalCobalt = OreDictionary.getOres("nuggetNaturalCobalt").size() > 0 + && OreDictionary.getOres("blockNaturalCobalt").size() > 0; if (hasTConCobalt) { - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Imperial"), - BeeSpecies.INFERNAL.getSpecies(), - BeeSpecies.COBALT.getGenome(), - 11) - .requireResource("blockCobalt"); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Imperial"), + BeeSpecies.INFERNAL.getSpecies(), + BeeSpecies.COBALT.getGenome(), + 11).requireResource("blockCobalt"); } if (hasNaturalCobalt) { - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Imperial"), - BeeSpecies.INFERNAL.getSpecies(), - BeeSpecies.COBALT.getGenome(), - 11) - .requireResource("blockNaturalCobalt"); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Imperial"), + BeeSpecies.INFERNAL.getSpecies(), + BeeSpecies.COBALT.getGenome(), + 11).requireResource("blockNaturalCobalt"); } if (!(hasTConCobalt || hasNaturalCobalt)) { beeMutationFactory.createMutation( @@ -405,13 +411,11 @@ public class BeeMutation { } if (BeeSpecies.MANYULLYN.isActive()) { - beeMutationFactory - .createMutation( - BeeSpecies.ARDITE.getSpecies(), - BeeSpecies.COBALT.getSpecies(), - BeeSpecies.MANYULLYN.getGenome(), - 9) - .requireResource("blockManyullyn"); + beeMutationFactory.createMutation( + BeeSpecies.ARDITE.getSpecies(), + BeeSpecies.COBALT.getSpecies(), + BeeSpecies.MANYULLYN.getGenome(), + 9).requireResource("blockManyullyn"); } if (BeeSpecies.OSMIUM.isActive()) { @@ -423,36 +427,29 @@ public class BeeMutation { } } - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Austere"), - BeeSpecies.GOLD.getSpecies(), - BeeSpecies.DIAMOND.getGenome(), - 7) - .requireResource("blockDiamond"); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Austere"), + BeeSpecies.GOLD.getSpecies(), + BeeSpecies.DIAMOND.getGenome(), + 7).requireResource("blockDiamond"); baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER.getSpecies() : Allele.getBaseSpecies("Imperial"); - beeMutationFactory - .createMutation(Allele.getBaseSpecies("Austere"), baseA, BeeSpecies.EMERALD.getGenome(), 6) + beeMutationFactory.createMutation(Allele.getBaseSpecies("Austere"), baseA, BeeSpecies.EMERALD.getGenome(), 6) .requireResource("blockEmerald"); - beeMutationFactory - .createMutation( - Allele.getBaseSpecies("Rural"), - BeeSpecies.COPPER.getSpecies(), - BeeSpecies.APATITE.getGenome(), - 12) - .requireResource("blockApatite"); + beeMutationFactory.createMutation( + Allele.getBaseSpecies("Rural"), + BeeSpecies.COPPER.getSpecies(), + BeeSpecies.APATITE.getGenome(), + 12).requireResource("blockApatite"); if (BeeSpecies.SILICON.isActive()) { - baseA = (BeeSpecies.AE_SKYSTONE.isActive()) - ? BeeSpecies.AE_SKYSTONE.getSpecies() + baseA = (BeeSpecies.AE_SKYSTONE.isActive()) ? BeeSpecies.AE_SKYSTONE.getSpecies() : BeeSpecies.EARTHY.getSpecies(); beeMutationFactory.createMutation(baseA, BeeSpecies.IRON.getSpecies(), BeeSpecies.SILICON.getGenome(), 17); } if (BeeSpecies.CERTUS.isActive()) { baseA = (BeeSpecies.SILICON.isActive()) ? BeeSpecies.SILICON.getSpecies() : BeeSpecies.IRON.getSpecies(); - baseB = (BeeSpecies.AE_SKYSTONE.isActive()) - ? BeeSpecies.AE_SKYSTONE.getSpecies() + baseB = (BeeSpecies.AE_SKYSTONE.isActive()) ? BeeSpecies.AE_SKYSTONE.getSpecies() : BeeSpecies.EARTHY.getSpecies(); beeMutationFactory.createMutation(baseA, baseB, BeeSpecies.CERTUS.getGenome(), 13); } @@ -465,76 +462,59 @@ public class BeeMutation { } else { baseA = BeeSpecies.IRON.getSpecies(); } - baseB = (BeeSpecies.AE_SKYSTONE.isActive()) - ? BeeSpecies.AE_SKYSTONE.getSpecies() + baseB = (BeeSpecies.AE_SKYSTONE.isActive()) ? BeeSpecies.AE_SKYSTONE.getSpecies() : BeeSpecies.EARTHY.getSpecies(); beeMutationFactory.createMutation(baseA, baseB, BeeSpecies.FLUIX.getGenome(), 17); } if (ThaumcraftHelper.isActive()) { - beeMutationFactory - .createMutation( - BeeSpecies.WINDY.getSpecies(), - BeeSpecies.WINDY.getSpecies(), - BeeSpecies.TC_AIR.getGenome(), - 8) - .requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.AIR.ordinal()); - beeMutationFactory - .createMutation( - BeeSpecies.FIREY.getSpecies(), - BeeSpecies.FIREY.getSpecies(), - BeeSpecies.TC_FIRE.getGenome(), - 8) - .requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.FIRE.ordinal()); - beeMutationFactory - .createMutation( - BeeSpecies.WATERY.getSpecies(), - BeeSpecies.WATERY.getSpecies(), - BeeSpecies.TC_WATER.getGenome(), - 8) - .requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.WATER.ordinal()); - beeMutationFactory - .createMutation( - BeeSpecies.EARTHY.getSpecies(), - BeeSpecies.EARTHY.getSpecies(), - BeeSpecies.TC_EARTH.getGenome(), - 8) - .requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.EARTH.ordinal()); - beeMutationFactory - .createMutation( - BeeSpecies.ETHEREAL.getSpecies(), - BeeSpecies.ARCANE.getSpecies(), - BeeSpecies.TC_ORDER.getGenome(), - 8) - .requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.ORDER.ordinal()); - beeMutationFactory - .createMutation( - BeeSpecies.ETHEREAL.getSpecies(), - BeeSpecies.SUPERNATURAL.getSpecies(), - BeeSpecies.TC_CHAOS.getGenome(), - 8) - .requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.CHAOS.ordinal()); + beeMutationFactory.createMutation( + BeeSpecies.WINDY.getSpecies(), + BeeSpecies.WINDY.getSpecies(), + BeeSpecies.TC_AIR.getGenome(), + 8).requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.AIR.ordinal()); + beeMutationFactory.createMutation( + BeeSpecies.FIREY.getSpecies(), + BeeSpecies.FIREY.getSpecies(), + BeeSpecies.TC_FIRE.getGenome(), + 8).requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.FIRE.ordinal()); + beeMutationFactory.createMutation( + BeeSpecies.WATERY.getSpecies(), + BeeSpecies.WATERY.getSpecies(), + BeeSpecies.TC_WATER.getGenome(), + 8).requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.WATER.ordinal()); + beeMutationFactory.createMutation( + BeeSpecies.EARTHY.getSpecies(), + BeeSpecies.EARTHY.getSpecies(), + BeeSpecies.TC_EARTH.getGenome(), + 8).requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.EARTH.ordinal()); + beeMutationFactory.createMutation( + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.ARCANE.getSpecies(), + BeeSpecies.TC_ORDER.getGenome(), + 8).requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.ORDER.ordinal()); + beeMutationFactory.createMutation( + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.SUPERNATURAL.getSpecies(), + BeeSpecies.TC_CHAOS.getGenome(), + 8).requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.CHAOS.ordinal()); - beeMutationFactory - .createMutation( - BeeSpecies.ETHEREAL.getSpecies(), - BeeSpecies.INFERNAL.getSpecies(), - BeeSpecies.TC_VIS.getGenome(), - 9) - .addMutationCondition( + beeMutationFactory.createMutation( + BeeSpecies.ETHEREAL.getSpecies(), + BeeSpecies.INFERNAL.getSpecies(), + BeeSpecies.TC_VIS.getGenome(), + 9).addMutationCondition( new MoonPhaseMutationRestriction(MoonPhase.WAXING_HALF, MoonPhase.WANING_HALF)); beeMutationFactory.createMutation( BeeSpecies.ATTUNED.getSpecies(), BeeSpecies.TC_VIS.getSpecies(), BeeSpecies.TC_REJUVENATING.getGenome(), 8); - beeMutationFactory - .createMutation( - BeeSpecies.TC_VIS.getSpecies(), - BeeSpecies.TC_REJUVENATING.getSpecies(), - BeeSpecies.TC_EMPOWERING.getGenome(), - 6) - .addMutationCondition(new MoonPhaseMutationBonus(MoonPhase.FULL, 1.322f)); + beeMutationFactory.createMutation( + BeeSpecies.TC_VIS.getSpecies(), + BeeSpecies.TC_REJUVENATING.getSpecies(), + BeeSpecies.TC_EMPOWERING.getGenome(), + 6).addMutationCondition(new MoonPhaseMutationBonus(MoonPhase.FULL, 1.322f)); beeMutationFactory .createMutation( BeeSpecies.TC_REJUVENATING.getSpecies(), @@ -544,13 +524,11 @@ public class BeeMutation { .restrictBiomeType(Type.MAGICAL) .requireResource(ThaumcraftHelper.airy, ThaumcraftHelper.AiryBlockType.NODE.ordinal()); - beeMutationFactory - .createMutation( - BeeSpecies.TRANSMUTING.getSpecies(), - BeeSpecies.TC_EMPOWERING.getSpecies(), - BeeSpecies.TC_TAINT.getGenome(), - 11) - .addMutationCondition(new MoonPhaseMutationRestriction(MoonPhase.NEW)); + beeMutationFactory.createMutation( + BeeSpecies.TRANSMUTING.getSpecies(), + BeeSpecies.TC_EMPOWERING.getSpecies(), + BeeSpecies.TC_TAINT.getGenome(), + 11).addMutationCondition(new MoonPhaseMutationRestriction(MoonPhase.NEW)); beeMutationFactory .createMutation( BeeSpecies.TRANSMUTING.getSpecies(), @@ -574,14 +552,11 @@ public class BeeMutation { .addMutationCondition( new MoonPhaseMutationRestriction(MoonPhase.WANING_CRESCENT, MoonPhase.WAXING_CRESCENT)); - beeMutationFactory - .createMutation( - BeeSpecies.IRON.getSpecies(), - BeeSpecies.TC_TAINT.getSpecies(), - BeeSpecies.TC_VOID.getGenome(), - 5) - .restrictBiomeType(Type.MAGICAL) - .requireNight(); + beeMutationFactory.createMutation( + BeeSpecies.IRON.getSpecies(), + BeeSpecies.TC_TAINT.getSpecies(), + BeeSpecies.TC_VOID.getGenome(), + 5).restrictBiomeType(Type.MAGICAL).requireNight(); } if (ArsMagicaHelper.isActive()) { @@ -633,7 +608,10 @@ public class BeeMutation { BeeSpecies.AM_PLANT.getGenome(), 8); beeMutationFactory.createMutation( - BeeSpecies.WATERY.getSpecies(), BeeSpecies.AM_WATER.getSpecies(), BeeSpecies.AM_ICE.getGenome(), 8); + BeeSpecies.WATERY.getSpecies(), + BeeSpecies.AM_WATER.getSpecies(), + BeeSpecies.AM_ICE.getGenome(), + 8); beeMutationFactory.createMutation( BeeSpecies.SKULKING.getSpecies(), @@ -656,103 +634,79 @@ public class BeeMutation { } if (RedstoneArsenalHelper.isActive()) { - beeMutationFactory - .createMutation( - BeeSpecies.TE_ELECTRUM.getSpecies(), - BeeSpecies.TE_DESTABILIZED.getSpecies(), - BeeSpecies.RSA_FLUXED.getGenome(), - 10) - .requireResource("blockElectrumFlux"); + beeMutationFactory.createMutation( + BeeSpecies.TE_ELECTRUM.getSpecies(), + BeeSpecies.TE_DESTABILIZED.getSpecies(), + BeeSpecies.RSA_FLUXED.getGenome(), + 10).requireResource("blockElectrumFlux"); } if (ThermalModsHelper.isActive()) { - beeMutationFactory - .createMutation( - BeeSpecies.TIN.getSpecies(), - BeeSpecies.COPPER.getSpecies(), - BeeSpecies.TE_BRONZE.getGenome(), - 12) - .requireResource("blockBronze"); + beeMutationFactory.createMutation( + BeeSpecies.TIN.getSpecies(), + BeeSpecies.COPPER.getSpecies(), + BeeSpecies.TE_BRONZE.getGenome(), + 12).requireResource("blockBronze"); - beeMutationFactory - .createMutation( - BeeSpecies.GOLD.getSpecies(), - BeeSpecies.SILVER.getSpecies(), - BeeSpecies.TE_ELECTRUM.getGenome(), - 10) - .requireResource("blockElectrum"); + beeMutationFactory.createMutation( + BeeSpecies.GOLD.getSpecies(), + BeeSpecies.SILVER.getSpecies(), + BeeSpecies.TE_ELECTRUM.getGenome(), + 10).requireResource("blockElectrum"); - beeMutationFactory - .createMutation( - BeeSpecies.IRON.getSpecies(), - BeeSpecies.ESOTERIC.getSpecies(), - BeeSpecies.TE_NICKEL.getGenome(), - 14) - .requireResource("blockNickel"); + beeMutationFactory.createMutation( + BeeSpecies.IRON.getSpecies(), + BeeSpecies.ESOTERIC.getSpecies(), + BeeSpecies.TE_NICKEL.getGenome(), + 14).requireResource("blockNickel"); - beeMutationFactory - .createMutation( - BeeSpecies.IRON.getSpecies(), - BeeSpecies.TE_NICKEL.getSpecies(), - BeeSpecies.TE_INVAR.getGenome(), - 14) - .requireResource("blockInvar"); + beeMutationFactory.createMutation( + BeeSpecies.IRON.getSpecies(), + BeeSpecies.TE_NICKEL.getSpecies(), + BeeSpecies.TE_INVAR.getGenome(), + 14).requireResource("blockInvar"); - beeMutationFactory - .createMutation( - BeeSpecies.TE_NICKEL.getSpecies(), - BeeSpecies.TE_INVAR.getSpecies(), - BeeSpecies.TE_PLATINUM.getGenome(), - 10) - .requireResource("blockPlatinum"); + beeMutationFactory.createMutation( + BeeSpecies.TE_NICKEL.getSpecies(), + BeeSpecies.TE_INVAR.getSpecies(), + BeeSpecies.TE_PLATINUM.getGenome(), + 10).requireResource("blockPlatinum"); - beeMutationFactory - .createMutation( - BeeSpecies.TIN.getSpecies(), - BeeSpecies.COPPER.getSpecies(), - BeeSpecies.TE_BRONZE.getGenome(), - 12) - .requireResource("blockBronze"); + beeMutationFactory.createMutation( + BeeSpecies.TIN.getSpecies(), + BeeSpecies.COPPER.getSpecies(), + BeeSpecies.TE_BRONZE.getGenome(), + 12).requireResource("blockBronze"); - beeMutationFactory - .createMutation( - BeeSpecies.SPITEFUL.getSpecies(), - BeeSpecies.TIN.getSpecies(), - BeeSpecies.TE_COAL.getGenome(), - 12) - .requireResource(Blocks.coal_ore, 0); + beeMutationFactory.createMutation( + BeeSpecies.SPITEFUL.getSpecies(), + BeeSpecies.TIN.getSpecies(), + BeeSpecies.TE_COAL.getGenome(), + 12).requireResource(Blocks.coal_ore, 0); - beeMutationFactory - .createMutation( - BeeSpecies.SPITEFUL.getSpecies(), - Allele.getBaseSpecies("Industrious"), - BeeSpecies.TE_DESTABILIZED.getGenome(), - 12) - .requireResource(Blocks.redstone_ore, 0); + beeMutationFactory.createMutation( + BeeSpecies.SPITEFUL.getSpecies(), + Allele.getBaseSpecies("Industrious"), + BeeSpecies.TE_DESTABILIZED.getGenome(), + 12).requireResource(Blocks.redstone_ore, 0); - beeMutationFactory - .createMutation( - BeeSpecies.SMOULDERING.getSpecies(), - BeeSpecies.INFERNAL.getSpecies(), - BeeSpecies.TE_LUX.getGenome(), - 12) - .requireResource(Blocks.glowstone, 0); + beeMutationFactory.createMutation( + BeeSpecies.SMOULDERING.getSpecies(), + BeeSpecies.INFERNAL.getSpecies(), + BeeSpecies.TE_LUX.getGenome(), + 12).requireResource(Blocks.glowstone, 0); - beeMutationFactory - .createMutation( - BeeSpecies.SMOULDERING.getSpecies(), - Allele.getBaseSpecies("Austere"), - BeeSpecies.TE_DANTE.getGenome(), - 12) - .restrictBiomeType(BiomeDictionary.Type.NETHER); + beeMutationFactory.createMutation( + BeeSpecies.SMOULDERING.getSpecies(), + Allele.getBaseSpecies("Austere"), + BeeSpecies.TE_DANTE.getGenome(), + 12).restrictBiomeType(BiomeDictionary.Type.NETHER); - beeMutationFactory - .createMutation( - BeeSpecies.TE_DANTE.getSpecies(), - BeeSpecies.TE_COAL.getSpecies(), - BeeSpecies.TE_PYRO.getGenome(), - 8) - .restrictBiomeType(BiomeDictionary.Type.NETHER); + beeMutationFactory.createMutation( + BeeSpecies.TE_DANTE.getSpecies(), + BeeSpecies.TE_COAL.getSpecies(), + BeeSpecies.TE_PYRO.getGenome(), + 8).restrictBiomeType(BiomeDictionary.Type.NETHER); beeMutationFactory.createMutation( BeeSpecies.SKULKING.getSpecies(), @@ -793,54 +747,42 @@ public class BeeMutation { BeeSpecies.TE_WINSOME.getGenome(), 12); - beeMutationFactory - .createMutation( - BeeSpecies.TE_WINSOME.getSpecies(), - BeeSpecies.TE_COAL.getSpecies(), - BeeSpecies.TE_ENDEARING.getGenome(), - 8) - .requireResource("blockEnderium"); + beeMutationFactory.createMutation( + BeeSpecies.TE_WINSOME.getSpecies(), + BeeSpecies.TE_COAL.getSpecies(), + BeeSpecies.TE_ENDEARING.getGenome(), + 8).requireResource("blockEnderium"); - beeMutationFactory - .createMutation( - BeeSpecies.COPPER.getSpecies(), - BeeSpecies.TE_DESTABILIZED.getSpecies(), - BeeSpecies.TE_SIGNALUS.getGenome(), - 8) - .requireResource("blockSignalum"); + beeMutationFactory.createMutation( + BeeSpecies.COPPER.getSpecies(), + BeeSpecies.TE_DESTABILIZED.getSpecies(), + BeeSpecies.TE_SIGNALUS.getGenome(), + 8).requireResource("blockSignalum"); - beeMutationFactory - .createMutation( - BeeSpecies.TIN.getSpecies(), - BeeSpecies.TE_LUX.getSpecies(), - BeeSpecies.TE_LUMIUS.getGenome(), - 8) - .requireResource("blockLumium"); + beeMutationFactory.createMutation( + BeeSpecies.TIN.getSpecies(), + BeeSpecies.TE_LUX.getSpecies(), + BeeSpecies.TE_LUMIUS.getGenome(), + 8).requireResource("blockLumium"); } if (BotaniaHelper.isActive()) { - beeMutationFactory - .createMutation( - BeeSpecies.ELDRITCH.getSpecies(), - Allele.getBaseSpecies("Forest"), - BeeSpecies.BOT_ROOTED.getGenome(), - 15) - .requireResource(BotaniaHelper.blockLivingWood, 0); + beeMutationFactory.createMutation( + BeeSpecies.ELDRITCH.getSpecies(), + Allele.getBaseSpecies("Forest"), + BeeSpecies.BOT_ROOTED.getGenome(), + 15).requireResource(BotaniaHelper.blockLivingWood, 0); - beeMutationFactory - .createMutation( - BeeSpecies.BOT_ROOTED.getSpecies(), - BeeSpecies.WATERY.getSpecies(), - BeeSpecies.BOT_SOMNOLENT.getGenome(), - 16) - .requireNight(); - beeMutationFactory - .createMutation( - BeeSpecies.WINDY.getSpecies(), - BeeSpecies.BOT_SOMNOLENT.getSpecies(), - BeeSpecies.BOT_DREAMING.getGenome(), - 8) - .requireNight(); + beeMutationFactory.createMutation( + BeeSpecies.BOT_ROOTED.getSpecies(), + BeeSpecies.WATERY.getSpecies(), + BeeSpecies.BOT_SOMNOLENT.getGenome(), + 16).requireNight(); + beeMutationFactory.createMutation( + BeeSpecies.WINDY.getSpecies(), + BeeSpecies.BOT_SOMNOLENT.getSpecies(), + BeeSpecies.BOT_DREAMING.getGenome(), + 8).requireNight(); beeMutationFactory.createMutation( BeeSpecies.BOT_BOTANIC.getSpecies(), @@ -856,13 +798,11 @@ public class BeeMutation { if (AppliedEnergisticsHelper.isActive()) { if (BeeSpecies.AE_SKYSTONE.isActive()) { - beeMutationFactory - .createMutation( - BeeSpecies.EARTHY.getSpecies(), - BeeSpecies.WINDY.getSpecies(), - BeeSpecies.AE_SKYSTONE.getGenome(), - 20) - .requireResource(AppliedEnergisticsHelper.skystone, 0); + beeMutationFactory.createMutation( + BeeSpecies.EARTHY.getSpecies(), + BeeSpecies.WINDY.getSpecies(), + BeeSpecies.AE_SKYSTONE.getGenome(), + 20).requireResource(AppliedEnergisticsHelper.skystone, 0); } } } diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index f59e1f3..b6b5745 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -19,6 +19,7 @@ import magicbees.main.utils.compat.ForestryHelper; import magicbees.main.utils.compat.RedstoneArsenalHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.ThermalModsHelper; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -40,8 +41,7 @@ public class BeeProductHelper { CHARMED.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 0.18f); ENCHANTED.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 0.20f); - SUPERNATURAL - .addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 0.25f) + SUPERNATURAL.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 0.25f) .addSpecialty(Config.pollen.getStackForType(PollenType.UNUSUAL), 0.08f); ETHEREAL.addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.10f) @@ -67,33 +67,27 @@ public class BeeProductHelper { GHASTLY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.08f) .addSpecialty(new ItemStack(Items.ghast_tear), 0.099f); SPIDERY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.13f) - .addProduct(new ItemStack(Items.string), 0.08f) - .addSpecialty(new ItemStack(Items.spider_eye), 0.08f); - SMOULDERING - .addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) + .addProduct(new ItemStack(Items.string), 0.08f).addSpecialty(new ItemStack(Items.spider_eye), 0.08f); + SMOULDERING.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addProduct(Config.combs.getStackForType(CombType.MOLTEN), 0.10f) .addSpecialty(new ItemStack(Items.blaze_rod), 0.05f); BRAINY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addProduct(new ItemStack(Items.rotten_flesh), 0.06f); BIGBAD.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.18f) - .addProduct(new ItemStack(Items.beef), 0.12f) - .addProduct(new ItemStack(Items.chicken), 0.12f) + .addProduct(new ItemStack(Items.beef), 0.12f).addProduct(new ItemStack(Items.chicken), 0.12f) .addSpecialty(new ItemStack(Items.melon), 0.20f); BATTY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addSpecialty(new ItemStack(Items.string), 0.20f); CHICKEN.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.23f) - .addSpecialty(new ItemStack(Items.feather), 0.08f) - .addSpecialty(new ItemStack(Items.egg), 0.08f); + .addSpecialty(new ItemStack(Items.feather), 0.08f).addSpecialty(new ItemStack(Items.egg), 0.08f); BEEF.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.25f) .addSpecialty(new ItemStack(Items.leather), 0.165f); PORK.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addSpecialty(new ItemStack(Items.carrot), 0.165f); SHEEPISH.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.25f) - .addSpecialty(new ItemStack(Blocks.wool), 0.16f) - .addSpecialty(new ItemStack(Items.wheat), 0.24f); + .addSpecialty(new ItemStack(Blocks.wool), 0.16f).addSpecialty(new ItemStack(Items.wheat), 0.24f); HORSE.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.25f) - .addSpecialty(new ItemStack(Items.leather), 0.24f) - .addSpecialty(new ItemStack(Items.apple), 0.38f); + .addSpecialty(new ItemStack(Items.leather), 0.24f).addSpecialty(new ItemStack(Items.apple), 0.38f); CATTY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.25f) .addSpecialty(new ItemStack(Items.fish), 0.24f); @@ -129,13 +123,11 @@ public class BeeProductHelper { MUTABLE.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.30f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.10f); - TRANSMUTING - .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.10f) + TRANSMUTING.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.10f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.30f) .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 0.05f) .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.SIMMERING.ordinal()), 0.05f); - CRUMBLING - .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.10f) + CRUMBLING.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.10f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.30f) .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.POWDERY.ordinal()), 0.10f) .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.COCOA.ordinal()), 0.15f); @@ -166,16 +158,14 @@ public class BeeProductHelper { } TE_PLATINUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetPlatinum").size() > 0 - && OreDictionary.getOres("ingotPlatinum").size() > 0) { + if (OreDictionary.getOres("nuggetPlatinum").size() > 0 && OreDictionary.getOres("ingotPlatinum").size() > 0) { TE_PLATINUM.addSpecialty(OreDictionary.getOres("nuggetPlatinum").get(0), 0.18f); } else { TE_PLATINUM.setInactive(); } TE_NICKEL.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetNickel").size() > 0 - && OreDictionary.getOres("ingotNickel").size() > 0) { + if (OreDictionary.getOres("nuggetNickel").size() > 0 && OreDictionary.getOres("ingotNickel").size() > 0) { TE_NICKEL.addSpecialty(OreDictionary.getOres("nuggetNickel").get(0), 0.18f); } else { TE_NICKEL.setInactive(); @@ -200,24 +190,21 @@ public class BeeProductHelper { } TE_BRONZE.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetBronze").size() > 0 - && OreDictionary.getOres("ingotBronze").size() > 0) { + if (OreDictionary.getOres("nuggetBronze").size() > 0 && OreDictionary.getOres("ingotBronze").size() > 0) { TE_BRONZE.addSpecialty(OreDictionary.getOres("nuggetBronze").get(0), 0.18f); } else { TE_BRONZE.setInactive(); } TE_INVAR.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetInvar").size() > 0 - && OreDictionary.getOres("ingotInvar").size() > 0) { + if (OreDictionary.getOres("nuggetInvar").size() > 0 && OreDictionary.getOres("ingotInvar").size() > 0) { TE_INVAR.addSpecialty(OreDictionary.getOres("nuggetInvar").get(0), 0.18f); } else { TE_INVAR.setInactive(); } TE_ELECTRUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetElectrum").size() > 0 - && OreDictionary.getOres("ingotElectrum").size() > 0) { + if (OreDictionary.getOres("nuggetElectrum").size() > 0 && OreDictionary.getOres("ingotElectrum").size() > 0) { TE_ELECTRUM.addSpecialty(OreDictionary.getOres("nuggetElectrum").get(0), 0.18f); } else { TE_ELECTRUM.setInactive(); @@ -271,14 +258,17 @@ public class BeeProductHelper { TC_REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.18f); TC_EMPOWERING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.14f); TC_EMPOWERING.addSpecialty( - new ItemStack(ForestryHelper.pollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), 0.02f); + new ItemStack(ForestryHelper.pollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), + 0.02f); TC_NEXUS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.25f); TC_NEXUS.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 0.12f); TC_NEXUS.addSpecialty( - new ItemStack(ForestryHelper.pollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), 0.02f); + new ItemStack(ForestryHelper.pollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), + 0.02f); TC_TAINT.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.18f); TC_TAINT.addProduct( - new ItemStack(ForestryHelper.craftingResource, 1, ForestryHelper.Propolis.STICKY.ordinal()), 0.213f); + new ItemStack(ForestryHelper.craftingResource, 1, ForestryHelper.Propolis.STICKY.ordinal()), + 0.213f); TC_PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.16f); TC_PURE.addSpecialty(Config.combs.getStackForType(CombType.SOUL), 0.19f); TC_HUNGRY.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.28f); @@ -340,29 +330,42 @@ public class BeeProductHelper { if (ArsMagicaHelper.isActive()) { AM_QUINTESSENCE.addSpecialty( new ItemStack( - ArsMagicaHelper.itemResource, 1, ArsMagicaHelper.ResourceType.ARCANE_COMPOUND.ordinal()), + ArsMagicaHelper.itemResource, + 1, + ArsMagicaHelper.ResourceType.ARCANE_COMPOUND.ordinal()), 0.05f); AM_EARTH.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.EARTH.ordinal()), 0.07f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.EARTH.ordinal()), + 0.07f); AM_AIR.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.AIR.ordinal()), 0.07f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.AIR.ordinal()), + 0.07f); AM_FIRE.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.FIRE.ordinal()), 0.07f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.FIRE.ordinal()), + 0.07f); AM_WATER.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.WATER.ordinal()), 0.07f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.WATER.ordinal()), + 0.07f); AM_LIGHTNING.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.LIGHTNING.ordinal()), 0.07f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.LIGHTNING.ordinal()), + 0.07f); AM_PLANT.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.PLANT.ordinal()), 0.07f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.PLANT.ordinal()), + 0.07f); AM_ICE.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.ICE.ordinal()), 0.07f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.ICE.ordinal()), + 0.07f); AM_ARCANE.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.ARCANE.ordinal()), 0.11f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.ARCANE.ordinal()), + 0.11f); AM_VORTEX.addSpecialty( - new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.EARTH.ordinal()), 0.15f); + new ItemStack(ArsMagicaHelper.essence, 1, ArsMagicaHelper.EssenceType.EARTH.ordinal()), + 0.15f); AM_WIGHT.addSpecialty( new ItemStack( - ArsMagicaHelper.itemResource, 1, ArsMagicaHelper.ResourceType.ARCANE_COMPOUND.ordinal()), + ArsMagicaHelper.itemResource, + 1, + ArsMagicaHelper.ResourceType.ARCANE_COMPOUND.ordinal()), 0.11f); } } @@ -374,15 +377,13 @@ public class BeeProductHelper { TE_PYRO.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addProduct(Config.combs.getStackForType(CombType.MOLTEN), 0.10f) .addSpecialty(new ItemStack(Items.blaze_powder), 0.05f); - TE_DESTABILIZED - .addProduct(Config.combs.getStackForType(CombType.TE_DESTABILIZED), 0.10f) + TE_DESTABILIZED.addProduct(Config.combs.getStackForType(CombType.TE_DESTABILIZED), 0.10f) .addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.10f) .addSpecialty(new ItemStack(Items.redstone), 0.05f); TE_LUX.addProduct(Config.combs.getStackForType(CombType.TE_LUX), 0.10f) .addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.10f) .addSpecialty(new ItemStack(Items.glowstone_dust), 0.05f); - TE_WINSOME - .addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) + TE_WINSOME.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addProduct(Config.combs.getStackForType(CombType.TE_ENDEARING), 0.05f) .addSpecialty(new ItemStack(Items.ender_pearl), 0.05f); TE_ENDEARING @@ -398,11 +399,9 @@ public class BeeProductHelper { TE_GROUNDED.addProduct(Config.combs.getStackForType(CombType.EARTHY), 0.16f); TE_ROCKING.addProduct(Config.combs.getStackForType(CombType.EARTHY), 0.29f); - TE_SIGNALUS - .addProduct(Config.combs.getStackForType(CombType.TE_DESTABILIZED), 0.10f) + TE_SIGNALUS.addProduct(Config.combs.getStackForType(CombType.TE_DESTABILIZED), 0.10f) .addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.10f); - TE_LUMIUS - .addProduct(Config.combs.getStackForType(CombType.TE_LUX), 0.10f) + TE_LUMIUS.addProduct(Config.combs.getStackForType(CombType.TE_LUX), 0.10f) .addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.10f); if (ThermalModsHelper.isActive()) { @@ -432,26 +431,19 @@ public class BeeProductHelper { public static void initBotaniaProducts() { BOT_ROOTED.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.10f); - BOT_BOTANIC - .addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.10f) + BOT_BOTANIC.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.10f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.05f); - BOT_BLOSSOM - .addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.20f) + BOT_BLOSSOM.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.20f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.05f); - BOT_FLORAL - .addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.25f) + BOT_FLORAL.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.25f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.05f); - BOT_VAZBEE - .addProduct(Config.combs.getStackForType(CombType.SOUL), 0.05f) - .addProduct(new ItemStack(Items.dye, 1, 9), 0.20f) - .addProduct(new ItemStack(Blocks.wool, 1, 9), 0.02f) + BOT_VAZBEE.addProduct(Config.combs.getStackForType(CombType.SOUL), 0.05f) + .addProduct(new ItemStack(Items.dye, 1, 9), 0.20f).addProduct(new ItemStack(Blocks.wool, 1, 9), 0.02f) .addProduct(new ItemStack(Blocks.red_flower, 1, 7), 0.06f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.15f); - BOT_SOMNOLENT - .addProduct(Config.combs.getStackForType(CombType.WATERY), 0.08f) + BOT_SOMNOLENT.addProduct(Config.combs.getStackForType(CombType.WATERY), 0.08f) .addProduct(Config.combs.getStackForType(CombType.SOUL), 0.15f); - BOT_DREAMING - .addProduct(Config.combs.getStackForType(CombType.WATERY), 0.16f) + BOT_DREAMING.addProduct(Config.combs.getStackForType(CombType.WATERY), 0.16f) .addProduct(Config.combs.getStackForType(CombType.SOUL), 0.33f); BOT_ALFHEIM.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 0.28f); diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index ce17eaf..76f4083 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -1,5 +1,15 @@ package magicbees.bees; +import magicbees.main.utils.compat.AppliedEnergisticsHelper; +import magicbees.main.utils.compat.ArsMagicaHelper; +import magicbees.main.utils.compat.BotaniaHelper; +import magicbees.main.utils.compat.EquivalentExchangeHelper; +import magicbees.main.utils.compat.RedstoneArsenalHelper; +import magicbees.main.utils.compat.ThaumcraftHelper; +import magicbees.main.utils.compat.ThermalModsHelper; + +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -14,1282 +24,301 @@ import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IClassification; -import magicbees.main.utils.compat.AppliedEnergisticsHelper; -import magicbees.main.utils.compat.ArsMagicaHelper; -import magicbees.main.utils.compat.BotaniaHelper; -import magicbees.main.utils.compat.EquivalentExchangeHelper; -import magicbees.main.utils.compat.RedstoneArsenalHelper; -import magicbees.main.utils.compat.ThaumcraftHelper; -import magicbees.main.utils.compat.ThermalModsHelper; -import net.minecraft.item.ItemStack; public enum BeeSpecies { - MYSTICAL( - "Mystical", - "mysticum", - BeeClassification.VEILED, - 0xAFFFB7, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false, + + MYSTICAL("Mystical", "mysticum", BeeClassification.VEILED, 0xAFFFB7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, false, true), + SORCEROUS("Sorcerous", "fascinatio", BeeClassification.VEILED, 0xEA9A9A, EnumTemperature.HOT, EnumHumidity.ARID, + false, false, true), + UNUSUAL("Unusual", "inusitatus", BeeClassification.VEILED, 0x72D361, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, false, true), + ATTUNED("Attuned", "similis", BeeClassification.VEILED, 0x0086A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, false, true), + + ELDRITCH("Eldritch", "prodigiosus", BeeClassification.VEILED, 0x8D75A0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, true), + + ESOTERIC("Esoteric", "secretiore", BeeClassification.ARCANE, 0x001099, BodyColours.ARCANE, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + MYSTERIOUS("Mysterious", "mysticus", BeeClassification.ARCANE, 0x762bc2, BodyColours.ARCANE, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + ARCANE("Arcane", "arcanus", BeeClassification.ARCANE, 0xd242df, BodyColours.ARCANE, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, true, true), + + CHARMED("Charmed", "larvatus", BeeClassification.SUPERNATURAL, 0x48EEEC, BodyColours.ARCANE, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + ENCHANTED("Enchanted", "cantatus", BeeClassification.SUPERNATURAL, 0x18e726, BodyColours.ARCANE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + SUPERNATURAL("Supernatural", "coeleste", BeeClassification.SUPERNATURAL, 0x005614, BodyColours.ARCANE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + + ETHEREAL("Ethereal", "diaphanum", BeeClassification.MAGICAL, 0xBA3B3B, 0xEFF8FF, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + + WATERY("Watery", "aquatilis", BeeClassification.MAGICAL, 0x313C5E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, true), + EARTHY("Earthen", "fictili", BeeClassification.MAGICAL, 0x78822D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, true), + FIREY("Firey", "ardens", BeeClassification.MAGICAL, 0xD35119, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - SORCEROUS( - "Sorcerous", - "fascinatio", - BeeClassification.VEILED, - 0xEA9A9A, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, - false, - true), - UNUSUAL( - "Unusual", - "inusitatus", - BeeClassification.VEILED, - 0x72D361, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false, - true), - ATTUNED( - "Attuned", - "similis", - BeeClassification.VEILED, - 0x0086A8, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false, + WINDY("Windy", "ventosum", BeeClassification.MAGICAL, 0xFFFDBA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - ELDRITCH( - "Eldritch", - "prodigiosus", - BeeClassification.VEILED, - 0x8D75A0, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), + PUPIL("Pupil", "disciplina", BeeClassification.SCHOLARLY, 0xFFFF00, EnumTemperature.NORMAL, EnumHumidity.ARID, + false, true), + SCHOLARLY("Scholarly", "studiosis", BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, + EnumHumidity.ARID, false, false), + SAVANT("Savant", "philologus", BeeClassification.SCHOLARLY, 0xFFA042, EnumTemperature.NORMAL, EnumHumidity.ARID, + true, false), - ESOTERIC( - "Esoteric", - "secretiore", - BeeClassification.ARCANE, - 0x001099, - BodyColours.ARCANE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - MYSTERIOUS( - "Mysterious", - "mysticus", - BeeClassification.ARCANE, - 0x762bc2, - BodyColours.ARCANE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - ARCANE( - "Arcane", - "arcanus", - BeeClassification.ARCANE, - 0xd242df, - BodyColours.ARCANE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - true), - - CHARMED( - "Charmed", - "larvatus", - BeeClassification.SUPERNATURAL, - 0x48EEEC, - BodyColours.ARCANE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - ENCHANTED( - "Enchanted", - "cantatus", - BeeClassification.SUPERNATURAL, - 0x18e726, - BodyColours.ARCANE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - SUPERNATURAL( - "Supernatural", - "coeleste", - BeeClassification.SUPERNATURAL, - 0x005614, - BodyColours.ARCANE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - true), - - ETHEREAL( - "Ethereal", - "diaphanum", - BeeClassification.MAGICAL, - 0xBA3B3B, - 0xEFF8FF, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - - WATERY( - "Watery", - "aquatilis", - BeeClassification.MAGICAL, - 0x313C5E, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - EARTHY( - "Earthen", - "fictili", - BeeClassification.MAGICAL, - 0x78822D, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - FIREY( - "Firey", - "ardens", - BeeClassification.MAGICAL, - 0xD35119, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - WINDY( - "Windy", - "ventosum", - BeeClassification.MAGICAL, - 0xFFFDBA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - - PUPIL( - "Pupil", - "disciplina", - BeeClassification.SCHOLARLY, - 0xFFFF00, - EnumTemperature.NORMAL, - EnumHumidity.ARID, - false, - true), - SCHOLARLY( - "Scholarly", - "studiosis", - BeeClassification.SCHOLARLY, - 0x6E0000, - EnumTemperature.NORMAL, - EnumHumidity.ARID, - false, - false), - SAVANT( - "Savant", - "philologus", - BeeClassification.SCHOLARLY, - 0xFFA042, - EnumTemperature.NORMAL, - EnumHumidity.ARID, - true, - false), - - AWARE( - "Aware", - "sensibilis", - BeeClassification.MAGICAL, - 0x5E95B5, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + AWARE("Aware", "sensibilis", BeeClassification.MAGICAL, 0x5E95B5, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, false), SPIRIT("Spirit", "larva", BeeClassification.SOUL, 0xb2964b, EnumTemperature.WARM, EnumHumidity.NORMAL, false, true), SOUL("Soul", "anima", BeeClassification.SOUL, 0x7d591b, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false), - SKULKING( - "Skulking", - "malevolens", - BeeClassification.SKULKING, - 0x524827, - BodyColours.SKULKING, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - GHASTLY( - "Ghastly", - "pallens", - BeeClassification.SKULKING, - 0xccccee, - 0xbf877c, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - SPIDERY( - "Spidery", - "araneolus", - BeeClassification.SKULKING, - 0x0888888, - 0x222222, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - SMOULDERING( - "Smouldering", - "flagrantia", - BeeClassification.SKULKING, - 0xFFC747, - 0xEA8344, - EnumTemperature.HELLISH, - EnumHumidity.NORMAL, - false, - false), - BRAINY( - "TCBrainy", - "cerebrum", - BeeClassification.SKULKING, - 0x83FF70, - BodyColours.SKULKING, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - BIGBAD( - "BigBad", - "magnumalum", - BeeClassification.SKULKING, - 0xA9344B, - 0x453536, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false, - true, - true, - true), - CHICKEN( - "TCChicken", - "pullus", - BeeClassification.FLESHY, - 0xFF0000, - 0xD3D3D3, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - BEEF( - "TCBeef", - "bubulae", - BeeClassification.FLESHY, - 0xB7B7B7, - 0x3F3024, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - PORK( - "TCPork", - "porcina", - BeeClassification.FLESHY, - 0xF1AEAC, - 0xDF847B, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - BATTY( - "TCBatty", - "chiroptera", - BeeClassification.FLESHY, - 0x5B482B, - 0x271B0F, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - SHEEPISH( - "Sheepish", - "balans", - BeeClassification.FLESHY, - 0xF7F7F7, - 0xCACACA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - HORSE( - "Horse", - "equus", - BeeClassification.FLESHY, - 0x906330, - 0x7B4E1B, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - CATTY( - "Catty", - "feline", - BeeClassification.FLESHY, - 0xECE684, - 0x563C24, - EnumTemperature.HOT, - EnumHumidity.NORMAL, - false, - true), + SKULKING("Skulking", "malevolens", BeeClassification.SKULKING, 0x524827, BodyColours.SKULKING, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + GHASTLY("Ghastly", "pallens", BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + SPIDERY("Spidery", "araneolus", BeeClassification.SKULKING, 0x0888888, 0x222222, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + SMOULDERING("Smouldering", "flagrantia", BeeClassification.SKULKING, 0xFFC747, 0xEA8344, EnumTemperature.HELLISH, + EnumHumidity.NORMAL, false, false), + BRAINY("TCBrainy", "cerebrum", BeeClassification.SKULKING, 0x83FF70, BodyColours.SKULKING, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + BIGBAD("BigBad", "magnumalum", BeeClassification.SKULKING, 0xA9344B, 0x453536, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false, true, true, true), + CHICKEN("TCChicken", "pullus", BeeClassification.FLESHY, 0xFF0000, 0xD3D3D3, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + BEEF("TCBeef", "bubulae", BeeClassification.FLESHY, 0xB7B7B7, 0x3F3024, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, true), + PORK("TCPork", "porcina", BeeClassification.FLESHY, 0xF1AEAC, 0xDF847B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, true), + BATTY("TCBatty", "chiroptera", BeeClassification.FLESHY, 0x5B482B, 0x271B0F, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + SHEEPISH("Sheepish", "balans", BeeClassification.FLESHY, 0xF7F7F7, 0xCACACA, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + HORSE("Horse", "equus", BeeClassification.FLESHY, 0x906330, 0x7B4E1B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, true), + CATTY("Catty", "feline", BeeClassification.FLESHY, 0xECE684, 0x563C24, EnumTemperature.HOT, EnumHumidity.NORMAL, + false, true), - TIMELY( - "Timely", - "gallifreis", - BeeClassification.TIME, - 0xC6AF86, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, + TIMELY("Timely", "gallifreis", BeeClassification.TIME, 0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - LORDLY( - "Lordly", - "rassilonis", - BeeClassification.TIME, - 0xC6AF86, - 0x8E0213, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - DOCTORAL( - "Doctoral", - "medicus qui", - BeeClassification.TIME, - 0xDDE5FC, - 0x4B6E8C, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + LORDLY("Lordly", "rassilonis", BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + DOCTORAL("Doctoral", "medicus qui", BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), - INFERNAL( - "Infernal", - "infernales", - BeeClassification.ABOMINABLE, - 0xFF1C1C, - BodyColours.ABOMINABLE, - EnumTemperature.HELLISH, - EnumHumidity.ARID, - false, - true), - HATEFUL( - "Hateful", - "odibilis", - BeeClassification.ABOMINABLE, - 0xDB00DB, - BodyColours.ABOMINABLE, - EnumTemperature.HELLISH, - EnumHumidity.ARID, - false, - false), - SPITEFUL( - "Spiteful", - "maligna", - BeeClassification.ABOMINABLE, - 0x5FCC00, - BodyColours.ABOMINABLE, - EnumTemperature.HELLISH, - EnumHumidity.ARID, - true, - false), - WITHERING( - "Withering", - "vietus", - BeeClassification.ABOMINABLE, - 0x5B5B5B, - BodyColours.ABOMINABLE, - EnumTemperature.HELLISH, - EnumHumidity.ARID, - true, - false), + INFERNAL("Infernal", "infernales", BeeClassification.ABOMINABLE, 0xFF1C1C, BodyColours.ABOMINABLE, + EnumTemperature.HELLISH, EnumHumidity.ARID, false, true), + HATEFUL("Hateful", "odibilis", BeeClassification.ABOMINABLE, 0xDB00DB, BodyColours.ABOMINABLE, + EnumTemperature.HELLISH, EnumHumidity.ARID, false, false), + SPITEFUL("Spiteful", "maligna", BeeClassification.ABOMINABLE, 0x5FCC00, BodyColours.ABOMINABLE, + EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), + WITHERING("Withering", "vietus", BeeClassification.ABOMINABLE, 0x5B5B5B, BodyColours.ABOMINABLE, + EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), - OBLIVION( - "Oblivion", - "oblivioni", - BeeClassification.EXTRINSIC, - 0xD5C3E5, - BodyColours.EXTRINSIC, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - false, - false), - NAMELESS( - "Nameless", - "sine nomine", - BeeClassification.EXTRINSIC, - 0x8ca7cb, - BodyColours.EXTRINSIC, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - false, - true), - ABANDONED( - "Abandoned", - "reliquit", - BeeClassification.EXTRINSIC, - 0xc5cb8c, - BodyColours.EXTRINSIC, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - false, - true), - FORLORN( - "Forlorn", - "perditus", - BeeClassification.EXTRINSIC, - 0xcba88c, - BodyColours.EXTRINSIC, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - true, - false), - DRACONIC( - "Draconic", - "draconic", - BeeClassification.EXTRINSIC, - 0x9f56ad, - 0x5a3b62, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - true, - false), + OBLIVION("Oblivion", "oblivioni", BeeClassification.EXTRINSIC, 0xD5C3E5, BodyColours.EXTRINSIC, + EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), + NAMELESS("Nameless", "sine nomine", BeeClassification.EXTRINSIC, 0x8ca7cb, BodyColours.EXTRINSIC, + EnumTemperature.COLD, EnumHumidity.NORMAL, false, true), + ABANDONED("Abandoned", "reliquit", BeeClassification.EXTRINSIC, 0xc5cb8c, BodyColours.EXTRINSIC, + EnumTemperature.COLD, EnumHumidity.NORMAL, false, true), + FORLORN("Forlorn", "perditus", BeeClassification.EXTRINSIC, 0xcba88c, BodyColours.EXTRINSIC, EnumTemperature.COLD, + EnumHumidity.NORMAL, true, false), + DRACONIC("Draconic", "draconic", BeeClassification.EXTRINSIC, 0x9f56ad, 0x5a3b62, EnumTemperature.COLD, + EnumHumidity.NORMAL, true, false), - IRON( - "Iron", - "ferrus", - BeeClassification.METALLIC, - 0x686868, - 0xE9E9E9, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - GOLD( - "Gold", - "aurum", - BeeClassification.METALLIC, - 0x684B01, - 0xFFFF0B, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - false), - COPPER( - "Copper", - "aercus", - BeeClassification.METALLIC, - 0x684B01, - 0xFFC81A, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - TIN( - "Tin", - "stannum", - BeeClassification.METALLIC, - 0x3E596D, - 0xA6BACB, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - SILVER( - "Silver", - "argenteus", - BeeClassification.METALLIC, - 0x747C81, - 0x96BFC4, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - LEAD( - "Lead", - "plumbeus", - BeeClassification.METALLIC, - 0x96BFC4, - 0x91A9F3, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - ALUMINUM( - "Aluminum", - "aluminium", - BeeClassification.METALLIC, - 0xEDEDED, - 0x767676, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - ARDITE( - "Ardite", - "aurantiaco", - BeeClassification.METALLIC, - 0x720000, - 0xFF9E00, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, - false), - COBALT( - "Cobalt", - "caeruleo", - BeeClassification.METALLIC, - 0x03265F, - 0x59AAEF, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, - false), - MANYULLYN( - "Manyullyn", - "manahmanah", - BeeClassification.METALLIC, - 0x481D6D, - 0xBD92F1, - EnumTemperature.HOT, - EnumHumidity.ARID, - true, - false), - OSMIUM( - "Osmium", - "hyacintho", - BeeClassification.METALLIC, - 0x374B5B, - 0x6C7B89, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + IRON("Iron", "ferrus", BeeClassification.METALLIC, 0x686868, 0xE9E9E9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, true), + GOLD("Gold", "aurum", BeeClassification.METALLIC, 0x684B01, 0xFFFF0B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + true, false), + COPPER("Copper", "aercus", BeeClassification.METALLIC, 0x684B01, 0xFFC81A, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + TIN("Tin", "stannum", BeeClassification.METALLIC, 0x3E596D, 0xA6BACB, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, true), + SILVER("Silver", "argenteus", BeeClassification.METALLIC, 0x747C81, 0x96BFC4, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + LEAD("Lead", "plumbeus", BeeClassification.METALLIC, 0x96BFC4, 0x91A9F3, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + ALUMINUM("Aluminum", "aluminium", BeeClassification.METALLIC, 0xEDEDED, 0x767676, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + ARDITE("Ardite", "aurantiaco", BeeClassification.METALLIC, 0x720000, 0xFF9E00, EnumTemperature.HOT, + EnumHumidity.ARID, false, false), + COBALT("Cobalt", "caeruleo", BeeClassification.METALLIC, 0x03265F, 0x59AAEF, EnumTemperature.HOT, EnumHumidity.ARID, + false, false), + MANYULLYN("Manyullyn", "manahmanah", BeeClassification.METALLIC, 0x481D6D, 0xBD92F1, EnumTemperature.HOT, + EnumHumidity.ARID, true, false), + OSMIUM("Osmium", "hyacintho", BeeClassification.METALLIC, 0x374B5B, 0x6C7B89, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), - DIAMOND( - "Diamond", - "diamond", - BeeClassification.GEM, - 0x209581, - 0x8DF5E3, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - false), - EMERALD( - "Emerald", - "prasinus", - BeeClassification.GEM, - 0x005300, - 0x17DD62, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - false), - APATITE( - "Apatite", - "apatite", - BeeClassification.GEM, - 0x2EA7EC, - 0x001D51, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - SILICON( - "Silicon", - "siliconisque", - BeeClassification.GEM, - 0xADA2A7, - 0x736675, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - CERTUS( - "Certus", - "alia cristallum", - BeeClassification.GEM, - 0x93C7FF, - 0xA6B8C7, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - FLUIX( - "Fluix", - "alien cristallum", - BeeClassification.GEM, - 0xFC639E, - 0x534797, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), + DIAMOND("Diamond", "diamond", BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, true, false), + EMERALD("Emerald", "prasinus", BeeClassification.GEM, 0x005300, 0x17DD62, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, true, false), + APATITE("Apatite", "apatite", BeeClassification.GEM, 0x2EA7EC, 0x001D51, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + SILICON("Silicon", "siliconisque", BeeClassification.GEM, 0xADA2A7, 0x736675, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + CERTUS("Certus", "alia cristallum", BeeClassification.GEM, 0x93C7FF, 0xA6B8C7, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + FLUIX("Fluix", "alien cristallum", BeeClassification.GEM, 0xFC639E, 0x534797, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), - MUTABLE( - "Mutable", - "mutable", - BeeClassification.TRANSMUTING, - 0xDBB24C, - 0xE0D5A6, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TRANSMUTING( - "Transmuting", - "transmuting", - BeeClassification.TRANSMUTING, - 0xDBB24C, - 0xA2D2D8, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - CRUMBLING( - "Crumbling", - "crumbling", - BeeClassification.TRANSMUTING, - 0xDBB24C, - 0xDBA4A4, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, - false), + MUTABLE("Mutable", "mutable", BeeClassification.TRANSMUTING, 0xDBB24C, 0xE0D5A6, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + TRANSMUTING("Transmuting", "transmuting", BeeClassification.TRANSMUTING, 0xDBB24C, 0xA2D2D8, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + CRUMBLING("Crumbling", "crumbling", BeeClassification.TRANSMUTING, 0xDBB24C, 0xDBA4A4, EnumTemperature.HOT, + EnumHumidity.ARID, false, false), - INVISIBLE( - "Invisible", - "invisible", - BeeClassification.VEILED, - 0xffccff, - 0xffffff, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + INVISIBLE("Invisible", "invisible", BeeClassification.VEILED, 0xffccff, 0xffffff, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), // --------- Thaumcraft Bees --------------------------------------------------------------------------------------- - TC_AIR( - "TCAir", - "aether", - BeeClassification.THAUMIC, - 0xD9D636, - BodyColours.THAUMCRAFT_SHARD, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - true), - TC_FIRE( - "TCFire", - "praefervidus", - BeeClassification.THAUMIC, - 0xE50B0B, - BodyColours.THAUMCRAFT_SHARD, - EnumTemperature.HOT, - EnumHumidity.ARID, - true, - true), - TC_WATER( - "TCWater", - "umidus", - BeeClassification.THAUMIC, - 0x36CFD9, - BodyColours.THAUMCRAFT_SHARD, - EnumTemperature.NORMAL, - EnumHumidity.DAMP, - true, - true), - TC_EARTH( - "TCEarth", - "sordida", - BeeClassification.THAUMIC, - 0x005100, - BodyColours.THAUMCRAFT_SHARD, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - true), - TC_ORDER( - "TCOrder", - "ordinatus", - BeeClassification.THAUMIC, - 0xaa32fc, - BodyColours.THAUMCRAFT_SHARD, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - true), - TC_CHAOS( - "TCChaos", - "tenebrarum", - BeeClassification.THAUMIC, - 0xCCCCCC, - BodyColours.THAUMCRAFT_SHARD, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - false), + TC_AIR("TCAir", "aether", BeeClassification.THAUMIC, 0xD9D636, BodyColours.THAUMCRAFT_SHARD, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, true, true), + TC_FIRE("TCFire", "praefervidus", BeeClassification.THAUMIC, 0xE50B0B, BodyColours.THAUMCRAFT_SHARD, + EnumTemperature.HOT, EnumHumidity.ARID, true, true), + TC_WATER("TCWater", "umidus", BeeClassification.THAUMIC, 0x36CFD9, BodyColours.THAUMCRAFT_SHARD, + EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true), + TC_EARTH("TCEarth", "sordida", BeeClassification.THAUMIC, 0x005100, BodyColours.THAUMCRAFT_SHARD, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + TC_ORDER("TCOrder", "ordinatus", BeeClassification.THAUMIC, 0xaa32fc, BodyColours.THAUMCRAFT_SHARD, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + TC_CHAOS("TCChaos", "tenebrarum", BeeClassification.THAUMIC, 0xCCCCCC, BodyColours.THAUMCRAFT_SHARD, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - TC_VIS( - "TCVis", - "arcanus saecula", - BeeClassification.THAUMIC, - 0x004c99, - BodyColours.THAUMCRAFT_NODE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TC_REJUVENATING( - "TCRejuvenating", - "arcanus vitae", - BeeClassification.THAUMIC, - 0x91D0D9, - BodyColours.THAUMCRAFT_NODE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TC_EMPOWERING( - "TCEmpowering", - "tractus", - BeeClassification.THAUMIC, - 0x96FFBC, - BodyColours.THAUMCRAFT_NODE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - TC_NEXUS( - "TCNexus", - "nexi", - BeeClassification.THAUMIC, - 0x15AFAF, - BodyColours.THAUMCRAFT_NODE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - false), - TC_TAINT( - "TCFlux", - "arcanus labe", - BeeClassification.THAUMIC, - 0x91376A, - BodyColours.THAUMCRAFT_NODE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TC_PURE( - "TCPure", - "arcanus puritatem", - BeeClassification.THAUMIC, - 0xE23F65, - BodyColours.THAUMCRAFT_NODE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TC_HUNGRY( - "TCHungry", - "omnique", - BeeClassification.THAUMIC, - 0xDCA5E2, - BodyColours.THAUMCRAFT_NODE, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + TC_VIS("TCVis", "arcanus saecula", BeeClassification.THAUMIC, 0x004c99, BodyColours.THAUMCRAFT_NODE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + TC_REJUVENATING("TCRejuvenating", "arcanus vitae", BeeClassification.THAUMIC, 0x91D0D9, BodyColours.THAUMCRAFT_NODE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + TC_EMPOWERING("TCEmpowering", "tractus", BeeClassification.THAUMIC, 0x96FFBC, BodyColours.THAUMCRAFT_NODE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + TC_NEXUS("TCNexus", "nexi", BeeClassification.THAUMIC, 0x15AFAF, BodyColours.THAUMCRAFT_NODE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + TC_TAINT("TCFlux", "arcanus labe", BeeClassification.THAUMIC, 0x91376A, BodyColours.THAUMCRAFT_NODE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + TC_PURE("TCPure", "arcanus puritatem", BeeClassification.THAUMIC, 0xE23F65, BodyColours.THAUMCRAFT_NODE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + TC_HUNGRY("TCHungry", "omnique", BeeClassification.THAUMIC, 0xDCA5E2, BodyColours.THAUMCRAFT_NODE, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TC_WISPY( - "TCWispy", - "umbrabilis", - BeeClassification.THAUMIC, - 0x9cb8d5, - BodyColours.SKULKING, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TC_VOID( - "TCVoid", - "obscurus", - BeeClassification.METALLIC, - 0x180A29, - 0x4B2A74, - EnumTemperature.ICY, - EnumHumidity.NORMAL, - false, - false), + TC_WISPY("TCWispy", "umbrabilis", BeeClassification.THAUMIC, 0x9cb8d5, BodyColours.SKULKING, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + TC_VOID("TCVoid", "obscurus", BeeClassification.METALLIC, 0x180A29, 0x4B2A74, EnumTemperature.ICY, + EnumHumidity.NORMAL, false, false), // --------- Equivalent Exchange Bees ----------------------------------------------------------------------------- - EE_MINIUM( - "EEMinium", - "mutabilis", - BeeClassification.ALCHEMICAL, - 0xac0921, - 0x3a030b, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), + EE_MINIUM("EEMinium", "mutabilis", BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), // --------- Ars Magica Bees -------------------------------------------------------------------------------------- - AM_ESSENCE( - "AMEssence", - "essentia", - BeeClassification.ESSENTIAL, - 0x86BBC5, - BodyColours.ARSMAGICA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - AM_QUINTESSENCE( - "AMQuintessence", - "cor essentia", - BeeClassification.ESSENTIAL, - 0xE3A45B, - BodyColours.ARSMAGICA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - true), + AM_ESSENCE("AMEssence", "essentia", BeeClassification.ESSENTIAL, 0x86BBC5, BodyColours.ARSMAGICA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + AM_QUINTESSENCE("AMQuintessence", "cor essentia", BeeClassification.ESSENTIAL, 0xE3A45B, BodyColours.ARSMAGICA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), - AM_EARTH( - "AMEarth", - "magica terra", - BeeClassification.ESSENTIAL, - 0xAA875E, - BodyColours.ARSMAGICA, - EnumTemperature.WARM, - EnumHumidity.ARID, - false, - false), - AM_AIR( - "AMAir", - "magica aer", - BeeClassification.ESSENTIAL, - 0xD5EB9D, - BodyColours.ARSMAGICA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - AM_FIRE( - "AMFire", - "magica ignis", - BeeClassification.ESSENTIAL, - 0x93451E, - BodyColours.ARSMAGICA, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, - false), - AM_WATER( - "AMWater", - "magica aqua", - BeeClassification.ESSENTIAL, - 0x3B7D8C, - BodyColours.ARSMAGICA, - EnumTemperature.NORMAL, - EnumHumidity.DAMP, - false, - false), - AM_LIGHTNING( - "AMLightning", - "magica fulgur", - BeeClassification.ESSENTIAL, - 0xEBEFA1, - BodyColours.ARSMAGICA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - AM_PLANT( - "AMPlant", - "magica herba", - BeeClassification.ESSENTIAL, - 0x49B549, - BodyColours.ARSMAGICA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - AM_ICE( - "AMIce", - "magica glacium", - BeeClassification.ESSENTIAL, - 0x86BAC6, - BodyColours.ARSMAGICA, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - false, - false), - AM_ARCANE( - "AMArcane", - "magica arcanum", - BeeClassification.ESSENTIAL, - 0x76184D, - BodyColours.ARSMAGICA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - false), + AM_EARTH("AMEarth", "magica terra", BeeClassification.ESSENTIAL, 0xAA875E, BodyColours.ARSMAGICA, + EnumTemperature.WARM, EnumHumidity.ARID, false, false), + AM_AIR("AMAir", "magica aer", BeeClassification.ESSENTIAL, 0xD5EB9D, BodyColours.ARSMAGICA, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + AM_FIRE("AMFire", "magica ignis", BeeClassification.ESSENTIAL, 0x93451E, BodyColours.ARSMAGICA, EnumTemperature.HOT, + EnumHumidity.ARID, false, false), + AM_WATER("AMWater", "magica aqua", BeeClassification.ESSENTIAL, 0x3B7D8C, BodyColours.ARSMAGICA, + EnumTemperature.NORMAL, EnumHumidity.DAMP, false, false), + AM_LIGHTNING("AMLightning", "magica fulgur", BeeClassification.ESSENTIAL, 0xEBEFA1, BodyColours.ARSMAGICA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + AM_PLANT("AMPlant", "magica herba", BeeClassification.ESSENTIAL, 0x49B549, BodyColours.ARSMAGICA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + AM_ICE("AMIce", "magica glacium", BeeClassification.ESSENTIAL, 0x86BAC6, BodyColours.ARSMAGICA, + EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), + AM_ARCANE("AMArcane", "magica arcanum", BeeClassification.ESSENTIAL, 0x76184D, BodyColours.ARSMAGICA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - AM_VORTEX( - "AMVortex", - "gurges", - BeeClassification.ESSENTIAL, - 0x71BBE2, - 0x0B35A8, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - AM_WIGHT( - "AMWight", - "vectem", - BeeClassification.ESSENTIAL, - 0xB50000, - 0x4C4837, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + AM_VORTEX("AMVortex", "gurges", BeeClassification.ESSENTIAL, 0x71BBE2, 0x0B35A8, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, true), + AM_WIGHT("AMWight", "vectem", BeeClassification.ESSENTIAL, 0xB50000, 0x4C4837, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), // ---------------------Thermal Expansion Bees--------------------------- - TE_BLIZZY( - "TEBlizzy", - "blizzard", - BeeClassification.ABOMINABLE, - 0x0073C4, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - false, - false), - TE_GELID( - "TEGelid", - "cyro", - BeeClassification.ABOMINABLE, - 0x4AAFF7, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - true, - true), - TE_DANTE( - "TEDante", - "inferno", - BeeClassification.ABOMINABLE, - 0xF7AC4A, - EnumTemperature.HELLISH, - EnumHumidity.ARID, - false, - false), - TE_PYRO( - "TEPyro", - "pyromania", - BeeClassification.ABOMINABLE, - 0xFA930C, - EnumTemperature.HELLISH, - EnumHumidity.ARID, - true, - true), - TE_SHOCKING( - "TEShocking", - "horrendum", - BeeClassification.ABOMINABLE, - 0xC5FF26, - 0xF8EE00, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TE_AMPED( - "TEAmped", - "concitatus", - BeeClassification.ABOMINABLE, - 0x8AFFFF, - 0xECE670, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - false), - TE_GROUNDED( - "TEGrounded", - "tellus", - BeeClassification.ABOMINABLE, - 0xCEC1C1, - 0x826767, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, - true), - TE_ROCKING( - "TERocking", - "saxsous", - BeeClassification.ABOMINABLE, - 0x980000, - 0xAB9D9B, - EnumTemperature.HOT, - EnumHumidity.ARID, - true, + TE_BLIZZY("TEBlizzy", "blizzard", BeeClassification.ABOMINABLE, 0x0073C4, EnumTemperature.COLD, EnumHumidity.NORMAL, + false, false), + TE_GELID("TEGelid", "cyro", BeeClassification.ABOMINABLE, 0x4AAFF7, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true), + TE_DANTE("TEDante", "inferno", BeeClassification.ABOMINABLE, 0xF7AC4A, EnumTemperature.HELLISH, EnumHumidity.ARID, + false, false), + TE_PYRO("TEPyro", "pyromania", BeeClassification.ABOMINABLE, 0xFA930C, EnumTemperature.HELLISH, EnumHumidity.ARID, + true, true), + TE_SHOCKING("TEShocking", "horrendum", BeeClassification.ABOMINABLE, 0xC5FF26, 0xF8EE00, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + TE_AMPED("TEAmped", "concitatus", BeeClassification.ABOMINABLE, 0x8AFFFF, 0xECE670, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, true, false), + TE_GROUNDED("TEGrounded", "tellus", BeeClassification.ABOMINABLE, 0xCEC1C1, 0x826767, EnumTemperature.HOT, + EnumHumidity.ARID, false, true), + TE_ROCKING("TERocking", "saxsous", BeeClassification.ABOMINABLE, 0x980000, 0xAB9D9B, EnumTemperature.HOT, + EnumHumidity.ARID, true, true), - TE_ELECTRUM( - "TEElectrum", - "electrum", - BeeClassification.THERMAL, - 0xEAF79E, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, + TE_ELECTRUM("TEElectrum", "electrum", BeeClassification.THERMAL, 0xEAF79E, EnumTemperature.HOT, EnumHumidity.ARID, + false, false), + TE_PLATINUM("TEPlatinum", "platina", BeeClassification.THERMAL, 0x9EE7F7, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + TE_NICKEL("TENickel", "nickel", BeeClassification.THERMAL, 0xB4C989, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, false), + TE_INVAR("TEInvar", "invar", BeeClassification.THERMAL, 0xCDE3A1, EnumTemperature.HOT, EnumHumidity.ARID, false, false), - TE_PLATINUM( - "TEPlatinum", - "platina", - BeeClassification.THERMAL, - 0x9EE7F7, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, + TE_BRONZE("TEBronze", "pyropus", BeeClassification.THERMAL, 0xB56D07, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, false), + TE_COAL("TECoal", "carbonis", BeeClassification.THERMAL, 0x2E2D2D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + false, false), + TE_DESTABILIZED("TEDestabilized", "electric", BeeClassification.THERMAL, 0x5E0203, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), + TE_LUX("TELux", "lux", BeeClassification.THERMAL, 0xF1FA89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TE_NICKEL( - "TENickel", - "nickel", - BeeClassification.THERMAL, - 0xB4C989, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TE_INVAR( - "TEInvar", - "invar", - BeeClassification.THERMAL, - 0xCDE3A1, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, - false), - TE_BRONZE( - "TEBronze", - "pyropus", - BeeClassification.THERMAL, - 0xB56D07, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TE_COAL( - "TECoal", - "carbonis", - BeeClassification.THERMAL, - 0x2E2D2D, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TE_DESTABILIZED( - "TEDestabilized", - "electric", - BeeClassification.THERMAL, - 0x5E0203, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TE_LUX( - "TELux", - "lux", - BeeClassification.THERMAL, - 0xF1FA89, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - TE_WINSOME( - "TEWinsome", - "cuniculus", - BeeClassification.ADORABLE, - 0x096B67, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - false, - false), - TE_ENDEARING( - "TEEndearing", - "cognito", - BeeClassification.ADORABLE, - 0x069E97, - EnumTemperature.COLD, - EnumHumidity.NORMAL, - true, - true), - TE_SIGNALUS( - "TESignalus", - "scelerisque", - BeeClassification.THERMAL, - 0x5E0203, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - true), - TE_LUMIUS( - "TELumius", - "lucidum", - BeeClassification.THERMAL, - 0xF1FA89, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - true, - true), + TE_WINSOME("TEWinsome", "cuniculus", BeeClassification.ADORABLE, 0x096B67, EnumTemperature.COLD, + EnumHumidity.NORMAL, false, false), + TE_ENDEARING("TEEndearing", "cognito", BeeClassification.ADORABLE, 0x069E97, EnumTemperature.COLD, + EnumHumidity.NORMAL, true, true), + TE_SIGNALUS("TESignalus", "scelerisque", BeeClassification.THERMAL, 0x5E0203, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, true, true), + TE_LUMIUS("TELumius", "lucidum", BeeClassification.THERMAL, 0xF1FA89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + true, true), // --------------------Redstone Arsenal Bees----------------------------- - RSA_FLUXED( - "RSAFluxed", - "Thermametallic electroflux", - BeeClassification.THERMAL, - 0x9E060D, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + RSA_FLUXED("RSAFluxed", "Thermametallic electroflux", BeeClassification.THERMAL, 0x9E060D, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), // ----------------------Botania Bees--------------------------------------- - BOT_ROOTED( - "BotRooted", - "truncus", - BeeClassification.BOTANICAL, - 0x00A800, - BodyColours.BOTANIA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), + BOT_ROOTED("BotRooted", "truncus", BeeClassification.BOTANICAL, 0x00A800, BodyColours.BOTANIA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - BOT_BOTANIC( - "BotBotanic", - "botanica", - BeeClassification.BOTANICAL, - 0x94C661, - BodyColours.BOTANIA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), - BOT_BLOSSOM( - "BotBlossom", - "viridis", - BeeClassification.BOTANICAL, - 0xA4C193, - BodyColours.BOTANIA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), - BOT_FLORAL( - "BotFloral", - "florens", - BeeClassification.BOTANICAL, - 0x29D81A, - BodyColours.BOTANIA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - true), + BOT_BOTANIC("BotBotanic", "botanica", BeeClassification.BOTANICAL, 0x94C661, BodyColours.BOTANIA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BOT_BLOSSOM("BotBlossom", "viridis", BeeClassification.BOTANICAL, 0xA4C193, BodyColours.BOTANIA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BOT_FLORAL("BotFloral", "florens", BeeClassification.BOTANICAL, 0x29D81A, BodyColours.BOTANIA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - BOT_VAZBEE( - "BotVazbee", - "vazbii", - BeeClassification.BOTANICAL, - 0xff6b9c, - BodyColours.BOTANIA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + BOT_VAZBEE("BotVazbee", "vazbii", BeeClassification.BOTANICAL, 0xff6b9c, BodyColours.BOTANIA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - BOT_SOMNOLENT( - "BotSomnolent", - "soporatus", - BeeClassification.BOTANICAL, - 0x2978C6, - BodyColours.BOTANIA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false, - true, - true, - true), - BOT_DREAMING( - "BotDreaming", - "somnior", - BeeClassification.BOTANICAL, - 0x123456, - BodyColours.BOTANIA, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false, - true, - true, - true), + BOT_SOMNOLENT("BotSomnolent", "soporatus", BeeClassification.BOTANICAL, 0x2978C6, BodyColours.BOTANIA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true, true, true), + BOT_DREAMING("BotDreaming", "somnior", BeeClassification.BOTANICAL, 0x123456, BodyColours.BOTANIA, + EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true, true, true), - BOT_ALFHEIM( - "BotAlfheim", - "alfheimis", - BeeClassification.BOTANICAL, - -1, - -1, - EnumTemperature.NORMAL, - EnumHumidity.NORMAL, - false, - false), + BOT_ALFHEIM("BotAlfheim", "alfheimis", BeeClassification.BOTANICAL, -1, -1, EnumTemperature.NORMAL, + EnumHumidity.NORMAL, false, false), // -------------------Applied Energistics 2 Bees--------------------------- - AE_SKYSTONE( - "AESkystone", - "terra astris", - BeeClassification.TRANSMUTING, - 0x4B8381, - 0x252929, - EnumTemperature.HOT, - EnumHumidity.ARID, - false, - true), - ; + AE_SKYSTONE("AESkystone", "terra astris", BeeClassification.TRANSMUTING, 0x4B8381, 0x252929, EnumTemperature.HOT, + EnumHumidity.ARID, false, true),; // For body colours used by more than one bee. private class BodyColours { + static final int DEFAULT = 0xFF7C26; static final int ARCANE = 0xFF9D60; static final int ABOMINABLE = 0x960F00; @@ -1531,14 +560,8 @@ public enum BeeSpecies { private IAllele genomeTemplate[]; - BeeSpecies( - String speciesName, - String genusName, - IClassification classification, - int firstColour, - EnumTemperature preferredTemp, - EnumHumidity preferredHumidity, - boolean hasGlowEffect, + BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { this( speciesName, @@ -1555,15 +578,8 @@ public enum BeeSpecies { false); } - BeeSpecies( - String speciesName, - String genusName, - IClassification classification, - int firstColour, - int secondColour, - EnumTemperature preferredTemp, - EnumHumidity preferredHumidity, - boolean hasGlowEffect, + BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { this( speciesName, @@ -1580,16 +596,8 @@ public enum BeeSpecies { false); } - BeeSpecies( - String speciesName, - String genusName, - IClassification classification, - int firstColour, - int secondColour, - EnumTemperature preferredTemp, - EnumHumidity preferredHumidity, - boolean isSecret, - boolean hasGlowEffect, + BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant) { this( speciesName, @@ -1606,15 +614,8 @@ public enum BeeSpecies { false); } - BeeSpecies( - String speciesName, - String genusName, - IClassification classification, - int firstColour, - EnumTemperature preferredTemp, - EnumHumidity preferredHumidity, - boolean isSecret, - boolean hasGlowEffect, + BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant) { this( speciesName, @@ -1631,19 +632,9 @@ public enum BeeSpecies { false); } - BeeSpecies( - String speciesName, - String genusName, - IClassification classification, - int firstColour, - int secondColour, - EnumTemperature preferredTemp, - EnumHumidity preferredHumidity, - boolean hasGlowEffect, - boolean isSpeciesSecret, - boolean isSpeciesCounted, - boolean isSpeciesDominant, - boolean isSpeciesNocturnal) { + BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, + boolean isSpeciesSecret, boolean isSpeciesCounted, boolean isSpeciesDominant, boolean isSpeciesNocturnal) { String uid = "magicbees.species" + speciesName; @@ -1774,10 +765,15 @@ public enum BeeSpecies { } public boolean canWorkInTemperature(EnumTemperature temp) { - IAlleleTolerance tolerance = - (IAlleleTolerance) genomeTemplate[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()]; + IAlleleTolerance tolerance = (IAlleleTolerance) genomeTemplate[EnumBeeChromosome.TEMPERATURE_TOLERANCE + .ordinal()]; return AlleleManager.climateHelper.isWithinLimits( - temp, EnumHumidity.NORMAL, temperature, tolerance.getValue(), EnumHumidity.NORMAL, EnumTolerance.NONE); + temp, + EnumHumidity.NORMAL, + temperature, + tolerance.getValue(), + EnumHumidity.NORMAL, + EnumTolerance.NONE); } public boolean canWorkInHumidity(EnumHumidity humid) { diff --git a/src/main/java/magicbees/bees/HiveDescription.java b/src/main/java/magicbees/bees/HiveDescription.java index 569e930..a36f7b2 100644 --- a/src/main/java/magicbees/bees/HiveDescription.java +++ b/src/main/java/magicbees/bees/HiveDescription.java @@ -1,14 +1,10 @@ package magicbees.bees; -import forestry.api.apiculture.hives.HiveManager; -import forestry.api.apiculture.hives.IHiveDescription; -import forestry.api.apiculture.hives.IHiveGen; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Random; + import magicbees.block.types.HiveType; import magicbees.main.Config; import magicbees.main.utils.BlockUtil; @@ -17,47 +13,32 @@ import magicbees.world.feature.FeatureOreVein; import magicbees.world.feature.HiveGenNether; import magicbees.world.feature.HiveGenOblivion; import magicbees.world.feature.HiveGenUnderground; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; +import forestry.api.apiculture.hives.HiveManager; +import forestry.api.apiculture.hives.IHiveDescription; +import forestry.api.apiculture.hives.IHiveGen; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; + public enum HiveDescription implements IHiveDescription { - CURIOUS( - HiveType.CURIOUS, - 3.0f, - HiveManager.genHelper.tree(), - false, - BiomeDictionary.Type.FOREST, - BiomeDictionary.Type.PLAINS, - BiomeDictionary.Type.HILLS), - UNUSUAL( - HiveType.UNUSUAL, - 1.0f, - HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass), - false, - BiomeDictionary.Type.PLAINS, - BiomeDictionary.Type.MOUNTAIN, - BiomeDictionary.Type.HILLS, + + CURIOUS(HiveType.CURIOUS, 3.0f, HiveManager.genHelper.tree(), false, BiomeDictionary.Type.FOREST, + BiomeDictionary.Type.PLAINS, BiomeDictionary.Type.HILLS), + UNUSUAL(HiveType.UNUSUAL, 1.0f, HiveManager.genHelper.ground(Blocks.dirt, Blocks.grass), false, + BiomeDictionary.Type.PLAINS, BiomeDictionary.Type.MOUNTAIN, BiomeDictionary.Type.HILLS, BiomeDictionary.Type.RIVER), - RESONANT( - HiveType.RESONANT, - 0.9f, - HiveManager.genHelper.ground(Blocks.sand, Blocks.sandstone), - false, - BiomeDictionary.Type.SANDY, - BiomeDictionary.Type.MESA, - BiomeDictionary.Type.HOT, + RESONANT(HiveType.RESONANT, 0.9f, HiveManager.genHelper.ground(Blocks.sand, Blocks.sandstone), false, + BiomeDictionary.Type.SANDY, BiomeDictionary.Type.MESA, BiomeDictionary.Type.HOT, BiomeDictionary.Type.MAGICAL), - DEEP( - HiveType.DEEP, - 5.0f, - new HiveGenUnderground(10, 15, 5), - true, - BiomeDictionary.Type.HILLS, - BiomeDictionary.Type.MOUNTAIN, - BiomeDictionary.Type.MAGICAL) { + DEEP(HiveType.DEEP, 5.0f, new HiveGenUnderground(10, 15, 5), true, BiomeDictionary.Type.HILLS, + BiomeDictionary.Type.MOUNTAIN, BiomeDictionary.Type.MAGICAL) { + @Override public void postGen(World world, int x, int y, int z) { super.postGen(world, x, y, z); @@ -71,6 +52,7 @@ public enum HiveDescription implements IHiveDescription { } }, INFERNAL(HiveType.INFERNAL, 50.0f, new HiveGenNether(0, 175, 6), true, BiomeDictionary.Type.NETHER) { + @Override public void postGen(World world, int x, int y, int z) { super.postGen(world, x, y, z); @@ -83,13 +65,9 @@ public enum HiveDescription implements IHiveDescription { FeatureOreVein.netherQuartzGen.generateVein(world, random, x, y, z - 1, 4); } }, - INFERNAL_OVERWORLD( - HiveType.INFERNAL, - 0.95f, - new HiveGenUnderground(5, 13, 6), - true, - BiomeDictionary.Type.MAGICAL, + INFERNAL_OVERWORLD(HiveType.INFERNAL, 0.95f, new HiveGenUnderground(5, 13, 6), true, BiomeDictionary.Type.MAGICAL, BiomeDictionary.Type.HOT) { + @Override public void postGen(World world, int x, int y, int z) { super.postGen(world, x, y, z); @@ -110,6 +88,7 @@ public enum HiveDescription implements IHiveDescription { } }, OBLIVION(HiveType.OBLIVION, 20.0f, new HiveGenOblivion(), true, BiomeDictionary.Type.END) { + @Override public void postGen(World world, int x, int y, int z) { super.postGen(world, x, y, z); @@ -120,13 +99,9 @@ public enum HiveDescription implements IHiveDescription { } } }, - OBLIVION_OVERWORLD( - HiveType.OBLIVION, - 0.87f, - new HiveGenUnderground(5, 5, 5), - true, - BiomeDictionary.Type.MAGICAL, + OBLIVION_OVERWORLD(HiveType.OBLIVION, 0.87f, new HiveGenUnderground(5, 5, 5), true, BiomeDictionary.Type.MAGICAL, BiomeDictionary.Type.COLD) { + @Override public void postGen(World world, int x, int y, int z) { super.postGen(world, x, y, z); @@ -149,11 +124,7 @@ public enum HiveDescription implements IHiveDescription { private final IHiveGen hiveGen; private final boolean spawnsIgnoreClimate; - private HiveDescription( - HiveType type, - float chance, - IHiveGen genType, - boolean ignoreClimate, + private HiveDescription(HiveType type, float chance, IHiveGen genType, boolean ignoreClimate, BiomeDictionary.Type... goodBiomeTypes) { hiveType = type; genChance = chance; @@ -209,8 +180,9 @@ public enum HiveDescription implements IHiveDescription { @Override public void postGen(World world, int x, int y, int z) { if (logSpawns) { - LogHelper.info("Spawned " + this.toString().toLowerCase(Locale.ENGLISH) + " hive at: X " + x + ", Y: " + y - + ", Z: " + z); + LogHelper.info( + "Spawned " + this.toString() + .toLowerCase(Locale.ENGLISH) + " hive at: X " + x + ", Y: " + y + ", Z: " + z); } } } diff --git a/src/main/java/magicbees/bees/HiveDrop.java b/src/main/java/magicbees/bees/HiveDrop.java index d5a6430..058d7e0 100644 --- a/src/main/java/magicbees/bees/HiveDrop.java +++ b/src/main/java/magicbees/bees/HiveDrop.java @@ -1,15 +1,18 @@ package magicbees.bees; +import java.util.ArrayList; +import java.util.Collection; + +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IHiveDrop; import forestry.api.genetics.IAllele; -import java.util.ArrayList; -import java.util.Collection; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class HiveDrop implements IHiveDrop { + private IAllele[] template; private int chance; private ItemStack[] bonus; diff --git a/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java b/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java index 5e84386..4de2258 100644 --- a/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java +++ b/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java @@ -1,15 +1,18 @@ package magicbees.bees; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.MoonPhase; + +import net.minecraft.world.World; + import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.MoonPhase; -import net.minecraft.world.World; // There is a bonus to this mutation during moon phases... public class MoonPhaseMutationBonus implements IMutationCondition { + private final MoonPhase moonPhaseStart; private final MoonPhase moonPhaseEnd; private final float mutationBonus; @@ -27,16 +30,8 @@ public class MoonPhaseMutationBonus implements IMutationCondition { } @Override - public float getChance( - World world, - int x, - int y, - int z, - IAllele allele0, - IAllele allele1, - IGenome genome0, - IGenome genome1, - IClimateProvider climate) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, + IGenome genome1, IClimateProvider climate) { if (MoonPhase.getMoonPhase(world).isBetween(this.moonPhaseStart, this.moonPhaseEnd)) { return this.mutationBonus; } diff --git a/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java b/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java index e152faf..2a812ff 100644 --- a/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java +++ b/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java @@ -1,14 +1,17 @@ package magicbees.bees; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.MoonPhase; + +import net.minecraft.world.World; + import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.MoonPhase; -import net.minecraft.world.World; public class MoonPhaseMutationRestriction implements IMutationCondition { + private final MoonPhase moonPhaseStart; private final MoonPhase moonPhaseEnd; @@ -23,16 +26,8 @@ public class MoonPhaseMutationRestriction implements IMutationCondition { } @Override - public float getChance( - World world, - int x, - int y, - int z, - IAllele allele0, - IAllele allele1, - IGenome genome0, - IGenome genome1, - IClimateProvider climate) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, + IGenome genome1, IClimateProvider climate) { if (MoonPhase.getMoonPhase(world).isBetween(this.moonPhaseStart, this.moonPhaseEnd)) { return 1; } diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java index 6a09895..b65bd22 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java @@ -1,12 +1,10 @@ package magicbees.bees.allele.effect; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.genetics.IEffectData; import java.util.HashMap; + import magicbees.bees.AlleleEffect; import magicbees.bees.BeeManager; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -14,7 +12,13 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.genetics.IEffectData; + public class AlleleEffectCrumbling extends AlleleEffect { + private static HashMap crumbleMap = new HashMap(); public static void addPairToMap(ItemStack source, ItemStack target) { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java index d5bf72f..dd3c28f 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java @@ -1,13 +1,16 @@ package magicbees.bees.allele.effect; +import java.util.List; + +import magicbees.bees.AlleleEffect; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; -import java.util.List; -import magicbees.bees.AlleleEffect; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class AlleleEffectCure extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java index 4cc6084..42a4be7 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java @@ -3,25 +3,28 @@ package magicbees.bees.allele.effect; import static magicbees.main.utils.compat.thaumcraft.NodeHelper.getWeightedRandomAspect; import static magicbees.main.utils.compat.thaumcraft.NodeHelper.updateNode; -import forestry.api.apiculture.IAlleleBeeAcceleratableEffect; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.genetics.IEffectData; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import magicbees.bees.AlleleEffect; import magicbees.bees.BeeManager; import magicbees.main.Config; import magicbees.main.utils.BlockUtil; import magicbees.main.utils.compat.thaumcraft.NodeHelper; + import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.INode; +import forestry.api.apiculture.IAlleleBeeAcceleratableEffect; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.genetics.IEffectData; public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAcceleratableEffect { @@ -43,8 +46,8 @@ public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAc World world = housing.getWorld(); ChunkCoordinates coords = housing.getCoordinates(); IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); - int range = - Math.max((int) Math.ceil(genome.getTerritory()[0] * beeModifier.getTerritoryModifier(genome, 1f)), 1); + int range = Math + .max((int) Math.ceil(genome.getTerritory()[0] * beeModifier.getTerritoryModifier(genome, 1f)), 1); List chunks = BlockUtil.getChunksInSearchRange(world, coords.posX, coords.posZ, range); if (NodeHelper.growNodeInRange(chunks, world, coords.posX, coords.posY, coords.posZ, range)) { @@ -60,8 +63,8 @@ public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAc World world = housing.getWorld(); ChunkCoordinates coords = housing.getCoordinates(); IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); - int range = - Math.max((int) Math.ceil(genome.getTerritory()[0] * beeModifier.getTerritoryModifier(genome, 1f)), 1); + int range = Math + .max((int) Math.ceil(genome.getTerritory()[0] * beeModifier.getTerritoryModifier(genome, 1f)), 1); List chunks = BlockUtil.getChunksInSearchRange(world, coords.posX, coords.posZ, range); int idid = (int) did; diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java index ffd9eba..22f3996 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java @@ -1,18 +1,21 @@ package magicbees.bees.allele.effect; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.genetics.IEffectData; import java.util.List; + import magicbees.bees.AlleleEffect; import magicbees.bees.BeeManager; import magicbees.main.utils.BlockUtil; import magicbees.main.utils.compat.thaumcraft.NodeHelper; + import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + import thaumcraft.api.nodes.NodeType; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.genetics.IEffectData; public class AlleleEffectNodeConversion extends AlleleEffect { @@ -39,8 +42,8 @@ public class AlleleEffectNodeConversion extends AlleleEffect { int range = (int) Math.ceil(genome.getTerritory()[0] * beeModifier.getTerritoryModifier(genome, 1f)); List chunks = BlockUtil.getChunksInSearchRange(world, coords.posX, coords.posZ, range); - if (NodeHelper.convertNodeInRangeToType( - chunks, world, coords.posX, coords.posY, coords.posZ, range, targetType)) { + if (NodeHelper + .convertNodeInRangeToType(chunks, world, coords.posX, coords.posY, coords.posZ, range, targetType)) { storedData.setInteger(0, storedData.getInteger(0) - throttle); } diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java index be2a521..55dd3f3 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java @@ -1,17 +1,20 @@ package magicbees.bees.allele.effect; +import java.util.List; + +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; +import magicbees.main.utils.BlockUtil; +import magicbees.main.utils.compat.thaumcraft.NodeHelper; + +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; -import java.util.List; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; -import magicbees.main.utils.BlockUtil; -import magicbees.main.utils.compat.thaumcraft.NodeHelper; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; public class AlleleEffectNodeRepair extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectPlaceholder.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectPlaceholder.java index 64a9637..271b3f9 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectPlaceholder.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectPlaceholder.java @@ -1,9 +1,9 @@ package magicbees.bees.allele.effect; +import magicbees.bees.AlleleEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; -import magicbees.bees.AlleleEffect; public class AlleleEffectPlaceholder extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java index f5f87c2..80190c8 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java @@ -1,17 +1,21 @@ package magicbees.bees.allele.effect; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.genetics.IEffectData; import java.util.List; + import magicbees.bees.AlleleEffect; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IEffectData; + public class AlleleEffectPotion extends AlleleEffect { + private int potionId; private int duration; private boolean isMalicious; diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java index 03d1d0c..f282c91 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java @@ -1,17 +1,20 @@ package magicbees.bees.allele.effect; +import java.util.List; + +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; +import magicbees.main.utils.BlockUtil; +import magicbees.main.utils.compat.thaumcraft.NodeHelper; + +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; -import java.util.List; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; -import magicbees.main.utils.BlockUtil; -import magicbees.main.utils.compat.thaumcraft.NodeHelper; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; public class AlleleEffectRecharge extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java index 7c66884..d0ef58d 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java @@ -1,12 +1,10 @@ package magicbees.bees.allele.effect; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.genetics.IEffectData; import java.util.List; + import magicbees.bees.AlleleEffect; import magicbees.bees.BeeManager; + import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -15,7 +13,13 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.genetics.IEffectData; + public class AlleleEffectSpawnMob extends AlleleEffect { + protected boolean aggosOnPlayer; protected boolean spawnsWhilePlayerNear; protected String alternateMob; @@ -111,8 +115,8 @@ public class AlleleEffectSpawnMob extends AlleleEffect { return null; } - protected boolean spawnMob( - IBeeGenome bee, EntityPlayer player, World world, IBeeHousing housing, boolean spawnAlternate) { + protected boolean spawnMob(IBeeGenome bee, EntityPlayer player, World world, IBeeHousing housing, + boolean spawnAlternate) { boolean spawnedFlag = false; EntityLiving mob; @@ -126,15 +130,14 @@ public class AlleleEffectSpawnMob extends AlleleEffect { double pos[] = this.randomMobSpawnCoords(world, bee, housing); int entitiesCount = world.getEntitiesWithinAABB( - mob.getClass(), - AxisAlignedBB.getBoundingBox( - (int) pos[0], - (int) pos[1], - (int) pos[2], - (int) pos[0] + 1, - (int) pos[1] + 1, - (int) pos[2] + 1) - .expand(8.0D, 4.0D, 8.0D)) + mob.getClass(), + AxisAlignedBB.getBoundingBox( + (int) pos[0], + (int) pos[1], + (int) pos[2], + (int) pos[0] + 1, + (int) pos[1] + 1, + (int) pos[2] + 1).expand(8.0D, 4.0D, 8.0D)) .size(); mob.setPositionAndRotation(pos[0], pos[1], pos[2], world.rand.nextFloat() * 360f, 0f); @@ -142,9 +145,8 @@ public class AlleleEffectSpawnMob extends AlleleEffect { if (entitiesCount < maxMobsInArea && mob.getCanSpawnHere()) { spawnedFlag = world.spawnEntityInWorld(mob); if (aggosOnPlayer && player != null) { - if (forestry.api.apiculture.BeeManager.armorApiaristHelper.wearsItems( - (EntityLivingBase) player, getUID(), true) - < 4) { + if (forestry.api.apiculture.BeeManager.armorApiaristHelper + .wearsItems((EntityLivingBase) player, getUID(), true) < 4) { // Protect fully suited player from initial murder intent. mob.setAttackTarget(player); } diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java index 7e7ff93..4447f9d 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java @@ -1,18 +1,21 @@ package magicbees.bees.allele.effect; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.genetics.IEffectData; import magicbees.bees.AlleleEffect; import magicbees.bees.BeeManager; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.genetics.IEffectData; + public class AlleleEffectSpawnMobWeighted extends AlleleEffect { + private String[] entityNames; private int[] spawnChance; diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnWisp.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnWisp.java index adcab83..30594f5 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnWisp.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnWisp.java @@ -1,10 +1,9 @@ package magicbees.bees.allele.effect; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; import java.lang.reflect.Field; + import magicbees.main.utils.compat.ThaumcraftHelper; + import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -12,20 +11,22 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; + public class AlleleEffectSpawnWisp extends AlleleEffectSpawnMob { - private byte[] wispTypes = { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 - }; + private byte[] wispTypes = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 }; public AlleleEffectSpawnWisp(String id, boolean isDominant, String mobToSpawn, String soundToPlay) { super(id, isDominant, mobToSpawn, soundToPlay); } @Override - protected boolean spawnMob( - IBeeGenome bee, EntityPlayer player, World world, IBeeHousing housing, boolean spawnAlternate) { + protected boolean spawnMob(IBeeGenome bee, EntityPlayer player, World world, IBeeHousing housing, + boolean spawnAlternate) { boolean spawnedFlag = false; EntityLiving mob; @@ -39,15 +40,14 @@ public class AlleleEffectSpawnWisp extends AlleleEffectSpawnMob { double pos[] = this.randomMobSpawnCoords(world, bee, housing); int entitiesCount = world.getEntitiesWithinAABB( - mob.getClass(), - AxisAlignedBB.getBoundingBox( - (int) pos[0], - (int) pos[1], - (int) pos[2], - (int) pos[0] + 1, - (int) pos[1] + 1, - (int) pos[2] + 1) - .expand(8.0D, 4.0D, 8.0D)) + mob.getClass(), + AxisAlignedBB.getBoundingBox( + (int) pos[0], + (int) pos[1], + (int) pos[2], + (int) pos[0] + 1, + (int) pos[1] + 1, + (int) pos[2] + 1).expand(8.0D, 4.0D, 8.0D)) .size(); mob.setPositionAndRotation(pos[0], pos[1], pos[2], world.rand.nextFloat() * 360f, 0f); @@ -60,8 +60,7 @@ public class AlleleEffectSpawnWisp extends AlleleEffectSpawnMob { type.setByte(mob, wispTypes[world.rand.nextInt(wispTypes.length)]); } catch (Exception e) { /* - * Last time I had a request to post - * error messages, I regretted it. + * Last time I had a request to post error messages, I regretted it. */ } diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java index 2b74642..1dd013f 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java @@ -1,22 +1,24 @@ package magicbees.bees.allele.effect; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.genetics.IEffectData; import magicbees.bees.AlleleEffect; import magicbees.bees.BeeManager; + import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.genetics.IEffectData; + public class AlleleEffectTransmuting extends AlleleEffect { private TransmutationEffectController transmutationController; - public AlleleEffectTransmuting( - String id, boolean isDominant, TransmutationEffectController effectController, int timeoutBeeTicks) { + public AlleleEffectTransmuting(String id, boolean isDominant, TransmutationEffectController effectController, + int timeoutBeeTicks) { super(id, isDominant, timeoutBeeTicks); this.transmutationController = effectController; } @@ -49,7 +51,9 @@ public class AlleleEffectTransmuting extends AlleleEffect { world, biome, new ItemStack( - world.getBlock(xCoord, yCoord, zCoord), 1, world.getBlockMetadata(xCoord, yCoord, zCoord)), + world.getBlock(xCoord, yCoord, zCoord), + 1, + world.getBlockMetadata(xCoord, yCoord, zCoord)), xCoord, yCoord, zCoord); diff --git a/src/main/java/magicbees/bees/allele/effect/EffectData.java b/src/main/java/magicbees/bees/allele/effect/EffectData.java index 60342b6..68ac903 100644 --- a/src/main/java/magicbees/bees/allele/effect/EffectData.java +++ b/src/main/java/magicbees/bees/allele/effect/EffectData.java @@ -1,9 +1,11 @@ package magicbees.bees.allele.effect; -import forestry.api.genetics.IEffectData; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.genetics.IEffectData; + public class EffectData implements IEffectData { + private int[] intData; private boolean[] boolData; private float[] floatData; diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java index 3bd31e5..d943bbd 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java @@ -3,14 +3,17 @@ package magicbees.bees.allele.effect; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import magicbees.api.bees.ITransmutationEffectController; import magicbees.api.bees.ITransmutationEffectLogic; import magicbees.main.utils.LogHelper; + import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; public class TransmutationEffectController implements ITransmutationEffectController { + private List logicObjects; public TransmutationEffectController(ITransmutationEffectLogic... effectLogic) { @@ -28,9 +31,10 @@ public class TransmutationEffectController implements ITransmutationEffectContro break; } } catch (Exception e) { - LogHelper.warn(String.format( - "Magic Bees encountered an issue with an ITransmutationEffectLogic provider %s. Debug information follows.", - logic.getClass().getName())); + LogHelper.warn( + String.format( + "Magic Bees encountered an issue with an ITransmutationEffectLogic provider %s. Debug information follows.", + logic.getClass().getName())); LogHelper.info(e.getMessage()); } } diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectLBotaniaLiving.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectLBotaniaLiving.java index 20ff8a6..70911d2 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectLBotaniaLiving.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectLBotaniaLiving.java @@ -2,6 +2,7 @@ package magicbees.bees.allele.effect; import magicbees.api.bees.ITransmutationEffectLogic; import magicbees.main.utils.compat.BotaniaHelper; + import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectRailcraft.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectRailcraft.java index 05838e6..30942fc 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectRailcraft.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectRailcraft.java @@ -1,8 +1,9 @@ package magicbees.bees.allele.effect; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.Locale; + import magicbees.api.bees.ITransmutationEffectLogic; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -11,7 +12,10 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.registry.GameRegistry; + public class TransmutationEffectRailcraft implements ITransmutationEffectLogic { + @Override public boolean tryTransmutation(World world, BiomeGenBase biome, ItemStack sourceBlock, int x, int y, int z) { boolean flag = false; diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectVanilla.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectVanilla.java index de13b9a..03eb784 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectVanilla.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectVanilla.java @@ -1,6 +1,7 @@ package magicbees.bees.allele.effect; import magicbees.api.bees.ITransmutationEffectLogic; + import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -9,6 +10,7 @@ import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.oredict.OreDictionary; public class TransmutationEffectVanilla implements ITransmutationEffectLogic { + @Override public boolean tryTransmutation(World world, BiomeGenBase biome, ItemStack sourceBlock, int x, int y, int z) { return trySpawnSandstone(world, biome, sourceBlock, x, y, z); diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java index 9dca9eb..950056c 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java @@ -1,11 +1,13 @@ package magicbees.bees.allele.flowerProvider; +import java.util.Set; + +import net.minecraft.block.Block; + import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.IFlower; import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerProvider; -import java.util.Set; -import net.minecraft.block.Block; public abstract class FlowerProvider implements IFlowerProvider { diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java index 11471ef..b6754db 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java @@ -1,16 +1,18 @@ package magicbees.bees.allele.flowerProvider; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.compat.ArsMagicaHelper; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.compat.ArsMagicaHelper; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class FlowerProviderArsMagicaFlower extends FlowerProvider implements IFlowerGrowthRule { @@ -56,8 +58,8 @@ public class FlowerProviderArsMagicaFlower extends FlowerProvider implements IFl @Override @Deprecated - public boolean growFlower( - IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { + public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, + int z) { return growFlower(world, x, y, z); } diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java index 24819e7..5ca2fe5 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java @@ -1,11 +1,13 @@ package magicbees.bees.allele.flowerProvider; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.compat.ThaumcraftHelper; + +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.compat.ThaumcraftHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class FlowerProviderAuraNode extends FlowerProvider { @@ -45,8 +47,7 @@ public class FlowerProviderAuraNode extends FlowerProvider { if (stack.getItem() == itemStack.getItem() && stack.getItemDamage() == itemStack.getItemDamage()) { if (stack.stackSize < stack.getItem().getItemStackLimit(stack)) { stack.stackSize += itemStack.stackSize; - itemStack.stackSize = - Math.max(stack.stackSize - stack.getItem().getItemStackLimit(stack), 0); + itemStack.stackSize = Math.max(stack.stackSize - stack.getItem().getItemStackLimit(stack), 0); } } } diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java index de68e02..7e66986 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java @@ -1,15 +1,18 @@ package magicbees.bees.allele.flowerProvider; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IPollinatable; import java.util.EnumSet; + import magicbees.main.utils.LocalizationManager; + import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.oredict.OreDictionary; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IPollinatable; + public class FlowerProviderBookshelf extends FlowerProvider { public FlowerProviderBookshelf() { diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java index 4afbdfb..2db787a 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java @@ -1,15 +1,17 @@ package magicbees.bees.allele.flowerProvider; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.compat.BotaniaHelper; + +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; + import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.compat.BotaniaHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; public class FlowerProviderBotania extends FlowerProvider implements IFlowerGrowthRule { @@ -31,8 +33,8 @@ public class FlowerProviderBotania extends FlowerProvider implements IFlowerGrow @Override @Deprecated - public boolean growFlower( - IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { + public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, + int z) { return growFlower(world, x, y, z); } diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java index 314120e..326d451 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java @@ -1,16 +1,18 @@ package magicbees.bees.allele.flowerProvider; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.compat.ThaumcraftHelper; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import forestry.api.genetics.IFlowerGrowthHelper; import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.compat.ThaumcraftHelper; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class FlowerProviderThaumcraftFlower extends FlowerProvider implements IFlowerGrowthRule { @@ -53,8 +55,8 @@ public class FlowerProviderThaumcraftFlower extends FlowerProvider implements IF @Override @Deprecated - public boolean growFlower( - IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { + public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, + int z) { return growFlower(world, x, y, z); } diff --git a/src/main/java/magicbees/block/BlockEffectJar.java b/src/main/java/magicbees/block/BlockEffectJar.java index cac8354..cfe46c2 100644 --- a/src/main/java/magicbees/block/BlockEffectJar.java +++ b/src/main/java/magicbees/block/BlockEffectJar.java @@ -1,12 +1,11 @@ package magicbees.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.client.gui.UIScreens; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; import magicbees.main.utils.TabMagicBees; import magicbees.tileentity.TileEntityEffectJar; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -18,7 +17,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockEffectJar extends BlockContainer { + public BlockEffectJar() { super(Material.glass); this.setCreativeTab(TabMagicBees.tabMagicBees); @@ -29,8 +32,8 @@ public class BlockEffectJar extends BlockContainer { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { boolean activate = false; if (!player.isSneaking()) { diff --git a/src/main/java/magicbees/block/BlockEnchantedEarth.java b/src/main/java/magicbees/block/BlockEnchantedEarth.java index dfd02f8..8b26cd0 100644 --- a/src/main/java/magicbees/block/BlockEnchantedEarth.java +++ b/src/main/java/magicbees/block/BlockEnchantedEarth.java @@ -1,10 +1,10 @@ package magicbees.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +14,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockEnchantedEarth extends Block { @SideOnly(Side.CLIENT) @@ -53,8 +56,8 @@ public class BlockEnchantedEarth extends Block { } @Override - public boolean canSustainPlant( - IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { + public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, + IPlantable plantable) { return true; } diff --git a/src/main/java/magicbees/block/BlockHive.java b/src/main/java/magicbees/block/BlockHive.java index 6a9a151..1f4a687 100644 --- a/src/main/java/magicbees/block/BlockHive.java +++ b/src/main/java/magicbees/block/BlockHive.java @@ -1,12 +1,11 @@ package magicbees.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.List; + import magicbees.block.types.HiveType; import magicbees.main.Config; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -18,7 +17,12 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class BlockHive extends Block { + public BlockHive() { super(new MaterialHive()); this.setLightLevel(0.8f); @@ -47,7 +51,7 @@ public class BlockHive extends Block { } @SideOnly(Side.CLIENT) - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void getSubBlocks(Item item, CreativeTabs tab, List itemsList) { // Java bitches about raw types & types not being checked. Sorry, but the API sucks. diff --git a/src/main/java/magicbees/block/BlockMagicApiary.java b/src/main/java/magicbees/block/BlockMagicApiary.java index 850f661..184e9fc 100644 --- a/src/main/java/magicbees/block/BlockMagicApiary.java +++ b/src/main/java/magicbees/block/BlockMagicApiary.java @@ -1,12 +1,11 @@ package magicbees.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.client.gui.UIScreens; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; import magicbees.main.utils.TabMagicBees; import magicbees.tileentity.TileEntityMagicApiary; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -19,7 +18,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockMagicApiary extends BlockContainer { + @SideOnly(Side.CLIENT) private IIcon[] icons; @@ -33,8 +36,8 @@ public class BlockMagicApiary extends BlockContainer { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { boolean activate = false; if (!player.isSneaking()) { diff --git a/src/main/java/magicbees/block/BlockManaAuraProvider.java b/src/main/java/magicbees/block/BlockManaAuraProvider.java index 4516494..f32a831 100644 --- a/src/main/java/magicbees/block/BlockManaAuraProvider.java +++ b/src/main/java/magicbees/block/BlockManaAuraProvider.java @@ -1,10 +1,9 @@ package magicbees.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; import magicbees.tileentity.TileEntityManaAuraProvider; + import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -13,6 +12,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockManaAuraProvider extends Block implements ITileEntityProvider { @SideOnly(Side.CLIENT) diff --git a/src/main/java/magicbees/block/BlockVisAuraProvider.java b/src/main/java/magicbees/block/BlockVisAuraProvider.java index 2c335c5..aad48db 100644 --- a/src/main/java/magicbees/block/BlockVisAuraProvider.java +++ b/src/main/java/magicbees/block/BlockVisAuraProvider.java @@ -1,10 +1,9 @@ package magicbees.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; import magicbees.tileentity.TileEntityVisAuraProvider; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,6 +11,9 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockVisAuraProvider extends BlockContainer { public BlockVisAuraProvider() { diff --git a/src/main/java/magicbees/block/types/HiveType.java b/src/main/java/magicbees/block/types/HiveType.java index 1c2bb39..05291f1 100644 --- a/src/main/java/magicbees/block/types/HiveType.java +++ b/src/main/java/magicbees/block/types/HiveType.java @@ -1,10 +1,8 @@ package magicbees.block.types; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.IHiveDrop; import java.util.ArrayList; import java.util.Collections; + import magicbees.bees.BeeGenomeManager; import magicbees.bees.BeeSpecies; import magicbees.bees.HiveDrop; @@ -12,20 +10,25 @@ import magicbees.item.types.CombType; import magicbees.main.CommonProxy; import magicbees.main.Config; import magicbees.main.utils.compat.ForestryHelper; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IHiveDrop; + public enum HiveType { + CURIOUS("curious", BeeSpecies.MYSTICAL, 12, true), UNUSUAL("unusual", BeeSpecies.UNUSUAL, 12, true), RESONANT("resonant", BeeSpecies.SORCEROUS, 12, true), DEEP("deep", BeeSpecies.ATTUNED, 4, false), INFERNAL("infernal", BeeSpecies.INFERNAL, 15, false), - OBLIVION("oblivion", BeeSpecies.OBLIVION, 7, false), - ; + OBLIVION("oblivion", BeeSpecies.OBLIVION, 7, false),; private static String[] nameList; @@ -49,9 +52,11 @@ public enum HiveType { } public static void initHiveData() { - ItemStack[] combs = new ItemStack[] {Config.combs.getStackForType(CombType.MUNDANE)}; + ItemStack[] combs = new ItemStack[] { Config.combs.getStackForType(CombType.MUNDANE) }; HiveDrop valiantDrop = new HiveDrop( - BeeGenomeManager.addRainResist(ForestryHelper.getTemplateForestryForSpecies("Valiant")), combs, 5); + BeeGenomeManager.addRainResist(ForestryHelper.getTemplateForestryForSpecies("Valiant")), + combs, + 5); CURIOUS.drops.add(new HiveDrop(BeeSpecies.MYSTICAL.getGenome(), combs, 80).setIgnoblePercentage(0.7f)); CURIOUS.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.MYSTICAL.getGenome()), combs, 15)); @@ -69,12 +74,14 @@ public enum HiveType { DEEP.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.ATTUNED.getGenome()), combs, 20)); DEEP.drops.add(valiantDrop); - combs = new ItemStack[] {Config.combs.getStackForType(CombType.MOLTEN), new ItemStack(Items.glowstone_dust, 6)}; + combs = new ItemStack[] { Config.combs.getStackForType(CombType.MOLTEN), + new ItemStack(Items.glowstone_dust, 6) }; INFERNAL.drops.add(new HiveDrop(BeeSpecies.INFERNAL.getGenome(), combs, 80).setIgnoblePercentage(0.5f)); INFERNAL.drops.add(new HiveDrop(ForestryHelper.getTemplateForestryForSpecies("Steadfast"), combs, 3)); - combs = new ItemStack[] {Config.combs.getStackForType(CombType.FORGOTTEN), new ItemStack(Items.ender_pearl, 1)}; + combs = new ItemStack[] { Config.combs.getStackForType(CombType.FORGOTTEN), + new ItemStack(Items.ender_pearl, 1) }; OBLIVION.drops.add(new HiveDrop(BeeSpecies.OBLIVION.getGenome(), combs, 80)); OBLIVION.drops.add(new HiveDrop(ForestryHelper.getTemplateForestryForSpecies("Steadfast"), combs, 9)); diff --git a/src/main/java/magicbees/block/types/PlankType.java b/src/main/java/magicbees/block/types/PlankType.java index 0779fbf..9625e92 100644 --- a/src/main/java/magicbees/block/types/PlankType.java +++ b/src/main/java/magicbees/block/types/PlankType.java @@ -1,9 +1,9 @@ package magicbees.block.types; public enum PlankType { + GREATWOOD("greatwood", 48), - SILVERWOOD("silverwood", 49), - ; + SILVERWOOD("silverwood", 49),; public String name; public int textureIdx; diff --git a/src/main/java/magicbees/client/gui/ContainerEffectJar.java b/src/main/java/magicbees/client/gui/ContainerEffectJar.java index 1cf0676..d504f10 100644 --- a/src/main/java/magicbees/client/gui/ContainerEffectJar.java +++ b/src/main/java/magicbees/client/gui/ContainerEffectJar.java @@ -1,16 +1,19 @@ package magicbees.client.gui; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.tileentity.TileEntityEffectJar; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ContainerEffectJar extends Container { + public TileEntityEffectJar jar; public int lastBeeHealth = 0; diff --git a/src/main/java/magicbees/client/gui/ContainerMB.java b/src/main/java/magicbees/client/gui/ContainerMB.java index cefa0fb..42936f5 100644 --- a/src/main/java/magicbees/client/gui/ContainerMB.java +++ b/src/main/java/magicbees/client/gui/ContainerMB.java @@ -6,6 +6,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; public class ContainerMB extends Container { + protected final int PLAYER_INVENTORY_ROWS = 3; protected final int PLAYER_INVENTORY_COLUMNS = 9; diff --git a/src/main/java/magicbees/client/gui/ContainerMagicApiary.java b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java index 0039eb0..d86c8e5 100644 --- a/src/main/java/magicbees/client/gui/ContainerMagicApiary.java +++ b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java @@ -1,15 +1,17 @@ package magicbees.client.gui; -import forestry.api.apiculture.IHiveFrame; import magicbees.bees.BeeManager; import magicbees.main.utils.ItemInterface; import magicbees.tileentity.TileEntityMagicApiary; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import forestry.api.apiculture.IHiveFrame; + public class ContainerMagicApiary extends ContainerMB { public TileEntityMagicApiary apiary; @@ -27,13 +29,14 @@ public class ContainerMagicApiary extends ContainerMB { this.apiary = thaumicApiary; // Queen/Princess slot - addSlotToContainer(new SlotCustomItems( - this.apiary, - 0, - 29, - 39, - ItemInterface.getItemStack("Forestry", "beeQueenGE", 1), - ItemInterface.getItemStack("Forestry", "beePrincessGE", 1))); + addSlotToContainer( + new SlotCustomItems( + this.apiary, + 0, + 29, + 39, + ItemInterface.getItemStack("Forestry", "beeQueenGE", 1), + ItemInterface.getItemStack("Forestry", "beePrincessGE", 1))); // Drone slot addSlotToContainer( new SlotCustomItems(this.apiary, 1, 29, 65, ItemInterface.getItemStack("Forestry", "beeDroneGE", 64))); @@ -91,8 +94,8 @@ public class ContainerMagicApiary extends ContainerMB { } } } else if (srcStack.getItem() instanceof IHiveFrame) { - clearSlot = this.mergeItemStack( - srcStack, SLOT_FRAME_START, SLOT_FRAME_START + SLOT_FRAME_COUNT, false); + clearSlot = this + .mergeItemStack(srcStack, SLOT_FRAME_START, SLOT_FRAME_START + SLOT_FRAME_COUNT, false); } } } diff --git a/src/main/java/magicbees/client/gui/GUIEffectJar.java b/src/main/java/magicbees/client/gui/GUIEffectJar.java index 9851c0e..ae8659c 100644 --- a/src/main/java/magicbees/client/gui/GUIEffectJar.java +++ b/src/main/java/magicbees/client/gui/GUIEffectJar.java @@ -2,15 +2,19 @@ package magicbees.client.gui; import magicbees.main.CommonProxy; import magicbees.tileentity.TileEntityEffectJar; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; public class GUIEffectJar extends GuiContainer { + public static final String BACKGROUND_FILE = "jarScreen.png"; - public static final ResourceLocation BACKGROUND_LOCATION = - new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.GUI_TEXTURE + "jarScreen.png"); + public static final ResourceLocation BACKGROUND_LOCATION = new ResourceLocation( + CommonProxy.DOMAIN, + CommonProxy.GUI_TEXTURE + "jarScreen.png"); private static final int WIDTH = 176; private static final int HEIGHT = 156; diff --git a/src/main/java/magicbees/client/gui/GUIHandler.java b/src/main/java/magicbees/client/gui/GUIHandler.java index 7f2edf8..a388c87 100644 --- a/src/main/java/magicbees/client/gui/GUIHandler.java +++ b/src/main/java/magicbees/client/gui/GUIHandler.java @@ -1,11 +1,13 @@ package magicbees.client.gui; -import cpw.mods.fml.common.network.IGuiHandler; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; + public class GUIHandler implements IGuiHandler { @Override diff --git a/src/main/java/magicbees/client/gui/GuiFactory.java b/src/main/java/magicbees/client/gui/GuiFactory.java index faec561..f4862cd 100644 --- a/src/main/java/magicbees/client/gui/GuiFactory.java +++ b/src/main/java/magicbees/client/gui/GuiFactory.java @@ -1,10 +1,12 @@ package magicbees.client.gui; -import cpw.mods.fml.client.IModGuiFactory; import java.util.Set; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import cpw.mods.fml.client.IModGuiFactory; + public class GuiFactory implements IModGuiFactory { @Override diff --git a/src/main/java/magicbees/client/gui/GuiMagicApiary.java b/src/main/java/magicbees/client/gui/GuiMagicApiary.java index 6b7582e..e58f933 100644 --- a/src/main/java/magicbees/client/gui/GuiMagicApiary.java +++ b/src/main/java/magicbees/client/gui/GuiMagicApiary.java @@ -1,19 +1,24 @@ package magicbees.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.tileentity.TileEntityMagicApiary; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiMagicApiary extends GuiContainer { - public static final ResourceLocation BACKGROUND_LOCATION = - new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.GUI_TEXTURE + "apiary.png"); + + public static final ResourceLocation BACKGROUND_LOCATION = new ResourceLocation( + CommonProxy.DOMAIN, + CommonProxy.GUI_TEXTURE + "apiary.png"); private static final int WIDTH = 176; private static final int HEIGHT = 190; diff --git a/src/main/java/magicbees/client/gui/ModGuiConfig.java b/src/main/java/magicbees/client/gui/ModGuiConfig.java index eb148be..f76dc47 100644 --- a/src/main/java/magicbees/client/gui/ModGuiConfig.java +++ b/src/main/java/magicbees/client/gui/ModGuiConfig.java @@ -1,16 +1,20 @@ package magicbees.client.gui; +import java.util.ArrayList; +import java.util.List; + +import magicbees.main.Config; +import magicbees.main.utils.VersionInfo; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigElement; + import cpw.mods.fml.client.config.DummyConfigElement; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; -import java.util.ArrayList; -import java.util.List; -import magicbees.main.Config; -import magicbees.main.utils.VersionInfo; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.ConfigElement; public class ModGuiConfig extends GuiConfig { + public ModGuiConfig(GuiScreen guiScreen) { super( guiScreen, @@ -34,6 +38,8 @@ public class ModGuiConfig extends GuiConfig { private static IConfigElement categoryElement(String category, String name, String tooltip_key) { return new DummyConfigElement.DummyCategoryElement( - name, tooltip_key, new ConfigElement(Config.configuration.getCategory(category)).getChildElements()); + name, + tooltip_key, + new ConfigElement(Config.configuration.getCategory(category)).getChildElements()); } } diff --git a/src/main/java/magicbees/client/gui/SlotCustomItems.java b/src/main/java/magicbees/client/gui/SlotCustomItems.java index adeb4f2..12a8d91 100644 --- a/src/main/java/magicbees/client/gui/SlotCustomItems.java +++ b/src/main/java/magicbees/client/gui/SlotCustomItems.java @@ -3,6 +3,7 @@ package magicbees.client.gui; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -12,6 +13,7 @@ import net.minecraftforge.oredict.OreDictionary; * @author MysteriousAges */ public class SlotCustomItems extends Slot { + private List items; public SlotCustomItems(IInventory inventory, int slotIndex, int xPos, int yPos, ItemStack... items) { diff --git a/src/main/java/magicbees/client/gui/SlotFrame.java b/src/main/java/magicbees/client/gui/SlotFrame.java index 79c899d..d86b3a0 100644 --- a/src/main/java/magicbees/client/gui/SlotFrame.java +++ b/src/main/java/magicbees/client/gui/SlotFrame.java @@ -1,10 +1,12 @@ package magicbees.client.gui; -import forestry.api.apiculture.IHiveFrame; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import forestry.api.apiculture.IHiveFrame; + public class SlotFrame extends SlotCustomItems { + public SlotFrame(IInventory inventory, int slotIndex, int xPos, int yPos) { super(inventory, slotIndex, xPos, yPos); } diff --git a/src/main/java/magicbees/client/gui/UIScreens.java b/src/main/java/magicbees/client/gui/UIScreens.java index 16fcbc6..46d3403 100644 --- a/src/main/java/magicbees/client/gui/UIScreens.java +++ b/src/main/java/magicbees/client/gui/UIScreens.java @@ -2,6 +2,5 @@ package magicbees.client.gui; public enum UIScreens { EFFECT_JAR, - THAUMIC_APIARY, - ; + THAUMIC_APIARY,; } diff --git a/src/main/java/magicbees/client/model/ModelEffectJar.java b/src/main/java/magicbees/client/model/ModelEffectJar.java index bfb186c..ad4ded1 100644 --- a/src/main/java/magicbees/client/model/ModelEffectJar.java +++ b/src/main/java/magicbees/client/model/ModelEffectJar.java @@ -1,19 +1,25 @@ package magicbees.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; + import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelEffectJar { - public static final ResourceLocation objFile = - new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "effectJar.obj"); - public static final ResourceLocation textureLocation = - new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "jarTexture.png"); + + public static final ResourceLocation objFile = new ResourceLocation( + CommonProxy.DOMAIN, + CommonProxy.MODEL + "effectJar.obj"); + public static final ResourceLocation textureLocation = new ResourceLocation( + CommonProxy.DOMAIN, + CommonProxy.MODEL + "jarTexture.png"); public static final ModelEffectJar model = new ModelEffectJar(); diff --git a/src/main/java/magicbees/client/model/ModelVisAuraProvider.java b/src/main/java/magicbees/client/model/ModelVisAuraProvider.java index 8597127..456a368 100644 --- a/src/main/java/magicbees/client/model/ModelVisAuraProvider.java +++ b/src/main/java/magicbees/client/model/ModelVisAuraProvider.java @@ -1,19 +1,25 @@ package magicbees.client.model; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; + import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelVisAuraProvider { - public static final ResourceLocation objFile = - new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "visAuraConverter.obj"); - public static final ResourceLocation textureLocation = - new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "visAuraProvider.png"); + + public static final ResourceLocation objFile = new ResourceLocation( + CommonProxy.DOMAIN, + CommonProxy.MODEL + "visAuraConverter.obj"); + public static final ResourceLocation textureLocation = new ResourceLocation( + CommonProxy.DOMAIN, + CommonProxy.MODEL + "visAuraProvider.png"); public static final ModelVisAuraProvider model = new ModelVisAuraProvider(); @@ -28,7 +34,9 @@ public class ModelVisAuraProvider { GL11.glRotated(Math.sin(tick * Math.PI * 2 / 80) * 0.7, 0, 1, 0); GL11.glRotated(Math.sin((tick + 25) * Math.PI * 2 / 150) * 0.75, 0.5, 0, 0.5); GL11.glTranslated( - Math.sin(tick * Math.PI * 2 / 1000) * 0.025, 0, Math.sin((tick + 30) * Math.PI * 2 / 650) * 0.03); + Math.sin(tick * Math.PI * 2 / 1000) * 0.025, + 0, + Math.sin((tick + 30) * Math.PI * 2 / 650) * 0.03); float red = (float) (Math.sin(tick * Math.PI * 2 / 130) * 0.2 + 0.8); float green = (float) (Math.cos((tick + 2) * Math.PI * 2 / 140) * 0.2 + 0.8); float blue = (float) (Math.sin((tick + 5) * Math.PI * 2 / 99) * 0.2 + 0.8); diff --git a/src/main/java/magicbees/client/render/RendererEffectJar.java b/src/main/java/magicbees/client/render/RendererEffectJar.java index abd1d8f..ea78952 100644 --- a/src/main/java/magicbees/client/render/RendererEffectJar.java +++ b/src/main/java/magicbees/client/render/RendererEffectJar.java @@ -1,15 +1,19 @@ package magicbees.client.render; -import cpw.mods.fml.client.FMLClientHandler; import magicbees.client.model.ModelEffectJar; import magicbees.tileentity.TileEntityEffectJar; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.FMLClientHandler; + public class RendererEffectJar extends TileEntitySpecialRenderer implements IItemRenderer { + public static RendererEffectJar instance = new RendererEffectJar(); @Override diff --git a/src/main/java/magicbees/client/render/RendererVisAuraProvider.java b/src/main/java/magicbees/client/render/RendererVisAuraProvider.java index 57d7826..25f0869 100644 --- a/src/main/java/magicbees/client/render/RendererVisAuraProvider.java +++ b/src/main/java/magicbees/client/render/RendererVisAuraProvider.java @@ -1,15 +1,19 @@ package magicbees.client.render; -import cpw.mods.fml.client.FMLClientHandler; import magicbees.client.model.ModelVisAuraProvider; import magicbees.tileentity.TileEntityVisAuraProvider; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.FMLClientHandler; + public class RendererVisAuraProvider extends TileEntitySpecialRenderer implements IItemRenderer { + public static RendererVisAuraProvider instance = new RendererVisAuraProvider(); @Override diff --git a/src/main/java/magicbees/item/ItemCapsule.java b/src/main/java/magicbees/item/ItemCapsule.java index d471ac7..8d77629 100644 --- a/src/main/java/magicbees/item/ItemCapsule.java +++ b/src/main/java/magicbees/item/ItemCapsule.java @@ -1,20 +1,24 @@ package magicbees.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import magicbees.item.types.CapsuleType; import magicbees.item.types.FluidType; import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemCapsule extends Item { + private CapsuleType capsuleType; public ItemCapsule(CapsuleType type, int maxStackSize) { @@ -34,14 +38,15 @@ public class ItemCapsule extends Item { @Override public String getItemStackDisplayName(ItemStack itemStack) { return String.format( - this.capsuleType.getLocalizedName(), FluidType.values()[itemStack.getItemDamage()].getDisplayName()); + this.capsuleType.getLocalizedName(), + FluidType.values()[itemStack.getItemDamage()].getDisplayName()); } public ItemStack getCapsuleForLiquid(FluidType l) { return new ItemStack(this, 1, l.ordinal()); } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List itemList) { @@ -60,9 +65,10 @@ public class ItemCapsule extends Item { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":capsule" - + this.capsuleType.getName().substring(0, 1).toUpperCase() - + this.capsuleType.getName().substring(1)); + this.itemIcon = iconRegister.registerIcon( + CommonProxy.DOMAIN + ":capsule" + + this.capsuleType.getName().substring(0, 1).toUpperCase() + + this.capsuleType.getName().substring(1)); for (FluidType t : FluidType.values()) { if (t != FluidType.EMPTY) { t.liquidIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":liquids/" + t.liquidID); diff --git a/src/main/java/magicbees/item/ItemComb.java b/src/main/java/magicbees/item/ItemComb.java index d8d6f6d..428c45f 100644 --- a/src/main/java/magicbees/item/ItemComb.java +++ b/src/main/java/magicbees/item/ItemComb.java @@ -1,20 +1,24 @@ package magicbees.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import magicbees.item.types.CombType; import magicbees.main.Config; import magicbees.main.utils.compat.ForestryHelper; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemComb extends Item { + public ItemComb() { super(); this.setCreativeTab(Tabs.tabApiculture); @@ -31,7 +35,7 @@ public class ItemComb extends Item { return new ItemStack(this, count, type.ordinal()); } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { diff --git a/src/main/java/magicbees/item/ItemDrop.java b/src/main/java/magicbees/item/ItemDrop.java index b82bfe1..caa3c9b 100644 --- a/src/main/java/magicbees/item/ItemDrop.java +++ b/src/main/java/magicbees/item/ItemDrop.java @@ -1,19 +1,23 @@ package magicbees.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import magicbees.item.types.DropType; import magicbees.main.utils.compat.ForestryHelper; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemDrop extends Item { + public ItemDrop() { super(); this.setCreativeTab(Tabs.tabApiculture); @@ -32,7 +36,7 @@ public class ItemDrop extends Item { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void getSubItems(Item item, CreativeTabs tabs, List list) { for (DropType type : DropType.values()) { list.add(this.getStackForType(type)); diff --git a/src/main/java/magicbees/item/ItemGrafter.java b/src/main/java/magicbees/item/ItemGrafter.java index aacdcbf..c33753b 100644 --- a/src/main/java/magicbees/item/ItemGrafter.java +++ b/src/main/java/magicbees/item/ItemGrafter.java @@ -1,8 +1,8 @@ package magicbees.item; -import forestry.api.arboriculture.IToolGrafter; import magicbees.main.Config; import magicbees.main.utils.compat.ThaumcraftHelper; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -11,6 +11,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.api.arboriculture.IToolGrafter; + public class ItemGrafter extends Item implements IToolGrafter { public ItemGrafter() { @@ -26,8 +28,8 @@ public class ItemGrafter extends Item implements IToolGrafter { } @Override - public boolean onBlockDestroyed( - ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) { + public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z, + EntityLivingBase entityLiving) { int damage = 1; if (ThaumcraftHelper.isActive()) { if (block == ThaumcraftHelper.leaf) { diff --git a/src/main/java/magicbees/item/ItemMagicHive.java b/src/main/java/magicbees/item/ItemMagicHive.java index b2c0710..2a04933 100644 --- a/src/main/java/magicbees/item/ItemMagicHive.java +++ b/src/main/java/magicbees/item/ItemMagicHive.java @@ -1,17 +1,20 @@ package magicbees.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.block.types.HiveType; + import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + /** * Created by Allen on 7/29/2014. */ public class ItemMagicHive extends ItemBlock { + public ItemMagicHive(Block block) { super(block); setMaxDamage(0); diff --git a/src/main/java/magicbees/item/ItemMagicHiveFrame.java b/src/main/java/magicbees/item/ItemMagicHiveFrame.java index 48e17b0..e75b838 100644 --- a/src/main/java/magicbees/item/ItemMagicHiveFrame.java +++ b/src/main/java/magicbees/item/ItemMagicHiveFrame.java @@ -1,5 +1,13 @@ package magicbees.item; +import magicbees.item.types.HiveFrameType; +import magicbees.main.CommonProxy; +import magicbees.main.utils.TabMagicBees; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -7,14 +15,9 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; -import magicbees.item.types.HiveFrameType; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class ItemMagicHiveFrame extends Item implements IHiveFrame { + private HiveFrameType type; public ItemMagicHiveFrame(HiveFrameType frameType) { diff --git a/src/main/java/magicbees/item/ItemManasteelGrafter.java b/src/main/java/magicbees/item/ItemManasteelGrafter.java index 765d00e..f80b8d3 100644 --- a/src/main/java/magicbees/item/ItemManasteelGrafter.java +++ b/src/main/java/magicbees/item/ItemManasteelGrafter.java @@ -1,20 +1,23 @@ package magicbees.item; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.main.utils.compat.BotaniaHelper; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import vazkii.botania.api.mana.IManaUsingItem; -@Optional.InterfaceList({ - @Optional.Interface(iface = "vazkii.botania.api.mana.IManaUsingItem", modid = BotaniaHelper.Name, striprefs = true) -}) +import vazkii.botania.api.mana.IManaUsingItem; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@Optional.InterfaceList({ @Optional.Interface( + iface = "vazkii.botania.api.mana.IManaUsingItem", + modid = BotaniaHelper.Name, + striprefs = true) }) public class ItemManasteelGrafter extends ItemGrafter implements IManaUsingItem { public static final int MANA_PER_DAMAGE = 90; @@ -29,7 +32,7 @@ public class ItemManasteelGrafter extends ItemGrafter implements IManaUsingItem @Optional.Method(modid = BotaniaHelper.Name) public boolean getIsRepairable(ItemStack toolStack, ItemStack material) { return (material.getItem() == BotaniaHelper.itemManaResource - && material.getItemDamage() == BotaniaHelper.ManaResource.MANASTEEL.ordinal()) + && material.getItemDamage() == BotaniaHelper.ManaResource.MANASTEEL.ordinal()) || super.getIsRepairable(toolStack, material); } @@ -43,7 +46,7 @@ public class ItemManasteelGrafter extends ItemGrafter implements IManaUsingItem public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { // Unsure if the server-side exclusion is necessary, but boy it looks disconcerting on the client if it's in. if ( - /*!world.isRemote && */ stack.getItemDamage() > 0 && player instanceof EntityPlayer) { + /* !world.isRemote && */ stack.getItemDamage() > 0 && player instanceof EntityPlayer) { if (BotaniaHelper.requestMana(stack, (EntityPlayer) player, MANA_PER_DAMAGE, 1)) { stack.setItemDamage(stack.getItemDamage() - 1); } diff --git a/src/main/java/magicbees/item/ItemManasteelScoop.java b/src/main/java/magicbees/item/ItemManasteelScoop.java index 782b161..f302a28 100644 --- a/src/main/java/magicbees/item/ItemManasteelScoop.java +++ b/src/main/java/magicbees/item/ItemManasteelScoop.java @@ -1,11 +1,8 @@ package magicbees.item; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.IToolScoop; import magicbees.main.CommonProxy; import magicbees.main.utils.compat.BotaniaHelper; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -14,11 +11,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import vazkii.botania.api.mana.IManaUsingItem; -@Optional.InterfaceList({ - @Optional.Interface(iface = "vazkii.botania.api.mana.IManaUsingItem", modid = BotaniaHelper.Name, striprefs = true) -}) +import vazkii.botania.api.mana.IManaUsingItem; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.IToolScoop; + +@Optional.InterfaceList({ @Optional.Interface( + iface = "vazkii.botania.api.mana.IManaUsingItem", + modid = BotaniaHelper.Name, + striprefs = true) }) public class ItemManasteelScoop extends Item implements IManaUsingItem, IToolScoop { public static final int MANA_PER_DAMAGE = 30; @@ -33,8 +36,8 @@ public class ItemManasteelScoop extends Item implements IManaUsingItem, IToolSco } @Override - public boolean onBlockDestroyed( - ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player) { + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, + EntityLivingBase player) { stack.damageItem(1, player); return true; } @@ -48,7 +51,7 @@ public class ItemManasteelScoop extends Item implements IManaUsingItem, IToolSco @Optional.Method(modid = BotaniaHelper.Name) public boolean getIsRepairable(ItemStack toolStack, ItemStack material) { return (material.getItem() == BotaniaHelper.itemManaResource - && material.getItemDamage() == BotaniaHelper.ManaResource.MANASTEEL.ordinal()) + && material.getItemDamage() == BotaniaHelper.ManaResource.MANASTEEL.ordinal()) || super.getIsRepairable(toolStack, material); } @@ -62,7 +65,7 @@ public class ItemManasteelScoop extends Item implements IManaUsingItem, IToolSco public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { // Unsure if the server-side exclusion is necessary, but boy it looks disconcerting on the client if it's in. if ( - /*!world.isRemote && */ stack.getItemDamage() > 0 && player instanceof EntityPlayer) { + /* !world.isRemote && */ stack.getItemDamage() > 0 && player instanceof EntityPlayer) { if (BotaniaHelper.requestMana(stack, (EntityPlayer) player, MANA_PER_DAMAGE, 1)) { stack.setItemDamage(stack.getItemDamage() - 1); } diff --git a/src/main/java/magicbees/item/ItemMiscResources.java b/src/main/java/magicbees/item/ItemMiscResources.java index 24a2671..1bfa1ae 100644 --- a/src/main/java/magicbees/item/ItemMiscResources.java +++ b/src/main/java/magicbees/item/ItemMiscResources.java @@ -1,19 +1,23 @@ package magicbees.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import magicbees.item.types.ResourceType; import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemMiscResources extends Item { + private IIcon[] icons = new IIcon[ResourceType.values().length]; public ItemMiscResources() { @@ -34,7 +38,7 @@ public class ItemMiscResources extends Item { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void getSubItems(Item item, CreativeTabs tabs, List list) { for (ResourceType type : ResourceType.values()) { if (type.showInList) { @@ -46,8 +50,8 @@ public class ItemMiscResources extends Item { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { for (int i = 0; i < ResourceType.values().length; i++) { - this.icons[i] = - par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":" + ResourceType.values()[i].getName()); + this.icons[i] = par1IconRegister + .registerIcon(CommonProxy.DOMAIN + ":" + ResourceType.values()[i].getName()); } } diff --git a/src/main/java/magicbees/item/ItemMoonDial.java b/src/main/java/magicbees/item/ItemMoonDial.java index 4f52639..7f2997e 100644 --- a/src/main/java/magicbees/item/ItemMoonDial.java +++ b/src/main/java/magicbees/item/ItemMoonDial.java @@ -1,20 +1,24 @@ package magicbees.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import magicbees.main.CommonProxy; import magicbees.main.Config; import magicbees.main.utils.MoonPhase; import magicbees.main.utils.TabMagicBees; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemMoonDial extends Item { + @SideOnly(Side.CLIENT) private IIcon[] icons; @@ -37,20 +41,18 @@ public class ItemMoonDial extends Item { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - return this.icons[ - MoonPhase.getMoonPhaseFromTime(player.worldObj.getWorldTime()).ordinal()]; + return this.icons[MoonPhase.getMoonPhaseFromTime(player.worldObj.getWorldTime()).ordinal()]; } @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List infoList, boolean par4) { - if (Config.moonDialShowsPhaseInText - && entityPlayer.getCurrentEquippedItem() != null + if (Config.moonDialShowsPhaseInText && entityPlayer.getCurrentEquippedItem() != null && entityPlayer.getCurrentEquippedItem().getItem() == this) { - infoList.add("\u00A77" - + MoonPhase.getMoonPhaseFromTime(entityPlayer.worldObj.getWorldTime()) - .getLocalizedName()); + infoList.add( + "\u00A77" + + MoonPhase.getMoonPhaseFromTime(entityPlayer.worldObj.getWorldTime()).getLocalizedName()); } } } diff --git a/src/main/java/magicbees/item/ItemMysteriousMagnet.java b/src/main/java/magicbees/item/ItemMysteriousMagnet.java index 5324a60..e3242e0 100644 --- a/src/main/java/magicbees/item/ItemMysteriousMagnet.java +++ b/src/main/java/magicbees/item/ItemMysteriousMagnet.java @@ -1,16 +1,12 @@ package magicbees.item; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import magicbees.main.CommonProxy; import magicbees.main.Config; import magicbees.main.utils.LocalizationManager; import magicbees.main.utils.TabMagicBees; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -25,6 +21,13 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @Optional.Interface(modid = "Baubles", iface = "baubles.api.IBauble") public class ItemMysteriousMagnet extends Item implements IBauble { @@ -43,7 +46,7 @@ public class ItemMysteriousMagnet extends Item implements IBauble { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String s = LocalizationManager.getLocalizedString("misc.level", getMagnetLevel(itemStack)); if (isMagnetActive(itemStack)) { @@ -62,7 +65,7 @@ public class ItemMysteriousMagnet extends Item implements IBauble { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void getSubItems(Item item, CreativeTabs tabs, List list) { for (int i = 0; i <= getMaximumLevel(); i++) { list.add(new ItemStack(this, 1, i * 2)); @@ -169,7 +172,11 @@ public class ItemMysteriousMagnet extends Item implements IBauble { if ((arrow.canBePickedUp == 1 || world.rand.nextFloat() < 0.3f) && arrow.shootingEntity != entity) { EntityItem replacement = new EntityItem( - world, arrow.posX, arrow.posY, arrow.posZ, new ItemStack(Items.arrow)); + world, + arrow.posX, + arrow.posY, + arrow.posZ, + new ItemStack(Items.arrow)); world.spawnEntityInWorld(replacement); } world.removeEntity(arrow); diff --git a/src/main/java/magicbees/item/ItemNugget.java b/src/main/java/magicbees/item/ItemNugget.java index 40409cf..34b6d46 100644 --- a/src/main/java/magicbees/item/ItemNugget.java +++ b/src/main/java/magicbees/item/ItemNugget.java @@ -1,17 +1,21 @@ package magicbees.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import magicbees.item.types.NuggetType; import magicbees.main.CommonProxy; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemNugget extends Item { + @SideOnly(Side.CLIENT) private IIcon[] icons; @@ -32,7 +36,7 @@ public class ItemNugget extends Item { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void getSubItems(Item item, CreativeTabs tab, List list) { for (NuggetType type : NuggetType.values()) { if (type.isActive()) { @@ -45,9 +49,10 @@ public class ItemNugget extends Item { public void registerIcons(IIconRegister par1IconRegister) { this.icons = new IIcon[NuggetType.values().length]; for (int i = 0; i < NuggetType.values().length; i++) { - this.icons[i] = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":nugget" - + NuggetType.values()[i].name().substring(0, 1) - + NuggetType.values()[i].name().substring(1).toLowerCase()); + this.icons[i] = par1IconRegister.registerIcon( + CommonProxy.DOMAIN + ":nugget" + + NuggetType.values()[i].name().substring(0, 1) + + NuggetType.values()[i].name().substring(1).toLowerCase()); } } diff --git a/src/main/java/magicbees/item/ItemPollen.java b/src/main/java/magicbees/item/ItemPollen.java index c83ddae..8d4c89a 100644 --- a/src/main/java/magicbees/item/ItemPollen.java +++ b/src/main/java/magicbees/item/ItemPollen.java @@ -1,19 +1,23 @@ package magicbees.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import magicbees.item.types.PollenType; import magicbees.main.utils.compat.ForestryHelper; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemPollen extends Item { + public ItemPollen() { super(); this.setCreativeTab(Tabs.tabApiculture); @@ -32,7 +36,7 @@ public class ItemPollen extends Item { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void getSubItems(Item item, CreativeTabs tabs, List list) { for (PollenType type : PollenType.values()) { list.add(this.getStackForType(type)); diff --git a/src/main/java/magicbees/item/ItemPropolis.java b/src/main/java/magicbees/item/ItemPropolis.java index 230af27..548d8f1 100644 --- a/src/main/java/magicbees/item/ItemPropolis.java +++ b/src/main/java/magicbees/item/ItemPropolis.java @@ -1,18 +1,22 @@ package magicbees.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import magicbees.item.types.PropolisType; import magicbees.main.utils.compat.ForestryHelper; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemPropolis extends Item { + public ItemPropolis() { super(); this.setCreativeTab(Tabs.tabApiculture); @@ -31,7 +35,7 @@ public class ItemPropolis extends Item { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void getSubItems(Item item, CreativeTabs tabs, List list) { for (PropolisType type : PropolisType.values()) { list.add(this.getStackForType(type)); diff --git a/src/main/java/magicbees/item/ItemThaumiumGrafter.java b/src/main/java/magicbees/item/ItemThaumiumGrafter.java index 727f219..c4daebf 100644 --- a/src/main/java/magicbees/item/ItemThaumiumGrafter.java +++ b/src/main/java/magicbees/item/ItemThaumiumGrafter.java @@ -1,10 +1,8 @@ package magicbees.item; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.main.utils.compat.ThaumcraftHelper; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -12,13 +10,19 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; + import thaumcraft.api.IRepairableExtended; import thaumcraft.api.ThaumcraftApi; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; -@Optional.InterfaceList({ - @Optional.Interface(iface = "thaumcraft.api.IRepairableExtended", modid = ThaumcraftHelper.Name, striprefs = true) -}) +@Optional.InterfaceList({ @Optional.Interface( + iface = "thaumcraft.api.IRepairableExtended", + modid = ThaumcraftHelper.Name, + striprefs = true) }) public class ItemThaumiumGrafter extends ItemGrafter implements IRepairableExtended { + public ItemThaumiumGrafter() { super(); this.setMaxDamage(15); diff --git a/src/main/java/magicbees/item/ItemThaumiumScoop.java b/src/main/java/magicbees/item/ItemThaumiumScoop.java index 7d5df70..1c1be3f 100644 --- a/src/main/java/magicbees/item/ItemThaumiumScoop.java +++ b/src/main/java/magicbees/item/ItemThaumiumScoop.java @@ -1,11 +1,8 @@ package magicbees.item; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.IToolScoop; import magicbees.main.CommonProxy; import magicbees.main.utils.compat.ThaumcraftHelper; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -15,13 +12,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; + import thaumcraft.api.IRepairable; import thaumcraft.api.ThaumcraftApi; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.IToolScoop; @Optional.InterfaceList({ - @Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true) -}) + @Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true) }) public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop { + public ItemThaumiumScoop() { super(); this.setMaxStackSize(1); @@ -42,8 +44,8 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop { } @Override - public boolean onBlockDestroyed( - ItemStack itemstack, World world, Block block, int j, int k, int l, EntityLivingBase entityliving) { + public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int j, int k, int l, + EntityLivingBase entityliving) { itemstack.damageItem(1, entityliving); return true; } diff --git a/src/main/java/magicbees/item/ItemVoidGrafter.java b/src/main/java/magicbees/item/ItemVoidGrafter.java index ff09eb1..bd3c87a 100644 --- a/src/main/java/magicbees/item/ItemVoidGrafter.java +++ b/src/main/java/magicbees/item/ItemVoidGrafter.java @@ -1,10 +1,8 @@ package magicbees.item; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.main.utils.compat.ThaumcraftHelper; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -18,15 +16,22 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; + import thaumcraft.api.IRepairableExtended; import thaumcraft.api.IWarpingGear; import thaumcraft.api.ThaumcraftApi; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({ - @Optional.Interface(iface = "thaumcraft.api.IRepairableExtended", modid = ThaumcraftHelper.Name, striprefs = true), - @Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = ThaumcraftHelper.Name, striprefs = true) -}) + @Optional.Interface( + iface = "thaumcraft.api.IRepairableExtended", + modid = ThaumcraftHelper.Name, + striprefs = true), + @Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = ThaumcraftHelper.Name, striprefs = true) }) public class ItemVoidGrafter extends ItemGrafter implements IRepairableExtended, IWarpingGear { + public ItemVoidGrafter() { super(); this.setMaxDamage(10); @@ -90,8 +95,7 @@ public class ItemVoidGrafter extends ItemGrafter implements IRepairableExtended, public void onUpdate(ItemStack stack, World world, Entity entity, int p_77663_4_, boolean p_77663_5_) { super.onUpdate(stack, world, entity, p_77663_4_, p_77663_5_); - if ((stack.isItemDamaged()) - && (entity != null) + if ((stack.isItemDamaged()) && (entity != null) && (entity.ticksExisted % 20 == 0) && ((entity instanceof EntityLivingBase))) { stack.damageItem(-1, (EntityLivingBase) entity); @@ -99,10 +103,8 @@ public class ItemVoidGrafter extends ItemGrafter implements IRepairableExtended, } public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - if ((!player.worldObj.isRemote) - && ((entity instanceof EntityLivingBase)) - && ((!(entity instanceof EntityPlayer)) - || (MinecraftServer.getServer().isPVPEnabled()))) { + if ((!player.worldObj.isRemote) && ((entity instanceof EntityLivingBase)) + && ((!(entity instanceof EntityPlayer)) || (MinecraftServer.getServer().isPVPEnabled()))) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.weakness.getId(), 80)); } return super.onLeftClickEntity(stack, player, entity); diff --git a/src/main/java/magicbees/item/ItemVoidScoop.java b/src/main/java/magicbees/item/ItemVoidScoop.java index a849f59..25aa93b 100644 --- a/src/main/java/magicbees/item/ItemVoidScoop.java +++ b/src/main/java/magicbees/item/ItemVoidScoop.java @@ -1,11 +1,8 @@ package magicbees.item; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.IToolScoop; import magicbees.main.CommonProxy; import magicbees.main.utils.compat.ThaumcraftHelper; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -20,15 +17,20 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; + import thaumcraft.api.IRepairable; import thaumcraft.api.IWarpingGear; import thaumcraft.api.ThaumcraftApi; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.IToolScoop; @Optional.InterfaceList({ - @Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true), - @Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = ThaumcraftHelper.Name, striprefs = true) -}) + @Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true), + @Optional.Interface(iface = "thaumcraft.api.IWarpingGear", modid = ThaumcraftHelper.Name, striprefs = true) }) public class ItemVoidScoop extends Item implements IRepairable, IToolScoop, IWarpingGear { + public ItemVoidScoop() { super(); this.setMaxStackSize(1); @@ -49,8 +51,8 @@ public class ItemVoidScoop extends Item implements IRepairable, IToolScoop, IWar } @Override - public boolean onBlockDestroyed( - ItemStack itemstack, World world, Block block, int j, int k, int l, EntityLivingBase entityliving) { + public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int j, int k, int l, + EntityLivingBase entityliving) { itemstack.damageItem(1, entityliving); return true; } @@ -92,8 +94,7 @@ public class ItemVoidScoop extends Item implements IRepairable, IToolScoop, IWar public void onUpdate(ItemStack stack, World world, Entity entity, int p_77663_4_, boolean p_77663_5_) { super.onUpdate(stack, world, entity, p_77663_4_, p_77663_5_); - if ((stack.isItemDamaged()) - && (entity != null) + if ((stack.isItemDamaged()) && (entity != null) && (entity.ticksExisted % 20 == 0) && ((entity instanceof EntityLivingBase))) { stack.damageItem(-1, (EntityLivingBase) entity); @@ -101,10 +102,8 @@ public class ItemVoidScoop extends Item implements IRepairable, IToolScoop, IWar } public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - if ((!player.worldObj.isRemote) - && ((entity instanceof EntityLivingBase)) - && ((!(entity instanceof EntityPlayer)) - || (MinecraftServer.getServer().isPVPEnabled()))) { + if ((!player.worldObj.isRemote) && ((entity instanceof EntityLivingBase)) + && ((!(entity instanceof EntityPlayer)) || (MinecraftServer.getServer().isPVPEnabled()))) { ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.weakness.getId(), 80)); } return super.onLeftClickEntity(stack, player, entity); diff --git a/src/main/java/magicbees/item/ItemWax.java b/src/main/java/magicbees/item/ItemWax.java index 1446772..723a1b9 100644 --- a/src/main/java/magicbees/item/ItemWax.java +++ b/src/main/java/magicbees/item/ItemWax.java @@ -1,19 +1,23 @@ package magicbees.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import magicbees.item.types.WaxType; import magicbees.main.CommonProxy; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemWax extends Item { + @SideOnly(Side.CLIENT) private IIcon secondaryIcon; @@ -47,7 +51,7 @@ public class ItemWax extends Item { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void getSubItems(Item item, CreativeTabs tabs, List list) { for (WaxType type : WaxType.values()) { list.add(this.getStackForType(type)); diff --git a/src/main/java/magicbees/item/types/CapsuleType.java b/src/main/java/magicbees/item/types/CapsuleType.java index fb322e4..567d943 100644 --- a/src/main/java/magicbees/item/types/CapsuleType.java +++ b/src/main/java/magicbees/item/types/CapsuleType.java @@ -3,9 +3,10 @@ package magicbees.item.types; import magicbees.main.utils.LocalizationManager; public enum CapsuleType { + MAGIC("magic", 2000, 0), - VOID("void", 8000, 1), - ; + VOID("void", 8000, 1),; + private String name; public int capacity; public int iconIdx; diff --git a/src/main/java/magicbees/item/types/CombType.java b/src/main/java/magicbees/item/types/CombType.java index 30a7ec2..8632a17 100644 --- a/src/main/java/magicbees/item/types/CombType.java +++ b/src/main/java/magicbees/item/types/CombType.java @@ -37,38 +37,16 @@ public enum CombType { TE_DESTABILIZED("TEelectric", false), TE_CARBON("TEcarbon", false), TE_LUX("TElux", false), - TE_ENDEARING("TEendearing", false), - ; + TE_ENDEARING("TEendearing", false),; - private static int[][] colours = new int[][] { - {0xFF9859, 0xFFC58E}, - {0xcc3333, 0x1E160E}, - {0x9872FF, 0x2D2D2D}, - {0x3EE0D8, 0x3A3820}, - {0xE5425D, 0x323291}, - {0xBCA664, 0x35332E}, - {0x7F7171, 0x876D53}, - {0xB7ACB7, 0x636363}, - {0x0092e9, 0x618fff}, - {0x2F9381, 0x773C31}, - {0xB191D8, 0x35443B}, - {0xffff7e, 0x606308}, - {0xff3C01, 0x5B0D10}, - {0x0090ff, 0x102F6B}, - {0x00a000, 0x043004}, - {0xFFDF14, 0x707019}, - {0xE21802, 0x3F0E12}, - {0x00B6FF, 0x0F373D}, - {0x28D328, 0x333004}, - {0xDDDDFF, 0x9D9DB5}, - {0x555577, 0x2D2D56}, - {0xCC8604, 0x41046F}, - {0xCCCC04, 0x41046F}, - {0xCC002C, 0x6B0118}, - {0x454545, 0x0F0F0F}, - {0xF5F3A4, 0xC9C87D}, - {0x12E3D9, 0x069E97}, - }; + private static int[][] colours = new int[][] { { 0xFF9859, 0xFFC58E }, { 0xcc3333, 0x1E160E }, + { 0x9872FF, 0x2D2D2D }, { 0x3EE0D8, 0x3A3820 }, { 0xE5425D, 0x323291 }, { 0xBCA664, 0x35332E }, + { 0x7F7171, 0x876D53 }, { 0xB7ACB7, 0x636363 }, { 0x0092e9, 0x618fff }, { 0x2F9381, 0x773C31 }, + { 0xB191D8, 0x35443B }, { 0xffff7e, 0x606308 }, { 0xff3C01, 0x5B0D10 }, { 0x0090ff, 0x102F6B }, + { 0x00a000, 0x043004 }, { 0xFFDF14, 0x707019 }, { 0xE21802, 0x3F0E12 }, { 0x00B6FF, 0x0F373D }, + { 0x28D328, 0x333004 }, { 0xDDDDFF, 0x9D9DB5 }, { 0x555577, 0x2D2D56 }, { 0xCC8604, 0x41046F }, + { 0xCCCC04, 0x41046F }, { 0xCC002C, 0x6B0118 }, { 0x454545, 0x0F0F0F }, { 0xF5F3A4, 0xC9C87D }, + { 0x12E3D9, 0x069E97 }, }; private CombType(String pName, boolean show) { this.name = pName; diff --git a/src/main/java/magicbees/item/types/DropType.java b/src/main/java/magicbees/item/types/DropType.java index 3fc1366..522fcb0 100644 --- a/src/main/java/magicbees/item/types/DropType.java +++ b/src/main/java/magicbees/item/types/DropType.java @@ -3,13 +3,13 @@ package magicbees.item.types; import magicbees.main.utils.LocalizationManager; public enum DropType { + ENCHANTED("enchanting", 0x6e1c6d, 0xff8fff), INTELLECT("intellect", 0x25914D, 0x18E072), DESTABILIZED("destabilized", 0xCC002C, 0x6B0118), CARBON("carbon", 0x454545, 0x0F0F0F), LUX("lux", 0xF5F3A4, 0xC9C87D), - ENDEARING("endearing", 0x12E3D9, 0x069E97), - ; + ENDEARING("endearing", 0x12E3D9, 0x069E97),; private DropType(String pName, int colourA, int colourB) { this.name = pName; diff --git a/src/main/java/magicbees/item/types/FluidType.java b/src/main/java/magicbees/item/types/FluidType.java index 2d23784..64f2bbd 100644 --- a/src/main/java/magicbees/item/types/FluidType.java +++ b/src/main/java/magicbees/item/types/FluidType.java @@ -1,6 +1,7 @@ package magicbees.item.types; import magicbees.main.utils.LocalizationManager; + import net.minecraft.util.IIcon; public enum FluidType { @@ -45,8 +46,8 @@ public enum FluidType { PYROTHEUM("pyrotheum"), CRYOTHEUM("cryotheum"), MANA("mana"), - COAL("coal"), - ; + COAL("coal"),; + public String liquidID; public int iconIdx; public boolean available = false; diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index 8a483a5..f822993 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -1,18 +1,18 @@ package magicbees.item.types; +import magicbees.main.utils.LocalizationManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; -import magicbees.main.utils.LocalizationManager; public enum HiveFrameType implements IBeeModifier { + MAGIC("Magic", 240, 1f, 1f, 1f, 2f, 0.6f), RESILIENT("Resilient", 800, 1f, 1f, 1f, 2f, 0.5f), GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f, 0.01f), METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 1.2f, 1f), NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 1.2f), TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f), - OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f), - ; + OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f),; private final String frameName; public final int maxDamage; @@ -28,30 +28,13 @@ public enum HiveFrameType implements IBeeModifier { private final boolean isSunlit; private final boolean isHellish; - HiveFrameType( - String name, - int damage, - float territory, - float mutation, - float lifespan, - float production, + HiveFrameType(String name, int damage, float territory, float mutation, float lifespan, float production, float geneticDecay) { this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false); } - HiveFrameType( - String name, - int damage, - float territory, - float mutation, - float lifespan, - float production, - float flowering, - float geneticDecay, - boolean sealed, - boolean lit, - boolean sunlit, - boolean hellish) { + HiveFrameType(String name, int damage, float territory, float mutation, float lifespan, float production, + float flowering, float geneticDecay, boolean sealed, boolean lit, boolean sunlit, boolean hellish) { this.frameName = name; this.maxDamage = damage; diff --git a/src/main/java/magicbees/item/types/NuggetType.java b/src/main/java/magicbees/item/types/NuggetType.java index 9728724..c8053fb 100644 --- a/src/main/java/magicbees/item/types/NuggetType.java +++ b/src/main/java/magicbees/item/types/NuggetType.java @@ -1,9 +1,11 @@ package magicbees.item.types; import magicbees.main.utils.LocalizationManager; + import net.minecraft.item.Item; public enum NuggetType { + IRON, COPPER, TIN, @@ -11,8 +13,7 @@ public enum NuggetType { LEAD, DIAMOND, EMERALD, - APATITE, - ; + APATITE,; private Item targetIngot; private boolean active; @@ -38,7 +39,6 @@ public enum NuggetType { } public String getName() { - return LocalizationManager.getLocalizedString( - "nugget." + this.toString().toLowerCase()); + return LocalizationManager.getLocalizedString("nugget." + this.toString().toLowerCase()); } } diff --git a/src/main/java/magicbees/item/types/PollenType.java b/src/main/java/magicbees/item/types/PollenType.java index 501e7f0..acd995e 100644 --- a/src/main/java/magicbees/item/types/PollenType.java +++ b/src/main/java/magicbees/item/types/PollenType.java @@ -3,9 +3,9 @@ package magicbees.item.types; import magicbees.main.utils.LocalizationManager; public enum PollenType { + UNUSUAL("unusual", 0xD8417B, 0xA03059), - PHASED("phased", 0x4974B4, 0x456BA5), - ; + PHASED("phased", 0x4974B4, 0x456BA5),; private PollenType(String pName, int colourA, int colourB) { this.name = pName; diff --git a/src/main/java/magicbees/item/types/PropolisType.java b/src/main/java/magicbees/item/types/PropolisType.java index 28a122c..0650004 100644 --- a/src/main/java/magicbees/item/types/PropolisType.java +++ b/src/main/java/magicbees/item/types/PropolisType.java @@ -3,6 +3,7 @@ package magicbees.item.types; import magicbees.main.utils.LocalizationManager; public enum PropolisType { + UNSTABLE("unstable", 0xEFB492), AIR("air", 0xA19E10), @@ -10,8 +11,7 @@ public enum PropolisType { WATER("water", 0x1054A1), EARTH("earth", 0x00a000), ORDER("dull", 0xDDDDFF), - CHAOS("magic", 0x555577), - ; + CHAOS("magic", 0x555577),; private PropolisType(String pName, int overlayColour) { this.name = pName; diff --git a/src/main/java/magicbees/item/types/ResourceType.java b/src/main/java/magicbees/item/types/ResourceType.java index 1989118..12a992d 100644 --- a/src/main/java/magicbees/item/types/ResourceType.java +++ b/src/main/java/magicbees/item/types/ResourceType.java @@ -3,6 +3,7 @@ package magicbees.item.types; import magicbees.main.utils.LocalizationManager; public enum ResourceType { + LORE_FRAGMENT("fragment", true), AROMATIC_LUMP("lump", true), EXTENDED_FERTILIZER("fertilizer", true), @@ -29,10 +30,9 @@ public enum ResourceType { TC_DUST_CHAOS("TCchaosDust", true), // Dummy items for Thaumanomicon research icons. - // These won't ever actually exist in-game, and so they can be moved around. + // These won't ever actually exist in-game, and so they can be moved around. RESEARCH_STARTNODE("startNode", false), - RESEARCH_BEEINFUSION("beeInfusion", false), - ; + RESEARCH_BEEINFUSION("beeInfusion", false),; private ResourceType(String n, boolean show) { this.name = n; diff --git a/src/main/java/magicbees/item/types/WaxType.java b/src/main/java/magicbees/item/types/WaxType.java index 262edf9..6ba7f9c 100644 --- a/src/main/java/magicbees/item/types/WaxType.java +++ b/src/main/java/magicbees/item/types/WaxType.java @@ -3,6 +3,7 @@ package magicbees.item.types; import magicbees.main.utils.LocalizationManager; public enum WaxType { + MAGIC("magic", true, 0xd242df), SOUL("soul", false, 0x967C63), AMNESIC("amnesic", true, 0x856DFF); diff --git a/src/main/java/magicbees/main/ClientProxy.java b/src/main/java/magicbees/main/ClientProxy.java index 2179d8c..74e32ad 100644 --- a/src/main/java/magicbees/main/ClientProxy.java +++ b/src/main/java/magicbees/main/ClientProxy.java @@ -1,18 +1,21 @@ package magicbees.main; +import magicbees.client.render.RendererEffectJar; +import magicbees.client.render.RendererVisAuraProvider; +import magicbees.tileentity.TileEntityEffectJar; +import magicbees.tileentity.TileEntityVisAuraProvider; + +import net.minecraft.item.Item; +import net.minecraftforge.client.MinecraftForgeClient; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import magicbees.client.render.RendererEffectJar; -import magicbees.client.render.RendererVisAuraProvider; -import magicbees.tileentity.TileEntityEffectJar; -import magicbees.tileentity.TileEntityVisAuraProvider; -import net.minecraft.item.Item; -import net.minecraftforge.client.MinecraftForgeClient; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { + @Override public void registerRenderers() { super.registerRenderers(); @@ -22,8 +25,8 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEffectJar.class, RendererEffectJar.instance); RenderIdVisAuraProvider = RenderingRegistry.getNextAvailableRenderId(); - MinecraftForgeClient.registerItemRenderer( - Item.getItemFromBlock(Config.visAuraProvider), RendererVisAuraProvider.instance); + MinecraftForgeClient + .registerItemRenderer(Item.getItemFromBlock(Config.visAuraProvider), RendererVisAuraProvider.instance); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityVisAuraProvider.class, RendererVisAuraProvider.instance); } } diff --git a/src/main/java/magicbees/main/CommonProxy.java b/src/main/java/magicbees/main/CommonProxy.java index fbd32ab..132b0aa 100644 --- a/src/main/java/magicbees/main/CommonProxy.java +++ b/src/main/java/magicbees/main/CommonProxy.java @@ -1,6 +1,7 @@ package magicbees.main; public class CommonProxy { + public static final String DOMAIN = "magicbees"; public static final String TEXTURE = "textures/"; public static final String GUI_TEXTURE = TEXTURE + "gui/"; diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index eab767e..88fa5c3 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -1,14 +1,8 @@ package magicbees.main; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.api.apiculture.BeeManager; -import forestry.api.storage.BackpackManager; -import forestry.api.storage.EnumBackpackType; import java.io.File; import java.lang.reflect.Field; + import magicbees.block.BlockEffectJar; import magicbees.block.BlockEnchantedEarth; import magicbees.block.BlockHive; @@ -49,6 +43,7 @@ import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; import magicbees.tileentity.TileEntityManaAuraProvider; import magicbees.tileentity.TileEntityVisAuraProvider; + import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -59,12 +54,21 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.apiculture.BeeManager; +import forestry.api.storage.BackpackManager; +import forestry.api.storage.EnumBackpackType; + /** * A class to hold some data related to mod state & functions. * * @author MysteriousAges */ public class Config { + public static final String CATEGORY_GENERAL = "general"; public static final String CATEGORY_CLIENT = "client"; public static final String CATEGORY_DEBUG = "debug"; @@ -291,8 +295,7 @@ public class Config { capsuleStackSizeMax = p.getInt(); p = configuration.get(CATEGORY_GENERAL, "disableVersionNotification", false); - p.comment = - "Set to true to stop Magic Bees from notifying you when new updates are available. (Does not supress critical updates)"; + p.comment = "Set to true to stop Magic Bees from notifying you when new updates are available. (Does not supress critical updates)"; disableUpdateNotification = p.getBoolean(false); p = configuration.get(CATEGORY_GENERAL, "areMagicPlanksFlammable", false); @@ -334,8 +337,7 @@ public class Config { magnetBaseRange = (float) p.getDouble(3.0); p = configuration.get(CATEGORY_GENERAL, "magnetRangeMultiplier", 0.75); - p.comment = - "Range multiplier per level of the Mysterious Magnet. Total range = base range + level * multiplier"; + p.comment = "Range multiplier per level of the Mysterious Magnet. Total range = base range + level * multiplier"; magnetLevelMultiplier = (float) p.getDouble(0.75); p = configuration.get(CATEGORY_GENERAL, "magnetMaximumLevel", 8); @@ -343,8 +345,7 @@ public class Config { magnetMaxLevel = p.getInt(); p = configuration.get(CATEGORY_GENERAL, "aromaticLumpSwarmerRate", 95); - p.comment = - "Aromatic lump swarmer rate. Final value is X/1000. 0 will disable, values outside of [0,1000] will be clamped to range. Default: 95"; + p.comment = "Aromatic lump swarmer rate. Final value is X/1000. 0 will disable, values outside of [0,1000] will be clamped to range. Default: 95"; aromaticLumpSwarmerRate = p.getInt(); p = configuration.get(CATEGORY_CLIENT, "disableMagnetSound", false); @@ -397,8 +398,7 @@ public class Config { private void setupJellyBaby() { jellyBaby = new ItemFood(1, false).setAlwaysEdible().setPotionEffect(Potion.moveSpeed.id, 5, 1, 1f); - jellyBaby - .setUnlocalizedName(CommonProxy.DOMAIN + ":jellyBabies") + jellyBaby.setUnlocalizedName(CommonProxy.DOMAIN + ":jellyBabies") .setTextureName(CommonProxy.DOMAIN + ":jellyBabies"); GameRegistry.registerItem(jellyBaby, "jellyBabies"); } diff --git a/src/main/java/magicbees/main/MagicBees.java b/src/main/java/magicbees/main/MagicBees.java index c1e3af8..0f5770c 100644 --- a/src/main/java/magicbees/main/MagicBees.java +++ b/src/main/java/magicbees/main/MagicBees.java @@ -1,5 +1,13 @@ package magicbees.main; +import magicbees.bees.BeeManager; +import magicbees.client.gui.GUIHandler; +import magicbees.main.utils.CraftingManager; +import magicbees.main.utils.IMCManager; +import magicbees.main.utils.LogHelper; +import magicbees.main.utils.VersionInfo; +import magicbees.main.utils.compat.ModHelperManager; +import magicbees.main.utils.net.NetworkEventHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -10,14 +18,6 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; -import magicbees.bees.BeeManager; -import magicbees.client.gui.GUIHandler; -import magicbees.main.utils.CraftingManager; -import magicbees.main.utils.IMCManager; -import magicbees.main.utils.LogHelper; -import magicbees.main.utils.VersionInfo; -import magicbees.main.utils.compat.ModHelperManager; -import magicbees.main.utils.net.NetworkEventHandler; @Mod( modid = VersionInfo.ModName, diff --git a/src/main/java/magicbees/main/utils/BlockInterface.java b/src/main/java/magicbees/main/utils/BlockInterface.java index a1cc6e7..6bd9c5a 100644 --- a/src/main/java/magicbees/main/utils/BlockInterface.java +++ b/src/main/java/magicbees/main/utils/BlockInterface.java @@ -1,9 +1,11 @@ package magicbees.main.utils; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; +import cpw.mods.fml.common.registry.GameRegistry; + public class BlockInterface { + public static Block getBlock(String item) { return GameRegistry.findBlock("Forestry", item); } diff --git a/src/main/java/magicbees/main/utils/BlockUtil.java b/src/main/java/magicbees/main/utils/BlockUtil.java index d0c6b8c..a578d09 100644 --- a/src/main/java/magicbees/main/utils/BlockUtil.java +++ b/src/main/java/magicbees/main/utils/BlockUtil.java @@ -2,6 +2,7 @@ package magicbees.main.utils; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/magicbees/main/utils/ChunkCoords.java b/src/main/java/magicbees/main/utils/ChunkCoords.java index 07ece5b..af4ee6e 100644 --- a/src/main/java/magicbees/main/utils/ChunkCoords.java +++ b/src/main/java/magicbees/main/utils/ChunkCoords.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class ChunkCoords { + public final int dimension; public final int x; public final int y; diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index 44b254c..21effaf 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -1,9 +1,8 @@ package magicbees.main.utils; -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.api.recipes.RecipeManagers; import java.util.Hashtable; import java.util.Map; + import magicbees.item.ItemCapsule; import magicbees.item.types.CombType; import magicbees.item.types.DropType; @@ -18,6 +17,7 @@ import magicbees.main.utils.compat.ArsMagicaHelper; import magicbees.main.utils.compat.ForestryHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.ThermalModsHelper; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -27,6 +27,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.recipes.RecipeManagers; + public class CraftingManager { public static void registerLiquidContainers() { @@ -110,31 +113,33 @@ public class CraftingManager { 'f', Config.hiveFrameMagic); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Config.effectJar), - "GSG", - "QPQ", - "GGG", - 'G', - Blocks.glass, - 'S', - "slabWood", - 'P', - Config.pollen.getStackForType(PollenType.UNUSUAL), - 'Q', - Items.quartz)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(Config.effectJar), + "GSG", + "QPQ", + "GGG", + 'G', + Blocks.glass, + 'S', + "slabWood", + 'P', + Config.pollen.getStackForType(PollenType.UNUSUAL), + 'Q', + Items.quartz)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Config.moonDial), - "DqD", - "qrq", - "DqD", - 'r', - Items.redstone, - 'q', - Items.quartz, - 'D', - "dyeGreen")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(Config.moonDial), + "DqD", + "qrq", + "DqD", + 'r', + Items.redstone, + 'q', + Items.quartz, + 'D', + "dyeGreen")); GameRegistry.addRecipe( Config.miscResources.getStackForType(ResourceType.SKULL_FRAGMENT), @@ -168,28 +173,30 @@ public class CraftingManager { 'e', Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE)); - GameRegistry.addRecipe(new ShapedOreRecipe( - Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), - "gwg", - "wiw", - "gwg", - 'g', - Blocks.glass, - 'w', - "waxMagical", - 'i', - Blocks.iron_block)); - GameRegistry.addRecipe(new ShapedOreRecipe( - Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), - "wgw", - "gig", - "wgw", - 'g', - Blocks.glass, - 'w', - "waxMagical", - 'i', - Blocks.iron_block)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), + "gwg", + "wiw", + "gwg", + 'g', + Blocks.glass, + 'w', + "waxMagical", + 'i', + Blocks.iron_block)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), + "wgw", + "gig", + "wgw", + 'g', + Blocks.glass, + 'w', + "waxMagical", + 'i', + Blocks.iron_block)); GameRegistry.addRecipe( Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE), @@ -362,29 +369,53 @@ public class CraftingManager { if (OreDictionary.getOres("ingotCopper").size() <= 0) { NuggetType.COPPER.setInactive(); } else { - GameRegistry.addRecipe(new ShapedOreRecipe( - OreDictionary.getOres("ingotCopper").get(0), "xxx", "xxx", "xxx", 'x', "nuggetCopper")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + OreDictionary.getOres("ingotCopper").get(0), + "xxx", + "xxx", + "xxx", + 'x', + "nuggetCopper")); } if (OreDictionary.getOres("ingotTin").size() <= 0) { NuggetType.TIN.setInactive(); } else { - GameRegistry.addRecipe(new ShapedOreRecipe( - OreDictionary.getOres("ingotTin").get(0), "xxx", "xxx", "xxx", 'x', "nuggetTin")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + OreDictionary.getOres("ingotTin").get(0), + "xxx", + "xxx", + "xxx", + 'x', + "nuggetTin")); } if (OreDictionary.getOres("ingotSilver").size() <= 0) { NuggetType.SILVER.setInactive(); } else { - GameRegistry.addRecipe(new ShapedOreRecipe( - OreDictionary.getOres("ingotSilver").get(0), "xxx", "xxx", "xxx", 'x', "nuggetSilver")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + OreDictionary.getOres("ingotSilver").get(0), + "xxx", + "xxx", + "xxx", + 'x', + "nuggetSilver")); } if (OreDictionary.getOres("ingotLead").size() <= 0) { NuggetType.LEAD.setInactive(); } else { - GameRegistry.addRecipe(new ShapedOreRecipe( - OreDictionary.getOres("ingotLead").get(0), "xxx", "xxx", "xxx", 'x', "nuggetLead")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + OreDictionary.getOres("ingotLead").get(0), + "xxx", + "xxx", + "xxx", + 'x', + "nuggetLead")); } GameRegistry.addRecipe( @@ -396,13 +427,14 @@ public class CraftingManager { GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(Items.emerald), "xxx", "xxx", "xxx", 'x', "nuggetEmerald")); - GameRegistry.addRecipe(new ShapedOreRecipe( - ItemInterface.getItemStack("apatite"), - "xxx", - "xxx", - "xxx", - 'x', - Config.nuggets.getStackForType(NuggetType.APATITE))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + ItemInterface.getItemStack("apatite"), + "xxx", + "xxx", + "xxx", + 'x', + Config.nuggets.getStackForType(NuggetType.APATITE))); output = Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY); GameRegistry.addRecipe( @@ -450,25 +482,28 @@ public class CraftingManager { for (int level = 1; level <= 8; level++) { output = new ItemStack(Config.magnet, 1, level * 2); - GameRegistry.addRecipe(new ShapedOreRecipe( - output, - " d ", - "mSm", - " B ", - 'd', - Items.diamond, - 'm', - "mb.magnet.level" + (level - 1), - 'B', - Blocks.redstone_block, - 'S', - Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + output, + " d ", + "mSm", + " B ", + 'd', + Items.diamond, + 'm', + "mb.magnet.level" + (level - 1), + 'B', + Blocks.redstone_block, + 'S', + Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY))); } if (ThaumcraftHelper.isActive()) { input = Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT); output = new ItemStack( - ThaumcraftHelper.miscResource, 1, ThaumcraftHelper.MiscResource.KNOWLEDGE_FRAGMENT.ordinal()); + ThaumcraftHelper.miscResource, + 1, + ThaumcraftHelper.MiscResource.KNOWLEDGE_FRAGMENT.ordinal()); GameRegistry.addShapelessRecipe(output, input, input, input, input); if (Config.thaumaturgeBackpackActive) { @@ -679,8 +714,8 @@ public class CraftingManager { output = newMap(); output.put(Config.wax.getStackForType(WaxType.MAGIC), 0.55f); output.put(Config.drops.getStackForType(DropType.DESTABILIZED), 0.22f); - RecipeManagers.centrifugeManager.addRecipe( - 20, Config.combs.getStackForType(CombType.TE_DESTABILIZED), output); + RecipeManagers.centrifugeManager + .addRecipe(20, Config.combs.getStackForType(CombType.TE_DESTABILIZED), output); output = newMap(); output.put(Config.wax.getStackForType(WaxType.MAGIC), 0.55f); output.put(Config.drops.getStackForType(DropType.CARBON), 0.22f); @@ -718,7 +753,15 @@ public class CraftingManager { input = ItemInterface.getItemStack("craftingMaterial"); input.setItemDamage(ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()); // Set to Silk Wisp RecipeManagers.carpenterManager.addRecipe( - 30, new FluidStack(FluidRegistry.WATER, 600), null, output, "WSW", 'W', Config.wax, 'S', input); + 30, + new FluidStack(FluidRegistry.WATER, 600), + null, + output, + "WSW", + 'W', + Config.wax, + 'S', + input); output = Config.miscResources.getStackForType(ResourceType.AROMATIC_LUMP, 2); RecipeManagers.carpenterManager.addRecipe( @@ -799,9 +842,13 @@ public class CraftingManager { FluidContainerRegistry.registerFluidContainer(liquid, filled, empty); // Register with Squeezer/Bottler - // RecipeManagers.bottlerManager.addRecipe(5, liquid, empty, filled); Outdated? + // RecipeManagers.bottlerManager.addRecipe(5, liquid, empty, filled); Outdated? RecipeManagers.squeezerManager.addRecipe( - 10, new ItemStack[] {filled}, liquid, Config.wax.getStackForType(WaxType.MAGIC), 20); + 10, + new ItemStack[] { filled }, + liquid, + Config.wax.getStackForType(WaxType.MAGIC), + 20); fluidType.available = true; } } diff --git a/src/main/java/magicbees/main/utils/IMCManager.java b/src/main/java/magicbees/main/utils/IMCManager.java index 2f8ff81..47d3731 100644 --- a/src/main/java/magicbees/main/utils/IMCManager.java +++ b/src/main/java/magicbees/main/utils/IMCManager.java @@ -1,14 +1,17 @@ package magicbees.main.utils; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import magicbees.bees.allele.effect.AlleleEffectCrumbling; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; +import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; + public class IMCManager { + public static void handle(IMCEvent event) { for (IMCMessage message : event.getMessages()) { try { @@ -18,13 +21,15 @@ public class IMCManager { FMLLog.warning( "Magic Bees recieved an IMC Message from a mod %s " + "but does not support messages keyed with %s.", - message.getSender(), message.key); + message.getSender(), + message.key); } } catch (Exception e) { FMLLog.warning( "Magic Bees recieved an invalid IMC Message from a mod %s! Please inform " + "the author of %s that they may not be correctly implementing message for key '%s'. Error details follow.", - message.getSender(), message.key); + message.getSender(), + message.key); FMLLog.info(e.getMessage()); } } diff --git a/src/main/java/magicbees/main/utils/ItemInterface.java b/src/main/java/magicbees/main/utils/ItemInterface.java index 7fe6ce5..b2b6073 100644 --- a/src/main/java/magicbees/main/utils/ItemInterface.java +++ b/src/main/java/magicbees/main/utils/ItemInterface.java @@ -1,10 +1,12 @@ package magicbees.main.utils; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.registry.GameRegistry; + public class ItemInterface { + public static ItemStack getItemStack(String item) { return GameRegistry.findItemStack("Forestry", item, 1); } diff --git a/src/main/java/magicbees/main/utils/ItemStackUtils.java b/src/main/java/magicbees/main/utils/ItemStackUtils.java index 674d090..707a6a7 100644 --- a/src/main/java/magicbees/main/utils/ItemStackUtils.java +++ b/src/main/java/magicbees/main/utils/ItemStackUtils.java @@ -7,10 +7,11 @@ public class ItemStackUtils { /** * Attempts to add all items to the inventory, starting at startSlot and considering slotCount item slots. + * * @return Number of items successfully added to the inventory. */ - public static int tryAddItemStacksToInvenotry( - IInventory inventory, ItemStack[] items, int startSlot, int slotCount) { + public static int tryAddItemStacksToInvenotry(IInventory inventory, ItemStack[] items, int startSlot, + int slotCount) { int itemsAdded = 0; for (ItemStack item : items) { @@ -22,10 +23,11 @@ public class ItemStackUtils { /** * Attempts to add all items to the inventory, starting at startSlot and considering slotCount item slots. + * * @return true if and only if all items were successfully added to the inventory. */ - public static boolean tryAddAllItemStacksToInventory( - IInventory inventory, ItemStack[] items, int startSlot, int slotCount) { + public static boolean tryAddAllItemStacksToInventory(IInventory inventory, ItemStack[] items, int startSlot, + int slotCount) { int itemsToAdd = 0; int itemsAdded = 0; @@ -39,6 +41,7 @@ public class ItemStackUtils { /** * Attempts to add an item to an inventory, starting at startSlot and considering slotCount item slots. + * * @return number of items in the stack successfully added to the inventory. */ public static int addItemToInventory(IInventory inventory, ItemStack item, int startSlot, int slotCount) { diff --git a/src/main/java/magicbees/main/utils/LocalizationManager.java b/src/main/java/magicbees/main/utils/LocalizationManager.java index 113ba20..c876615 100644 --- a/src/main/java/magicbees/main/utils/LocalizationManager.java +++ b/src/main/java/magicbees/main/utils/LocalizationManager.java @@ -3,6 +3,7 @@ package magicbees.main.utils; import net.minecraft.util.StatCollector; public class LocalizationManager { + public static String getLocalizedString(String key) { if (StatCollector.canTranslate(key)) { return StatCollector.translateToLocal(key); diff --git a/src/main/java/magicbees/main/utils/LogHelper.java b/src/main/java/magicbees/main/utils/LogHelper.java index a9f5365..5f932c8 100644 --- a/src/main/java/magicbees/main/utils/LogHelper.java +++ b/src/main/java/magicbees/main/utils/LogHelper.java @@ -1,9 +1,11 @@ package magicbees.main.utils; -import cpw.mods.fml.common.FMLLog; import org.apache.logging.log4j.Level; +import cpw.mods.fml.common.FMLLog; + public class LogHelper { + public static void log(Level logLevel, Object object) { FMLLog.log(VersionInfo.ModName, logLevel, String.valueOf(object)); } diff --git a/src/main/java/magicbees/main/utils/MoonPhase.java b/src/main/java/magicbees/main/utils/MoonPhase.java index 9ef38eb..5892ca7 100644 --- a/src/main/java/magicbees/main/utils/MoonPhase.java +++ b/src/main/java/magicbees/main/utils/MoonPhase.java @@ -7,6 +7,7 @@ import net.minecraft.world.World; * Class to abstract the moon phase from the world time a bit. */ public enum MoonPhase { + FULL("full"), WANING_GIBBOUS("gibbousWaning"), WANING_HALF("halfWaning"), diff --git a/src/main/java/magicbees/main/utils/TabMagicBees.java b/src/main/java/magicbees/main/utils/TabMagicBees.java index 38cf924..1f1b262 100644 --- a/src/main/java/magicbees/main/utils/TabMagicBees.java +++ b/src/main/java/magicbees/main/utils/TabMagicBees.java @@ -2,10 +2,12 @@ package magicbees.main.utils; import magicbees.item.types.ResourceType; import magicbees.main.Config; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; public class TabMagicBees extends CreativeTabs { + public static TabMagicBees tabMagicBees = new TabMagicBees(); public TabMagicBees() { @@ -13,8 +15,6 @@ public class TabMagicBees extends CreativeTabs { } public Item getTabIconItem() { - return Config.miscResources - .getStackForType(ResourceType.RESEARCH_BEEINFUSION) - .getItem(); + return Config.miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION).getItem(); } } diff --git a/src/main/java/magicbees/main/utils/VersionInfo.java b/src/main/java/magicbees/main/utils/VersionInfo.java index a133c13..8b41142 100644 --- a/src/main/java/magicbees/main/utils/VersionInfo.java +++ b/src/main/java/magicbees/main/utils/VersionInfo.java @@ -6,10 +6,10 @@ package magicbees.main.utils; * @author MysteriousAges */ public class VersionInfo { + public static final String ModName = "MagicBees"; public static final String Version = "GRADLETOKEN_VERSION"; public static final String GUI_FACTORY_CLASS = "magicbees.client.gui.GuiFactory"; public static final String Logo = "/gfx/magicbees/logo.png"; - public static final String Depends = - "required-after:Forestry@[4.2.5,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2"; + public static final String Depends = "required-after:Forestry@[4.2.5,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2"; } diff --git a/src/main/java/magicbees/main/utils/compat/AppliedEnergisticsHelper.java b/src/main/java/magicbees/main/utils/compat/AppliedEnergisticsHelper.java index a0fb7ed..dec3b65 100644 --- a/src/main/java/magicbees/main/utils/compat/AppliedEnergisticsHelper.java +++ b/src/main/java/magicbees/main/utils/compat/AppliedEnergisticsHelper.java @@ -1,9 +1,11 @@ package magicbees.main.utils.compat; +import magicbees.main.Config; + +import net.minecraft.block.Block; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import magicbees.main.Config; -import net.minecraft.block.Block; public class AppliedEnergisticsHelper implements IModHelper { @@ -29,7 +31,8 @@ public class AppliedEnergisticsHelper implements IModHelper { } public void postInit() { - /*if (isActive()) { - }*/ + /* + * if (isActive()) { } + */ } } diff --git a/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java b/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java index deaa93f..b62bc14 100644 --- a/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java @@ -1,12 +1,14 @@ package magicbees.main.utils.compat; -import cpw.mods.fml.common.Loader; import magicbees.main.Config; import magicbees.main.utils.BlockInterface; import magicbees.main.utils.ItemInterface; + import net.minecraft.block.Block; import net.minecraft.item.Item; +import cpw.mods.fml.common.Loader; + public class ArsMagicaHelper implements IModHelper { public static Block resourceBlock; diff --git a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java index bfc8bb5..d018b5e 100644 --- a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java @@ -1,15 +1,12 @@ package magicbees.main.utils.compat; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.bees.BeeManager; import magicbees.item.types.PollenType; import magicbees.main.Config; import magicbees.main.utils.BlockInterface; import magicbees.main.utils.ItemInterface; import magicbees.main.utils.compat.botania.BotaniaAPIDistanceHelper; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -21,7 +18,12 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; + import vazkii.botania.api.mana.ManaItemHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BotaniaHelper implements IModHelper { @@ -61,8 +63,7 @@ public class BotaniaHelper implements IModHelper { public enum PastureSeed { GRASS, PODZOL, - MYCELIUM, - ; + MYCELIUM,; } public enum Rune { @@ -81,8 +82,7 @@ public class BotaniaHelper implements IModHelper { SLOTH, WRATH, ENVY, - PRIDE, - ; + PRIDE,; } public static Block blockMysticalFlower; @@ -136,49 +136,28 @@ public class BotaniaHelper implements IModHelper { // Hiveacynth would appreciate it if this list existed. BeeManager.populateSpeciesListRarity(); - GameRegistry.addRecipe(new ItemStack(Config.manasteelScoop), new Object[] { - "twt", - "tmt", - " t ", - 'm', - new ItemStack(itemManaResource, 1, ManaResource.MANASTEEL.ordinal()), - 'w', - Blocks.wool, - 't', - Items.stick - }); - manasteelScoopRecipe = (IRecipe) CraftingManager.getInstance() - .getRecipeList() + GameRegistry.addRecipe( + new ItemStack(Config.manasteelScoop), + new Object[] { "twt", "tmt", " t ", 'm', + new ItemStack(itemManaResource, 1, ManaResource.MANASTEEL.ordinal()), 'w', Blocks.wool, 't', + Items.stick }); + manasteelScoopRecipe = (IRecipe) CraftingManager.getInstance().getRecipeList() .get(CraftingManager.getInstance().getRecipeList().size() - 1); - GameRegistry.addRecipe(new ItemStack(Config.manasteelGrafter), new Object[] { - " m", - " t ", - "t ", - 'm', - new ItemStack(itemManaResource, 1, ManaResource.MANASTEEL.ordinal()), - 't', - Items.stick - }); - manasteelGrafterRecipe = (IRecipe) CraftingManager.getInstance() - .getRecipeList() + GameRegistry.addRecipe( + new ItemStack(Config.manasteelGrafter), + new Object[] { " m", " t ", "t ", 'm', + new ItemStack(itemManaResource, 1, ManaResource.MANASTEEL.ordinal()), 't', Items.stick }); + manasteelGrafterRecipe = (IRecipe) CraftingManager.getInstance().getRecipeList() .get(CraftingManager.getInstance().getRecipeList().size() - 1); - GameRegistry.addRecipe(new ItemStack(Config.manaAuraProvider), new Object[] { - "lsl", - "pmp", - "sss", - 's', - blockLivingRock, - 'm', - new ItemStack(itemManaResource, 1, ManaResource.MANASTEEL.ordinal()), - 'p', - Config.pollen.getStackForType(PollenType.UNUSUAL), - 'l', - new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.MANA_POWDER.ordinal()) - }); - manaBoosterRecipe = (IRecipe) CraftingManager.getInstance() - .getRecipeList() + GameRegistry.addRecipe( + new ItemStack(Config.manaAuraProvider), + new Object[] { "lsl", "pmp", "sss", 's', blockLivingRock, 'm', + new ItemStack(itemManaResource, 1, ManaResource.MANASTEEL.ordinal()), 'p', + Config.pollen.getStackForType(PollenType.UNUSUAL), 'l', + new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.MANA_POWDER.ordinal()) }); + manaBoosterRecipe = (IRecipe) CraftingManager.getInstance().getRecipeList() .get(CraftingManager.getInstance().getRecipeList().size() - 1); BotaniaAPIDistanceHelper.setupCraftingAndLexicon(); @@ -217,28 +196,23 @@ public class BotaniaHelper implements IModHelper { hiveacynthManaMultiplier = p.getDouble(); p = configuration.get(Config.CATEGORY_BOTANIA, "hiveacynthRainResistRate", 0.1); - p.comment = - "Rate at which the Hiveacynth applies rain resist to spawned bees. Default: 0.1 Setting to 0 will disable."; + p.comment = "Rate at which the Hiveacynth applies rain resist to spawned bees. Default: 0.1 Setting to 0 will disable."; hiveacynthRainResistRate = p.getDouble(); p = configuration.get(Config.CATEGORY_BOTANIA, "hiveacynthPrincessSpawnRate", 0.09); - p.comment = - "Rate at which the Hiveacynth will spawn a Princess instead of a Drone. Default: 0.09. Setting to 0 will disable."; + p.comment = "Rate at which the Hiveacynth will spawn a Princess instead of a Drone. Default: 0.09. Setting to 0 will disable."; hiveacynthPrincessSpawnRate = p.getDouble(); p = configuration.get(Config.CATEGORY_BOTANIA, "hiveacynthPristineRate", 0.15); - p.comment = - "Rate at which the Hiveacynth will produce a Pristine Princess, when it produces a princess. Default: 0.15. Setting to 0 will disable, setting to 1 will make every Princess produced pristine.."; + p.comment = "Rate at which the Hiveacynth will produce a Pristine Princess, when it produces a princess. Default: 0.15. Setting to 0 will disable, setting to 1 will make every Princess produced pristine.."; hiveacynthPristineRate = p.getDouble(); p = configuration.get(Config.CATEGORY_BOTANIA, "hibeescusManaCostMultiplier", 1.0); - p.comment = - "Multiplier on Hibeescus mana cost, base 10,000. Default 1.0. Setting to 0 makes you a huge cheater. <3"; + p.comment = "Multiplier on Hibeescus mana cost, base 10,000. Default 1.0. Setting to 0 makes you a huge cheater. <3"; hibeescusManaCostMultiplier = p.getDouble(); p = configuration.get(Config.CATEGORY_BOTANIA, "hibeescusTicksMultiplier", 1.0); - p.comment = - "Multiplier for Hibeescus operation tick time. Multiplied against 1.5 Minecraft days with some extra randomness. Default: 1.0. Setting to 0 makes you a huge cheater. <3"; + p.comment = "Multiplier for Hibeescus operation tick time. Multiplied against 1.5 Minecraft days with some extra randomness. Default: 1.0. Setting to 0 makes you a huge cheater. <3"; hibeescusTicksMultiplier = p.getDouble(); } diff --git a/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java b/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java index 30dc847..1971097 100644 --- a/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java +++ b/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java @@ -1,10 +1,12 @@ package magicbees.main.utils.compat; -import cpw.mods.fml.common.Loader; import magicbees.main.Config; import magicbees.main.utils.ItemInterface; + import net.minecraft.item.Item; +import cpw.mods.fml.common.Loader; + public class EquivalentExchangeHelper implements IModHelper { public static Item minuimShard; diff --git a/src/main/java/magicbees/main/utils/compat/ExtraBeesHelper.java b/src/main/java/magicbees/main/utils/compat/ExtraBeesHelper.java index 2e45183..bc2af47 100644 --- a/src/main/java/magicbees/main/utils/compat/ExtraBeesHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ExtraBeesHelper.java @@ -1,10 +1,12 @@ package magicbees.main.utils.compat; -import cpw.mods.fml.common.Loader; import magicbees.main.Config; import magicbees.main.utils.BlockInterface; + import net.minecraft.block.Block; +import cpw.mods.fml.common.Loader; + public class ExtraBeesHelper implements IModHelper { public enum CombType { @@ -88,8 +90,7 @@ public class ExtraBeesHelper implements IModHelper { PULP, MULCH, COMPOST, - SAWDUST, - ; + SAWDUST,; } public static Block hiveBlock; diff --git a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java index c6adc13..173fee9 100644 --- a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java @@ -1,31 +1,33 @@ package magicbees.main.utils.compat; +import java.util.Locale; + +import magicbees.bees.BeeManager; +import magicbees.bees.HiveDescription; +import magicbees.main.Config; +import magicbees.main.utils.BlockInterface; +import magicbees.main.utils.ItemInterface; +import magicbees.main.utils.VersionInfo; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.hives.HiveManager; import forestry.api.apiculture.hives.IHiveRegistry; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; -import java.util.Locale; -import magicbees.bees.BeeManager; -import magicbees.bees.HiveDescription; -import magicbees.main.Config; -import magicbees.main.utils.BlockInterface; -import magicbees.main.utils.ItemInterface; -import magicbees.main.utils.VersionInfo; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; public class ForestryHelper implements IModHelper { public enum BlockResource { APATITE, COPPER, - TIN, - ; + TIN,; } public enum CraftingMaterial { @@ -35,8 +37,7 @@ public class ForestryHelper implements IModHelper { WOVEN_SILK, DISSIPATION_CHARGE, ICE_SHARD, - SCENTED_PANELING, - ; + SCENTED_PANELING,; } public enum Comb { @@ -55,30 +56,26 @@ public class ForestryHelper implements IModHelper { DARKENED, OMEGA, WHEATEN, - MOSSY, - ; + MOSSY,; } public enum Propolis { NORMAL, STICKY, // Unused. PULSATING, - SILKY, - ; + SILKY,; } public enum Pollen { NORMAL, - CRYSTALLINE, - ; + CRYSTALLINE,; } public enum CircuitBoard { BASIC, ENHANCED, REFINED, - INTRICATE, - ; + INTRICATE,; } public enum Tube { @@ -93,13 +90,11 @@ public class ForestryHelper implements IModHelper { RUBBER, EMERALD, APATITE, - LAPIS, - ; + LAPIS,; } public enum ApicultureBlock { - APIARY, - ; + APIARY,; } public static final String Name = "Forestry"; diff --git a/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java b/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java index 15ec83c..754dfea 100644 --- a/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java +++ b/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java @@ -1,19 +1,20 @@ package magicbees.main.utils.compat; -import cpw.mods.fml.common.Loader; import magicbees.main.Config; import magicbees.main.utils.ItemInterface; + import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.Loader; + public class RedstoneArsenalHelper implements IModHelper { + public enum MiscResource { - FLUXED_ELECTRUMBLOCK, - ; + FLUXED_ELECTRUMBLOCK,; } public enum NuggetType { - ELECTRUMFLUX, - ; + ELECTRUMFLUX,; } public static ItemStack fluxBlock; diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index a80bf2a..9560364 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -1,8 +1,7 @@ package magicbees.main.utils.compat; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.ArrayList; + import magicbees.api.MagicBeesAPI; import magicbees.item.types.PollenType; import magicbees.item.types.PropolisType; @@ -13,6 +12,7 @@ import magicbees.main.Config; import magicbees.main.utils.BlockInterface; import magicbees.main.utils.ItemInterface; import magicbees.main.utils.LocalizationManager; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -22,6 +22,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -31,6 +32,8 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; public class ThaumcraftHelper implements IModHelper { @@ -53,8 +56,7 @@ public class ThaumcraftHelper implements IModHelper { CHARM, VOID_INGOT, VOID_SEED, - COIN, - ; + COIN,; } public enum NuggetType { @@ -89,8 +91,7 @@ public class ThaumcraftHelper implements IModHelper { _28, _29, _30, - NATIVE_GOLD, - ; + NATIVE_GOLD,; } public enum ShardType { @@ -100,8 +101,7 @@ public class ThaumcraftHelper implements IModHelper { EARTH, ORDER, CHAOS, - BALANCED, - ; + BALANCED,; } public enum MetalDeviceType { @@ -119,8 +119,7 @@ public class ThaumcraftHelper implements IModHelper { _11, MNEMONIC_MATRIX, LAMP_OF_FERTILITY, - VIS_RELAY, - ; + VIS_RELAY,; } public enum WoodenDeviceType { @@ -132,8 +131,7 @@ public class ThaumcraftHelper implements IModHelper { BORE, PLANKS_GREATWOOD, PLANKS_SILVERWOOD, - BANNER, - ; + BANNER,; } public enum AiryBlockType { @@ -142,16 +140,15 @@ public class ThaumcraftHelper implements IModHelper { _2, _3, WARDING_STONE_FENCE, - ENERGIZED_NODE, - ; + ENERGIZED_NODE,; } public enum Entity { + BRAINY_ZOMBIE("entBrainyZombie", "EntityBrainyZombie"), GIANT_BRAINY_ZOMBIE("entGiantBrainyZombie", "EntityGiantBrainyZombie"), WISP("entWisp", "EntityWisp"), - FIREBAT("entFirebat", "EntityFireBat"), - ; + FIREBAT("entFirebat", "EntityFireBat"),; private static String packageName = "thaumcraft.common.entities.monster."; @@ -174,14 +171,12 @@ public class ThaumcraftHelper implements IModHelper { SHIMMERLEAF, CINDERPEARL, PURIFYING_PLANT, - VISHROOM, - ; + VISHROOM,; } public enum TreeType { GREATWOOD, - SILVERWOOD, - ; + SILVERWOOD,; } public static Block plant; @@ -223,7 +218,7 @@ public class ThaumcraftHelper implements IModHelper { aspectTime = new Aspect( "tempus", 0xB68CFF, - new Aspect[] {Aspect.VOID, Aspect.ORDER}, + new Aspect[] { Aspect.VOID, Aspect.ORDER }, new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.TEXTURE + "aspects/tempus.png"), 1); MagicBeesAPI.thaumcraftAspectTempus = aspectTime; @@ -332,67 +327,35 @@ public class ThaumcraftHelper implements IModHelper { GameRegistry.addShapelessRecipe(output, input, input, input, input); thaumScoop = ThaumcraftApi.addArcaneCraftingRecipe( - "MB_Scoop", new ItemStack(Config.thaumiumScoop), new AspectList().add(Aspect.ORDER, 2), new Object[] { - "sWs", - "sTs", - " T ", - 's', - Items.stick, - 'W', - Blocks.wool, - 'T', - new ItemStack(miscResource, 1, MiscResource.THAUMIUM.ordinal()) - }); + "MB_Scoop", + new ItemStack(Config.thaumiumScoop), + new AspectList().add(Aspect.ORDER, 2), + new Object[] { "sWs", "sTs", " T ", 's', Items.stick, 'W', Blocks.wool, 'T', + new ItemStack(miscResource, 1, MiscResource.THAUMIUM.ordinal()) }); thaumGrafter = ThaumcraftApi.addArcaneCraftingRecipe( "MB_Grafter", new ItemStack(Config.thaumiumGrafter), new AspectList().add(Aspect.ORDER, 5), - new Object[] { - " T", - " s ", - "s ", - 's', - Items.stick, - 'T', - new ItemStack(miscResource, 1, MiscResource.THAUMIUM.ordinal()) - }); + new Object[] { " T", " s ", "s ", 's', Items.stick, 'T', + new ItemStack(miscResource, 1, MiscResource.THAUMIUM.ordinal()) }); frameMagic = ThaumcraftApi.addArcaneCraftingRecipe( "MB_FrameMagic", new ItemStack(Config.hiveFrameMagic), new AspectList().add(Aspect.ORDER, 5).add(Aspect.AIR, 2).add(Aspect.EARTH, 2), - new Object[] { - "sss", - "sCs", - "sss", - 's', - Items.stick, - 'C', - new ItemStack(miscResource, 1, MiscResource.ENCHANTED_FABRIC.ordinal()) - }); + new Object[] { "sss", "sCs", "sss", 's', Items.stick, 'C', + new ItemStack(miscResource, 1, MiscResource.ENCHANTED_FABRIC.ordinal()) }); visAuraProvider = ThaumcraftApi.addArcaneCraftingRecipe( "MB_VisAuraProvider", new ItemStack(Config.visAuraProvider), - new AspectList() - .add(Aspect.ORDER, 60) - .add(Aspect.AIR, 60) - .add(Aspect.ENTROPY, 60) + new AspectList().add(Aspect.ORDER, 60).add(Aspect.AIR, 60).add(Aspect.ENTROPY, 60) .add(Aspect.WATER, 60), - new Object[] { - "ngn", - "gvg", - "npn", - 'n', - Items.gold_nugget, - 'g', - new ItemStack(wooden, 1, WoodenDeviceType.PLANKS_GREATWOOD.ordinal()), - 'v', - new ItemStack(metal, 1, MetalDeviceType.VIS_RELAY.ordinal()), - 'p', - Config.pollen.getStackForType(PollenType.UNUSUAL) - }); + new Object[] { "ngn", "gvg", "npn", 'n', Items.gold_nugget, 'g', + new ItemStack(wooden, 1, WoodenDeviceType.PLANKS_GREATWOOD.ordinal()), 'v', + new ItemStack(metal, 1, MetalDeviceType.VIS_RELAY.ordinal()), 'p', + Config.pollen.getStackForType(PollenType.UNUSUAL) }); essenceLife = ThaumcraftApi.addCrucibleRecipe( "MB_EssenceLife", @@ -438,54 +401,37 @@ public class ThaumcraftHelper implements IModHelper { 5, new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20), new ItemStack(Blocks.gold_block), - new ItemStack[] {input, input}); + new ItemStack[] { input, input }); ItemStack in2 = new ItemStack(Items.diamond); singularityB = ThaumcraftApi.addInfusionCraftingRecipe( "MB_DimensionalSingularity", Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 3), 6, - new AspectList() - .add(Aspect.ELDRITCH, 10) - .add(Aspect.EXCHANGE, 20) - .add(Aspect.VOID, 15), + new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20).add(Aspect.VOID, 15), Config.propolis.getStackForType(PropolisType.UNSTABLE), - new ItemStack[] {input, input, in2}); + new ItemStack[] { input, input, in2 }); essenceOblivion = ThaumcraftApi.addShapelessArcaneCraftingRecipe( "MB_EssenceOblivion", Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.AIR, 40).add(Aspect.ORDER, 15), - new Object[] { - Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY), Blocks.dragon_egg, - }); + new Object[] { Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY), + Blocks.dragon_egg, }); voidScoop = ThaumcraftApi.addArcaneCraftingRecipe( - "MB_ScoopVoid", new ItemStack(Config.voidScoop), new AspectList().add(Aspect.ORDER, 2), new Object[] { - "sWs", - "sTs", - " T ", - 's', - Items.stick, - 'W', - Blocks.wool, - 'T', - new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) - }); + "MB_ScoopVoid", + new ItemStack(Config.voidScoop), + new AspectList().add(Aspect.ORDER, 2), + new Object[] { "sWs", "sTs", " T ", 's', Items.stick, 'W', Blocks.wool, 'T', + new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) }); voidGrafter = ThaumcraftApi.addArcaneCraftingRecipe( "MB_GrafterVoid", new ItemStack(Config.voidGrafter), new AspectList().add(Aspect.ORDER, 5), - new Object[] { - " T", - " s ", - "s ", - 's', - Items.stick, - 'T', - new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) - }); + new Object[] { " T", " s ", "s ", 's', Items.stick, 'T', + new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) }); } private static void setupResearch() { @@ -500,18 +446,15 @@ public class ThaumcraftHelper implements IModHelper { new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")); new ResearchItem( - "MB_Root", - category, - new AspectList(), - 0, - 0, - 0, - Config.miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION)) - .setRound() - .setStub() - .setAutoUnlock() - .setPages(getResearchPage("MB_Root.1"), getResearchPage("MB_Root.2")) - .registerResearchItem(); + "MB_Root", + category, + new AspectList(), + 0, + 0, + 0, + Config.miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION)).setRound().setStub() + .setAutoUnlock().setPages(getResearchPage("MB_Root.1"), getResearchPage("MB_Root.2")) + .registerResearchItem(); list = new ArrayList(4); list.add(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)); @@ -521,92 +464,74 @@ public class ThaumcraftHelper implements IModHelper { recipe = new ShapelessRecipes(new ItemStack(miscResource, 1, MiscResource.KNOWLEDGE_FRAGMENT.ordinal()), list); new ResearchItem( - "MB_LoreFragment", - category, - new AspectList(), - 0, - -3, - 1, - Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)) - .setPages(getResearchPage("MB_LoreFragment.1"), new ResearchPage(recipe)) - .setParents("MB_Root") - .setStub() - .setAutoUnlock() - .setRound() - .registerResearchItem(); + "MB_LoreFragment", + category, + new AspectList(), + 0, + -3, + 1, + Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)) + .setPages(getResearchPage("MB_LoreFragment.1"), new ResearchPage(recipe)).setParents("MB_Root") + .setStub().setAutoUnlock().setRound().registerResearchItem(); new ResearchItem( - "MB_Scoop", - category, - new AspectList() - .add(Aspect.TOOL, 1) - .add(Aspect.MAGIC, 1) - .add(Aspect.AIR, 1), - -2, - -3, - 1, - new ItemStack(Config.thaumiumScoop)) - .setPages(getResearchPage("MB_Scoop.1"), new ResearchPage((IArcaneRecipe) thaumScoop)) - .setParentsHidden("THAUMIUM") - .registerResearchItem(); + "MB_Scoop", + category, + new AspectList().add(Aspect.TOOL, 1).add(Aspect.MAGIC, 1).add(Aspect.AIR, 1), + -2, + -3, + 1, + new ItemStack(Config.thaumiumScoop)) + .setPages(getResearchPage("MB_Scoop.1"), new ResearchPage((IArcaneRecipe) thaumScoop)) + .setParentsHidden("THAUMIUM").registerResearchItem(); new ResearchItem( - "MB_Grafter", - category, - new AspectList().add(Aspect.TOOL, 1).add(Aspect.TREE, 1).add(Aspect.GREED, 1), - -2, - -1, - 2, - new ItemStack(Config.thaumiumGrafter)) - .setPages(getResearchPage("MB_Grafter.1"), new ResearchPage((IArcaneRecipe) thaumGrafter)) - .setParents("MB_Scoop") - .registerResearchItem(); + "MB_Grafter", + category, + new AspectList().add(Aspect.TOOL, 1).add(Aspect.TREE, 1).add(Aspect.GREED, 1), + -2, + -1, + 2, + new ItemStack(Config.thaumiumGrafter)) + .setPages(getResearchPage("MB_Grafter.1"), new ResearchPage((IArcaneRecipe) thaumGrafter)) + .setParents("MB_Scoop").registerResearchItem(); // Void tool insert new ResearchItem( - "MB_ScoopVoid", - category, - new AspectList() - .add(Aspect.TOOL, 1) - .add(Aspect.ELDRITCH, 1) - .add(Aspect.AIR, 1), - -4, - -4, - 1, - new ItemStack(Config.voidScoop)) - .setPages(getResearchPage("MB_ScoopVoid.1"), new ResearchPage((IArcaneRecipe) voidScoop)) - .setParents("MB_Scoop") - .setParentsHidden("VOIDMETAL") - .setSecondary() - .setConcealed() - .registerResearchItem(); + "MB_ScoopVoid", + category, + new AspectList().add(Aspect.TOOL, 1).add(Aspect.ELDRITCH, 1).add(Aspect.AIR, 1), + -4, + -4, + 1, + new ItemStack(Config.voidScoop)) + .setPages(getResearchPage("MB_ScoopVoid.1"), new ResearchPage((IArcaneRecipe) voidScoop)) + .setParents("MB_Scoop").setParentsHidden("VOIDMETAL").setSecondary().setConcealed() + .registerResearchItem(); new ResearchItem( - "MB_GrafterVoid", - category, - new AspectList().add(Aspect.TOOL, 1).add(Aspect.TREE, 1).add(Aspect.ELDRITCH, 1), - -4, - -2, - 2, - new ItemStack(Config.voidGrafter)) - .setPages(getResearchPage("MB_GrafterVoid.1"), new ResearchPage((IArcaneRecipe) voidGrafter)) - .setParents("MB_Grafter") - .setParentsHidden("VOIDMETAL") - .setSecondary() - .setConcealed() - .registerResearchItem(); + "MB_GrafterVoid", + category, + new AspectList().add(Aspect.TOOL, 1).add(Aspect.TREE, 1).add(Aspect.ELDRITCH, 1), + -4, + -2, + 2, + new ItemStack(Config.voidGrafter)) + .setPages(getResearchPage("MB_GrafterVoid.1"), new ResearchPage((IArcaneRecipe) voidGrafter)) + .setParents("MB_Grafter").setParentsHidden("VOIDMETAL").setSecondary().setConcealed() + .registerResearchItem(); // new ResearchItem( - "MB_FrameMagic", - category, - new AspectList().add(Aspect.TOOL, 1).add(Aspect.ARMOR, 1), - -2, - 1, - 1, - new ItemStack(Config.hiveFrameMagic)) - .setPages(getResearchPage("MB_FrameMagic"), new ResearchPage((IArcaneRecipe) frameMagic)) - .registerResearchItem(); + "MB_FrameMagic", + category, + new AspectList().add(Aspect.TOOL, 1).add(Aspect.ARMOR, 1), + -2, + 1, + 1, + new ItemStack(Config.hiveFrameMagic)) + .setPages(getResearchPage("MB_FrameMagic"), new ResearchPage((IArcaneRecipe) frameMagic)) + .registerResearchItem(); input = new ItemStack(Config.hiveFrameMagic); list = new ArrayList(2); @@ -615,19 +540,18 @@ public class ThaumcraftHelper implements IModHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameGentle), list); new ResearchItem( - "MB_EssenceLife", - category, - new AspectList().add(Aspect.LIFE, 1).add(Aspect.MAGIC, 1), - 2, - -1, - 1, - Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE)) - .setPages( - getResearchPage("MB_EssenceLife.1"), - new ResearchPage((CrucibleRecipe) essenceLife), - new ResearchPage(recipe)) - .setParentsHidden("CRUCIBLE") - .registerResearchItem(); + "MB_EssenceLife", + category, + new AspectList().add(Aspect.LIFE, 1).add(Aspect.MAGIC, 1), + 2, + -1, + 1, + Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE)) + .setPages( + getResearchPage("MB_EssenceLife.1"), + new ResearchPage((CrucibleRecipe) essenceLife), + new ResearchPage(recipe)) + .setParentsHidden("CRUCIBLE").registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY)); @@ -635,19 +559,18 @@ public class ThaumcraftHelper implements IModHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameResilient), list); new ResearchItem( - "MB_EssenceArmor", - category, - new AspectList().add(Aspect.ARMOR, 1).add(Aspect.MAGIC, 1), - 5, - 0, - 2, - Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY)) - .setPages( - getResearchPage("MB_EssenceArmor.1"), - new ResearchPage((CrucibleRecipe) essenceArmor), - new ResearchPage(recipe)) - .setParents("MB_EssenceLife") - .registerResearchItem(); + "MB_EssenceArmor", + category, + new AspectList().add(Aspect.ARMOR, 1).add(Aspect.MAGIC, 1), + 5, + 0, + 2, + Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY)) + .setPages( + getResearchPage("MB_EssenceArmor.1"), + new ResearchPage((CrucibleRecipe) essenceArmor), + new ResearchPage(recipe)) + .setParents("MB_EssenceLife").registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE)); @@ -655,21 +578,19 @@ public class ThaumcraftHelper implements IModHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameMetabolic), list); new ResearchItem( - "MB_EssenceUnstable", - category, - new AspectList().add(Aspect.ENTROPY, 1).add(Aspect.ORDER, 1), - 3, - 1, - 2, - Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE)) - .setPages( - getResearchPage("MB_EssenceUnstable.1"), - new ResearchPage((CrucibleRecipe) essenceUnstableA), - new ResearchPage((CrucibleRecipe) essenceUnstableB), - new ResearchPage(recipe)) - .setParents("MB_EssenceLife") - .setConcealed() - .registerResearchItem(); + "MB_EssenceUnstable", + category, + new AspectList().add(Aspect.ENTROPY, 1).add(Aspect.ORDER, 1), + 3, + 1, + 2, + Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE)) + .setPages( + getResearchPage("MB_EssenceUnstable.1"), + new ResearchPage((CrucibleRecipe) essenceUnstableA), + new ResearchPage((CrucibleRecipe) essenceUnstableB), + new ResearchPage(recipe)) + .setParents("MB_EssenceLife").setConcealed().registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)); @@ -677,20 +598,18 @@ public class ThaumcraftHelper implements IModHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameNecrotic), list); new ResearchItem( - "MB_EssenceDeath", - category, - new AspectList().add(Aspect.DEATH, 1).add(Aspect.MAGIC, 1), - 2, - 3, - 1, - Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)) - .setPages( - getResearchPage("MB_EssenceDeath.1"), - new ResearchPage((CrucibleRecipe) essenceDeath), - new ResearchPage(recipe)) - .setParents("MB_EssenceUnstable") - .setConcealed() - .registerResearchItem(); + "MB_EssenceDeath", + category, + new AspectList().add(Aspect.DEATH, 1).add(Aspect.MAGIC, 1), + 2, + 3, + 1, + Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)) + .setPages( + getResearchPage("MB_EssenceDeath.1"), + new ResearchPage((CrucibleRecipe) essenceDeath), + new ResearchPage(recipe)) + .setParents("MB_EssenceUnstable").setConcealed().registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME)); @@ -698,40 +617,33 @@ public class ThaumcraftHelper implements IModHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameTemporal), list); new ResearchItem( - "MB_EssenceTime", - category, - new AspectList().add((Aspect) aspectTime, 1).add(Aspect.MAGIC, 1), - 0, - 2, - 2, - Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME)) - .setPages( - getResearchPage("MB_EssenceTime.1"), - new ResearchPage((CrucibleRecipe) essenceTime), - new ResearchPage(recipe)) - .setParents("MB_EssenceUnstable") - .setConcealed() - .registerResearchItem(); + "MB_EssenceTime", + category, + new AspectList().add((Aspect) aspectTime, 1).add(Aspect.MAGIC, 1), + 0, + 2, + 2, + Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME)) + .setPages( + getResearchPage("MB_EssenceTime.1"), + new ResearchPage((CrucibleRecipe) essenceTime), + new ResearchPage(recipe)) + .setParents("MB_EssenceUnstable").setConcealed().registerResearchItem(); new ResearchItem( - "MB_DimensionalSingularity", - category, - new AspectList() - .add(Aspect.ELDRITCH, 1) - .add((Aspect) aspectTime, 1) - .add(Aspect.VOID, 1), - -1, - 4, - 3, - Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY)) - .setPages( - getResearchPage("MB_DimensionalSingularity.1"), - new ResearchPage((InfusionRecipe) singularityA), - new ResearchPage((InfusionRecipe) singularityB)) - .setParents("MB_FrameMagic", "MB_EssenceTime", "MB_EssenceDeath") - .setConcealed() - .setSpecial() - .registerResearchItem(); + "MB_DimensionalSingularity", + category, + new AspectList().add(Aspect.ELDRITCH, 1).add((Aspect) aspectTime, 1).add(Aspect.VOID, 1), + -1, + 4, + 3, + Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY)) + .setPages( + getResearchPage("MB_DimensionalSingularity.1"), + new ResearchPage((InfusionRecipe) singularityA), + new ResearchPage((InfusionRecipe) singularityB)) + .setParents("MB_FrameMagic", "MB_EssenceTime", "MB_EssenceDeath").setConcealed().setSpecial() + .registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION)); @@ -739,38 +651,31 @@ public class ThaumcraftHelper implements IModHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameOblivion), list); new ResearchItem( - "MB_EssenceOblivion", - category, - new AspectList() - .add(Aspect.VOID, 1) - .add(Aspect.HUNGER, 1) - .add((Aspect) aspectTime, 1), - -3, - 3, - 3, - Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION)) - .setPages( - getResearchPage("MB_EssenceOblivion.1"), - new ResearchPage((IArcaneRecipe) essenceOblivion), - new ResearchPage(recipe)) - .setParents("MB_DimensionalSingularity") - .setConcealed() - .registerResearchItem(); + "MB_EssenceOblivion", + category, + new AspectList().add(Aspect.VOID, 1).add(Aspect.HUNGER, 1).add((Aspect) aspectTime, 1), + -3, + 3, + 3, + Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION)) + .setPages( + getResearchPage("MB_EssenceOblivion.1"), + new ResearchPage((IArcaneRecipe) essenceOblivion), + new ResearchPage(recipe)) + .setParents("MB_DimensionalSingularity").setConcealed().registerResearchItem(); new ResearchItem( - "MB_VisAuraProvider", - category, - new AspectList() - .add(Aspect.MAGIC, 1) - .add(Aspect.ENERGY, 1) - .add(Aspect.AURA, 1), - -5, - 5, - 3, - new ItemStack(Config.visAuraProvider)) - .setPages(getResearchPage("MB_VisAuraProvider.1"), new ResearchPage((IArcaneRecipe) visAuraProvider)) - .setParentsHidden("VISPOWER") - .registerResearchItem(); + "MB_VisAuraProvider", + category, + new AspectList().add(Aspect.MAGIC, 1).add(Aspect.ENERGY, 1).add(Aspect.AURA, 1), + -5, + 5, + 3, + new ItemStack(Config.visAuraProvider)) + .setPages( + getResearchPage("MB_VisAuraProvider.1"), + new ResearchPage((IArcaneRecipe) visAuraProvider)) + .setParentsHidden("VISPOWER").registerResearchItem(); } private static ResearchPage getResearchPage(String ident) { @@ -782,7 +687,8 @@ public class ThaumcraftHelper implements IModHelper { AspectList list; ThaumcraftApi.registerObjectTag( - new ItemStack(Items.clock), new AspectList(new ItemStack(Items.clock)).add((Aspect) aspectTime, 4)); + new ItemStack(Items.clock), + new AspectList(new ItemStack(Items.clock)).add((Aspect) aspectTime, 4)); ThaumcraftApi.registerObjectTag( new ItemStack(Items.repeater), new AspectList(new ItemStack(Items.repeater)).add((Aspect) aspectTime, 2)); @@ -812,11 +718,11 @@ public class ThaumcraftHelper implements IModHelper { list = new AspectList().add(Aspect.LIGHT, 1); item = new ItemStack(BlockInterface.getBlock(ForestryHelper.Name, "candle")); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList().add(Aspect.DARKNESS, 1); item = new ItemStack(BlockInterface.getBlock(ForestryHelper.Name, "stump")); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList(new ItemStack(Blocks.glass)).add(Aspect.SENSES, 1); item = new ItemStack(BlockInterface.getBlock(ForestryHelper.Name, "glass")); @@ -824,11 +730,11 @@ public class ThaumcraftHelper implements IModHelper { list = new AspectList().add(Aspect.EARTH, 2).add(Aspect.WATER, 2); item = new ItemStack(BlockInterface.getBlock(ForestryHelper.Name, "soil")); - ThaumcraftApi.registerObjectTag(item, new int[] {1}, list); + ThaumcraftApi.registerObjectTag(item, new int[] { 1 }, list); list = new AspectList(new ItemStack(Blocks.leaves)); item = ItemInterface.getItemStack(ForestryHelper.Name, "candle"); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList(new ItemStack(Blocks.sapling)); item = ItemInterface.getItemStack(ForestryHelper.Name, "candle"); @@ -841,7 +747,8 @@ public class ThaumcraftHelper implements IModHelper { list = new AspectList().add(Aspect.CRYSTAL, 1).add(Aspect.EARTH, 2); item = ItemInterface.getItemStack(ForestryHelper.Name, "candle"); ThaumcraftApi.registerObjectTag( - new ItemStack(item.getItem(), 1, ForestryHelper.BlockResource.APATITE.ordinal()), list.copy()); + new ItemStack(item.getItem(), 1, ForestryHelper.BlockResource.APATITE.ordinal()), + list.copy()); item = ItemInterface.getItemStack(ForestryHelper.Name, "apatite"); ThaumcraftApi.registerObjectTag( new ItemStack(item.getItem(), 1, item.getItemDamage()), @@ -876,8 +783,8 @@ public class ThaumcraftHelper implements IModHelper { list = new AspectList().add(Aspect.SLIME, 1); item = ItemInterface.getItemStack("propolis"); - ThaumcraftApi.registerObjectTag( - new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.NORMAL.ordinal()), list); + ThaumcraftApi + .registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.NORMAL.ordinal()), list); ThaumcraftApi.registerObjectTag( new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.SILKY.ordinal()), list.copy().add(Aspect.SLIME, 2)); @@ -910,7 +817,8 @@ public class ThaumcraftHelper implements IModHelper { item = ItemInterface.getItemStack("pollen"); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.NORMAL.ordinal()), list); ThaumcraftApi.registerObjectTag( - new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), list.copy()); + new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), + list.copy()); ThaumcraftApi.registerObjectTag( new ItemStack(Config.pollen, 1, PollenType.UNUSUAL.ordinal()), list.copy().add(Aspect.MAGIC, 2)); @@ -920,8 +828,7 @@ public class ThaumcraftHelper implements IModHelper { list = new AspectList().add(Aspect.ORDER, 1); item = ItemInterface.getItemStack("beeswax"); - ThaumcraftApi.registerObjectTag( - item, new int[] {item.getItemDamage()}, list.copy().add(Aspect.ORDER, 2)); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list.copy().add(Aspect.ORDER, 2)); ThaumcraftApi.registerObjectTag( new ItemStack(Config.wax, 1, WaxType.MAGIC.ordinal()), list.copy().add(Aspect.MAGIC, 2)); @@ -934,33 +841,35 @@ public class ThaumcraftHelper implements IModHelper { list = new AspectList().add(Aspect.EXCHANGE, 2).add(Aspect.LIFE, 2); item = ItemInterface.getItemStack("honeyDrop"); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList().add(Aspect.LIFE, 2).add(Aspect.ENERGY, 2); item = ItemInterface.getItemStack("honeydew"); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList().add(Aspect.GREED, 1).add(Aspect.LIFE, 4); item = ItemInterface.getItemStack("royalJelly"); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList().add(Aspect.FIRE, 1).add(Aspect.TRAP, 2); item = ItemInterface.getItemStack("phosphor"); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, list); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); item = Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, new AspectList().add(Aspect.LIFE, 6)); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, new AspectList().add(Aspect.LIFE, 6)); item = Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, new AspectList().add(Aspect.DEATH, 6)); + ThaumcraftApi + .registerObjectTag(item, new int[] { item.getItemDamage() }, new AspectList().add(Aspect.DEATH, 6)); item = Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY); - ThaumcraftApi.registerObjectTag(item, new int[] {item.getItemDamage()}, new AspectList().add(Aspect.ARMOR, 6)); + ThaumcraftApi + .registerObjectTag(item, new int[] { item.getItemDamage() }, new AspectList().add(Aspect.ARMOR, 6)); item = Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME); ThaumcraftApi.registerObjectTag( item, - new int[] {item.getItemDamage()}, + new int[] { item.getItemDamage() }, new AspectList().add(Aspect.VOID, 6).add((Aspect) aspectTime, 8)); } } diff --git a/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java b/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java index d26f34f..7ba8b31 100644 --- a/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java @@ -1,15 +1,17 @@ package magicbees.main.utils.compat; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameRegistry; import magicbees.item.types.DropType; import magicbees.main.Config; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.registry.GameRegistry; + public class ThermalModsHelper implements IModHelper { public enum MiscResource { @@ -19,8 +21,7 @@ public class ThermalModsHelper implements IModHelper { FluidCoal, FluidRedstone, FluidGlowstone, - FluidEnder, - ; + FluidEnder,; } public enum NuggetType { @@ -29,15 +30,14 @@ public class ThermalModsHelper implements IModHelper { BRONZE, INVAR, NICKEL, - PLATINUM, - ; + PLATINUM,; } public enum Entity { + BLIZZ("Blizz", "ThermalFoundation:mobBlizzBreathe0"), BLITZ("Blitz", "ThermalFoundation:mobBlitzBreathe1"), - BASALZ("Basalz", "ThermalFoundation:mobBasalzBreathe0"), - ; + BASALZ("Basalz", "ThermalFoundation:mobBasalzBreathe0"),; public final String entityID; public final String soundName; diff --git a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java index 517c113..b842626 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java +++ b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java @@ -1,17 +1,19 @@ package magicbees.main.utils.compat.botania; -import forestry.api.apiculture.EnumBeeType; import magicbees.bees.BeeSpecies; import magicbees.main.Config; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.BotaniaHelper.ManaResource; import magicbees.main.utils.compat.BotaniaHelper.Rune; + import net.minecraft.item.ItemStack; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; +import forestry.api.apiculture.EnumBeeType; /** * Subordinate helper to the Botania Helper that has references to Botania API stuff that will cause @@ -46,35 +48,48 @@ public class BotaniaAPIDistanceHelper { } public static void setupCraftingAndLexicon() { - infusionBeeBotanical = - new SpeciesRecipeManaInfusion(BeeSpecies.BOT_BOTANIC, BeeSpecies.BOT_ROOTED, 55000, EnumBeeType.DRONE); + infusionBeeBotanical = new SpeciesRecipeManaInfusion( + BeeSpecies.BOT_BOTANIC, + BeeSpecies.BOT_ROOTED, + 55000, + EnumBeeType.DRONE); BotaniaAPI.manaInfusionRecipes.add(infusionBeeBotanical); infusionBeeVazbee = new SpeciesRecipeManaInfusion( - BeeSpecies.BOT_VAZBEE, BeeSpecies.BOT_FLORAL, 167392, EnumBeeType.PRINCESS); + BeeSpecies.BOT_VAZBEE, + BeeSpecies.BOT_FLORAL, + 167392, + EnumBeeType.PRINCESS); infusionBeeVazbee.setAlchemy(true); BotaniaAPI.manaInfusionRecipes.add(infusionBeeVazbee); tradeBeeAelfheim = new SpeciesRecipeElvenTrade(BeeSpecies.BOT_DREAMING, BeeSpecies.BOT_ALFHEIM); BotaniaAPI.elvenTradeRecipes.add(tradeBeeAelfheim); - entryManasteelForestryTools = - new BotaniaLexiconEntry("magicbees.botania.lexicon.manasteelTools.title", BotaniaAPI.categoryTools); + entryManasteelForestryTools = new BotaniaLexiconEntry( + "magicbees.botania.lexicon.manasteelTools.title", + BotaniaAPI.categoryTools); entryManasteelForestryTools.setIcon(new ItemStack(Config.manasteelScoop)); + entryManasteelForestryTools + .addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.manasteelTools.0")); entryManasteelForestryTools.addPage( - BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.manasteelTools.0")); - entryManasteelForestryTools.addPage(BotaniaAPI.internalHandler.craftingRecipePage( - "magicbees.botania.lexicon.manasteelScoop", BotaniaHelper.manasteelScoopRecipe)); - entryManasteelForestryTools.addPage(BotaniaAPI.internalHandler.craftingRecipePage( - "magicbees.botania.lexicon.manasteelGrafter", BotaniaHelper.manasteelGrafterRecipe)); + BotaniaAPI.internalHandler.craftingRecipePage( + "magicbees.botania.lexicon.manasteelScoop", + BotaniaHelper.manasteelScoopRecipe)); + entryManasteelForestryTools.addPage( + BotaniaAPI.internalHandler.craftingRecipePage( + "magicbees.botania.lexicon.manasteelGrafter", + BotaniaHelper.manasteelGrafterRecipe)); - entryBeeTrade = - new BotaniaLexiconEntry("magicbees.botania.lexicon.beeAlfheim.title", BotaniaAPI.categoryAlfhomancy); + entryBeeTrade = new BotaniaLexiconEntry( + "magicbees.botania.lexicon.beeAlfheim.title", + BotaniaAPI.categoryAlfhomancy); entryBeeTrade.setIcon(BeeSpecies.BOT_ALFHEIM.getBeeItem(EnumBeeType.PRINCESS)); entryBeeTrade.setKnowledgeType(BotaniaAPI.elvenKnowledge); entryBeeTrade.addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beeAlfheim.0")); - entryBeeTrade.addPage(BotaniaAPI.internalHandler.elvenTradesPage( - "magicbees.botania.lexicon.beeAlfheim.trade", tradeBeeAelfheim)); + entryBeeTrade.addPage( + BotaniaAPI.internalHandler + .elvenTradesPage("magicbees.botania.lexicon.beeAlfheim.trade", tradeBeeAelfheim)); RecipePetals beegoniaRecipe = BotaniaAPI.registerPetalRecipe( BotaniaAPI.internalHandler.getSubTileAsStack(SubTileBeegonia.NAME), @@ -86,12 +101,13 @@ public class BotaniaAPIDistanceHelper { new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.MANA_POWDER.ordinal()), new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.MANA_POWDER.ordinal())); entryBeegonia = new BotaniaLexiconEntry( - "tile.botania:flower." + SubTileBeegonia.NAME + ".name", BotaniaAPI.categoryGenerationFlowers); + "tile.botania:flower." + SubTileBeegonia.NAME + ".name", + BotaniaAPI.categoryGenerationFlowers); entryBeegonia.setLexiconPages( BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.0"), BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.1"), - BotaniaAPI.internalHandler.petalRecipePage( - "magicbees.botania.lexicon.beegonia.crafting", beegoniaRecipe), + BotaniaAPI.internalHandler + .petalRecipePage("magicbees.botania.lexicon.beegonia.crafting", beegoniaRecipe), BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.2")); RecipePetals hiveacynthRecipe = BotaniaAPI.registerPetalRecipe( @@ -106,12 +122,13 @@ public class BotaniaAPIDistanceHelper { new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.MANA_POWDER.ordinal()), new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.REDSTONE_ROOT.ordinal())); entryHiveacynth = new BotaniaLexiconEntry( - "tile.botania:flower." + SubTileHiveacynth.NAME + ".name", BotaniaAPI.categoryFunctionalFlowers); + "tile.botania:flower." + SubTileHiveacynth.NAME + ".name", + BotaniaAPI.categoryFunctionalFlowers); entryHiveacynth.setLexiconPages( BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hiveacynth.0"), BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hiveacynth.1"), - BotaniaAPI.internalHandler.petalRecipePage( - "magicbees.botania.lexicon.hiveacynth.crafting", hiveacynthRecipe)); + BotaniaAPI.internalHandler + .petalRecipePage("magicbees.botania.lexicon.hiveacynth.crafting", hiveacynthRecipe)); RecipePetals hibeescusRecipe = BotaniaAPI.registerPetalRecipe( BotaniaAPI.internalHandler.getSubTileAsStack(SubTileHibeescus.NAME), @@ -128,19 +145,21 @@ public class BotaniaAPIDistanceHelper { BotaniaHelper.getRune(Rune.PRIDE, 1), new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.REDSTONE_ROOT.ordinal())); entryHibeescus = new BotaniaLexiconEntry( - "tile.botania:flower." + SubTileHibeescus.NAME + ".name", BotaniaAPI.categoryFunctionalFlowers); + "tile.botania:flower." + SubTileHibeescus.NAME + ".name", + BotaniaAPI.categoryFunctionalFlowers); entryHibeescus.setLexiconPages( BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hibeescus.0"), BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hibeescus.1"), BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hibeescus.2"), - BotaniaAPI.internalHandler.petalRecipePage( - "magicbees.botania.lexicon.hibeescus.crafting", hibeescusRecipe)); + BotaniaAPI.internalHandler + .petalRecipePage("magicbees.botania.lexicon.hibeescus.crafting", hibeescusRecipe)); entryManaApiaryBooster = new BotaniaLexiconEntry("tile.manaAuraProvider.name", BotaniaAPI.categoryDevices); entryManaApiaryBooster.setLexiconPages( BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.manaBooster.0"), BotaniaAPI.internalHandler.craftingRecipePage( - "magicbees.botania.lexicon.manaBooster.crafting", BotaniaHelper.manaBoosterRecipe)); + "magicbees.botania.lexicon.manaBooster.crafting", + BotaniaHelper.manaBoosterRecipe)); } public static LexiconEntry getLexiconEntryForName(String name) { diff --git a/src/main/java/magicbees/main/utils/compat/botania/BotaniaSignature.java b/src/main/java/magicbees/main/utils/compat/botania/BotaniaSignature.java index 8b1b4c4..50f9bed 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/BotaniaSignature.java +++ b/src/main/java/magicbees/main/utils/compat/botania/BotaniaSignature.java @@ -3,6 +3,7 @@ package magicbees.main.utils.compat.botania; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; + import vazkii.botania.api.subtile.signature.SubTileSignature; public class BotaniaSignature extends SubTileSignature { diff --git a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java index f978178..a0ec201 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java @@ -1,14 +1,17 @@ package magicbees.main.utils.compat.botania; +import java.util.LinkedList; +import java.util.List; + +import magicbees.bees.BeeManager; +import magicbees.bees.BeeSpecies; + +import net.minecraft.item.ItemStack; + +import vazkii.botania.api.recipe.RecipeElvenTrade; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; -import java.util.LinkedList; -import java.util.List; -import magicbees.bees.BeeManager; -import magicbees.bees.BeeSpecies; -import net.minecraft.item.ItemStack; -import vazkii.botania.api.recipe.RecipeElvenTrade; public class SpeciesRecipeElvenTrade extends RecipeElvenTrade { diff --git a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeManaInfusion.java b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeManaInfusion.java index fed886c..14b4d6b 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeManaInfusion.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeManaInfusion.java @@ -1,13 +1,15 @@ package magicbees.main.utils.compat.botania; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBee; import magicbees.bees.BeeManager; import magicbees.bees.BeeSpecies; import magicbees.main.utils.compat.ForestryHelper; + import net.minecraft.item.ItemStack; + import vazkii.botania.api.recipe.RecipeManaInfusion; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBee; public class SpeciesRecipeManaInfusion extends RecipeManaInfusion { diff --git a/src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java b/src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java index 4ca72fe..f735b0d 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java @@ -1,19 +1,22 @@ package magicbees.main.utils.compat.botania; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBee; import java.util.List; + import magicbees.bees.BeeManager; import magicbees.main.utils.compat.BotaniaHelper; + import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.subtile.SubTileGenerating; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBee; public class SubTileBeegonia extends SubTileGenerating { @@ -30,17 +33,15 @@ public class SubTileBeegonia extends SubTileGenerating { boolean needsSync = false; @SuppressWarnings("unchecked") - List items = supertile - .getWorldObj() - .getEntitiesWithinAABB( - EntityItem.class, - AxisAlignedBB.getBoundingBox( - supertile.xCoord - RANGE, - supertile.yCoord - RANGE, - supertile.zCoord - RANGE, - supertile.xCoord + RANGE + 1, - supertile.yCoord + RANGE + 1, - supertile.zCoord + RANGE + 1)); + List items = supertile.getWorldObj().getEntitiesWithinAABB( + EntityItem.class, + AxisAlignedBB.getBoundingBox( + supertile.xCoord - RANGE, + supertile.yCoord - RANGE, + supertile.zCoord - RANGE, + supertile.xCoord + RANGE + 1, + supertile.yCoord + RANGE + 1, + supertile.zCoord + RANGE + 1)); for (EntityItem item : items) { if (item.age >= ITEM_STACK_AGE_THRESHOLD && !item.isDead) { ItemStack stack = item.getEntityItem(); @@ -54,15 +55,13 @@ public class SubTileBeegonia extends SubTileGenerating { * BotaniaHelper.beegoniaManaMultiplier); needsSync = true; - supertile - .getWorldObj() - .playSoundEffect( - supertile.xCoord, - supertile.yCoord, - supertile.zCoord, - "botania:endoflame", - 0.2F, - 1F); + supertile.getWorldObj().playSoundEffect( + supertile.xCoord, + supertile.yCoord, + supertile.zCoord, + "botania:endoflame", + 0.2F, + 1F); } if (stack.stackSize <= 0) { diff --git a/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java b/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java index a57fab0..a30a805 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java @@ -1,21 +1,24 @@ package magicbees.main.utils.compat.botania; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBee; import java.util.ArrayList; import java.util.List; import java.util.Random; + import magicbees.bees.BeeManager; import magicbees.main.utils.compat.BotaniaHelper; + import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.subtile.SubTileFunctional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; public class SubTileHibeescus extends SubTileFunctional { @@ -92,8 +95,8 @@ public class SubTileHibeescus extends SubTileFunctional { private void findBeeItemToHold() { @SuppressWarnings("unchecked") - List items = - supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, getSearchBoundingBox()); + List items = supertile.getWorldObj() + .getEntitiesWithinAABB(EntityItem.class, getSearchBoundingBox()); for (EntityItem itemEntity : items) { ItemStack item = itemEntity.getEntityItem(); diff --git a/src/main/java/magicbees/main/utils/compat/botania/SubTileHiveacynth.java b/src/main/java/magicbees/main/utils/compat/botania/SubTileHiveacynth.java index 38d2ce7..9c448be 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SubTileHiveacynth.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SubTileHiveacynth.java @@ -1,17 +1,20 @@ package magicbees.main.utils.compat.botania; +import java.util.Random; + +import magicbees.bees.BeeManager; +import magicbees.main.utils.compat.BotaniaHelper; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.SubTileFunctional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; -import java.util.Random; -import magicbees.bees.BeeManager; -import magicbees.main.utils.compat.BotaniaHelper; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileFunctional; public class SubTileHiveacynth extends SubTileFunctional { @@ -32,7 +35,8 @@ public class SubTileHiveacynth extends SubTileFunctional { EnumBeeType beeType = EnumBeeType.DRONE; IBee bee = BeeManager.getBeeFromSpecies( - BeeManager.getRandomWorldgenSpecies(r), r.nextDouble() < BotaniaHelper.hiveacynthRainResistRate); + BeeManager.getRandomWorldgenSpecies(r), + r.nextDouble() < BotaniaHelper.hiveacynthRainResistRate); if (r.nextDouble() < BotaniaHelper.hiveacynthPrincessSpawnRate) { beeType = EnumBeeType.PRINCESS; diff --git a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java index 22f515a..da157f1 100644 --- a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java +++ b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java @@ -6,12 +6,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Random; + import magicbees.main.Config; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.INode; @@ -35,8 +38,8 @@ public class NodeHelper { if (chunk == null) return null; Vec3 apiaryPos = Vec3.createVectorHelper(x, y, z); - List tileEntities = - new ArrayList(((Map) chunk.chunkTileEntityMap).values()); + List tileEntities = new ArrayList( + ((Map) chunk.chunkTileEntityMap).values()); Collections.shuffle(tileEntities); for (TileEntity entity : tileEntities) { if (entity instanceof INode) { @@ -56,8 +59,8 @@ public class NodeHelper { List nodes = new ArrayList(); if (chunk != null) { Vec3 apiaryPos = Vec3.createVectorHelper(x, y, z); - List tileEntities = - new ArrayList(((Map) chunk.chunkTileEntityMap).values()); + List tileEntities = new ArrayList( + ((Map) chunk.chunkTileEntityMap).values()); for (TileEntity entity : tileEntities) { if (entity instanceof INode) { Vec3 tePos = Vec3.createVectorHelper(entity.xCoord, entity.yCoord, entity.zCoord); @@ -72,8 +75,8 @@ public class NodeHelper { return nodes; } - public static boolean rechargeNodeInRange( - List chunks, World world, int xCoord, int yCoord, int zCoord, int range) { + public static boolean rechargeNodeInRange(List chunks, World world, int xCoord, int yCoord, int zCoord, + int range) { Collections.shuffle(chunks); for (Chunk chunk : chunks) { INode nearestNode = findNode(chunk, xCoord, yCoord, zCoord, range); @@ -100,8 +103,8 @@ public class NodeHelper { return false; } - public static boolean growNodeInRange( - List chunks, World world, int xCoord, int yCoord, int zCoord, int range) { + public static boolean growNodeInRange(List chunks, World world, int xCoord, int yCoord, int zCoord, + int range) { Collections.shuffle(chunks); int attemptedNodes = 0; for (Chunk chunk : chunks) { @@ -166,8 +169,8 @@ public class NodeHelper { return aspectToAdd; } - public static boolean repairNodeInRange( - List chunks, World world, int xCoord, int yCoord, int zCoord, int range) { + public static boolean repairNodeInRange(List chunks, World world, int xCoord, int yCoord, int zCoord, + int range) { Collections.shuffle(chunks); for (Chunk chunk : chunks) { INode node = findNode(chunk, xCoord, yCoord, zCoord, range); @@ -211,8 +214,8 @@ public class NodeHelper { } } - public static boolean convertNodeInRangeToType( - List chunks, World world, int xCoord, int yCoord, int zCoord, int range, NodeType targetType) { + public static boolean convertNodeInRangeToType(List chunks, World world, int xCoord, int yCoord, int zCoord, + int range, NodeType targetType) { Collections.shuffle(chunks); int attemptedNodes = 0; boolean nodeChanged = false; diff --git a/src/main/java/magicbees/main/utils/error/InvalidEventTypeIndexException.java b/src/main/java/magicbees/main/utils/error/InvalidEventTypeIndexException.java index db60bae..788df50 100644 --- a/src/main/java/magicbees/main/utils/error/InvalidEventTypeIndexException.java +++ b/src/main/java/magicbees/main/utils/error/InvalidEventTypeIndexException.java @@ -1,6 +1,7 @@ package magicbees.main.utils.error; public class InvalidEventTypeIndexException extends RuntimeException { + private static final long serialVersionUID = 8920019214439088440L; public InvalidEventTypeIndexException(String message) { diff --git a/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java b/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java index b80b53f..2564fdf 100644 --- a/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java +++ b/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java @@ -1,17 +1,20 @@ package magicbees.main.utils.net; -import cpw.mods.fml.client.FMLClientHandler; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; + import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.LogHelper; import magicbees.main.utils.net.NetworkEventHandler.EventType; import magicbees.tileentity.AuraCharges; import magicbees.tileentity.ITileEntityAuraCharged; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.client.FMLClientHandler; + public class EventAuraChargeUpdate extends EventCoords { private int flags; @@ -53,9 +56,7 @@ public class EventAuraChargeUpdate extends EventCoords { @Override public void process(EntityPlayerMP player) { - TileEntity tile = FMLClientHandler.instance() - .getClient() - .theWorld + TileEntity tile = FMLClientHandler.instance().getClient().theWorld .getTileEntity(getCoords().x, getCoords().y, getCoords().z); if (tile != null && tile instanceof ITileEntityAuraCharged) { diff --git a/src/main/java/magicbees/main/utils/net/EventBase.java b/src/main/java/magicbees/main/utils/net/EventBase.java index 591a8aa..1afa085 100644 --- a/src/main/java/magicbees/main/utils/net/EventBase.java +++ b/src/main/java/magicbees/main/utils/net/EventBase.java @@ -1,20 +1,23 @@ package magicbees.main.utils.net; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.common.registry.GameData; -import io.netty.buffer.Unpooled; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; + import magicbees.main.utils.LogHelper; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.common.registry.GameData; +import io.netty.buffer.Unpooled; + public class EventBase { private NetworkEventHandler.EventType eventType; diff --git a/src/main/java/magicbees/main/utils/net/EventCoords.java b/src/main/java/magicbees/main/utils/net/EventCoords.java index 74425d5..f357a60 100644 --- a/src/main/java/magicbees/main/utils/net/EventCoords.java +++ b/src/main/java/magicbees/main/utils/net/EventCoords.java @@ -3,6 +3,7 @@ package magicbees.main.utils.net; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; + import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.LogHelper; diff --git a/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java b/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java index ac60f18..2c63a7a 100644 --- a/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java +++ b/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java @@ -1,16 +1,19 @@ package magicbees.main.utils.net; -import cpw.mods.fml.client.FMLClientHandler; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; + import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.LogHelper; import magicbees.main.utils.net.NetworkEventHandler.EventType; import magicbees.tileentity.ITileEntityFlags; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.client.FMLClientHandler; + public class EventFlagsUpdate extends EventCoords { private int[] flags; @@ -64,9 +67,7 @@ public class EventFlagsUpdate extends EventCoords { @Override public void process(EntityPlayerMP player) { - TileEntity tile = FMLClientHandler.instance() - .getClient() - .theWorld + TileEntity tile = FMLClientHandler.instance().getClient().theWorld .getTileEntity(getCoords().x, getCoords().y, getCoords().z); if (tile != null && tile instanceof ITileEntityFlags) { diff --git a/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java b/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java index 4c9e088..1284ed3 100644 --- a/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java +++ b/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java @@ -1,16 +1,19 @@ package magicbees.main.utils.net; -import cpw.mods.fml.client.FMLClientHandler; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; + import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.LogHelper; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.client.FMLClientHandler; + public class EventInventoryUpdate extends EventCoords { private int slotIndex; @@ -57,9 +60,7 @@ public class EventInventoryUpdate extends EventCoords { @Override public void process(EntityPlayerMP player) { - TileEntity tile = FMLClientHandler.instance() - .getClient() - .theWorld + TileEntity tile = FMLClientHandler.instance().getClient().theWorld .getTileEntity(getCoords().x, getCoords().y, getCoords().z); if (tile != null && tile instanceof IInventory) { diff --git a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java index 063aba3..0954eb8 100644 --- a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java +++ b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java @@ -1,5 +1,21 @@ package magicbees.main.utils.net; +import java.io.DataInputStream; +import java.io.IOException; + +import magicbees.main.MagicBees; +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; +import magicbees.main.utils.VersionInfo; +import magicbees.main.utils.error.InvalidEventTypeIndexException; +import magicbees.tileentity.AuraCharges; +import magicbees.tileentity.ITileEntityAuraCharged; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.tileentity.TileEntity; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLEventChannel; @@ -9,19 +25,6 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; -import java.io.DataInputStream; -import java.io.IOException; -import magicbees.main.MagicBees; -import magicbees.main.utils.ChunkCoords; -import magicbees.main.utils.LogHelper; -import magicbees.main.utils.VersionInfo; -import magicbees.main.utils.error.InvalidEventTypeIndexException; -import magicbees.tileentity.AuraCharges; -import magicbees.tileentity.ITileEntityAuraCharged; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.tileentity.TileEntity; public class NetworkEventHandler { @@ -69,8 +72,8 @@ public class NetworkEventHandler { sendPacket(packet); } - public void sendAuraChargeUpdate( - T entity, AuraCharges auraCharges) { + public void sendAuraChargeUpdate(T entity, + AuraCharges auraCharges) { EventAuraChargeUpdate event = new EventAuraChargeUpdate(new ChunkCoords(entity), auraCharges); FMLProxyPacket packet = event.getPacket(); diff --git a/src/main/java/magicbees/storage/BackpackDefinition.java b/src/main/java/magicbees/storage/BackpackDefinition.java index acf63dc..ce1be7d 100644 --- a/src/main/java/magicbees/storage/BackpackDefinition.java +++ b/src/main/java/magicbees/storage/BackpackDefinition.java @@ -1,17 +1,20 @@ package magicbees.storage; -import forestry.api.storage.IBackpackDefinition; import java.util.ArrayList; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import forestry.api.storage.IBackpackDefinition; + /** * Backpack definition for Forestry. * * @author MysteriousAges */ public class BackpackDefinition implements IBackpackDefinition { + private ArrayList items; private String key; private String name; @@ -60,8 +63,7 @@ public class BackpackDefinition implements IBackpackDefinition { stack = this.items.get(i); // If comparison stack has meta of -1 if (stack.getItem() == itemStack.getItem()) { - flag = stack.getItemDamage() == -1 - || stack.getItemDamage() == OreDictionary.WILDCARD_VALUE + flag = stack.getItemDamage() == -1 || stack.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack.getItemDamage() == itemStack.getItemDamage(); } } diff --git a/src/main/java/magicbees/tileentity/AuraCharges.java b/src/main/java/magicbees/tileentity/AuraCharges.java index 0d3e61e..b2b1d15 100644 --- a/src/main/java/magicbees/tileentity/AuraCharges.java +++ b/src/main/java/magicbees/tileentity/AuraCharges.java @@ -2,11 +2,14 @@ package magicbees.tileentity; import java.util.HashMap; import java.util.Map; + import magicbees.bees.AuraCharge; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class AuraCharges { + private static final String auraChargesTagName = "AuraCharges"; private final Map charges = new HashMap(AuraCharge.values().length); diff --git a/src/main/java/magicbees/tileentity/EffectJarHousing.java b/src/main/java/magicbees/tileentity/EffectJarHousing.java index 9edd94f..dfe0aff 100644 --- a/src/main/java/magicbees/tileentity/EffectJarHousing.java +++ b/src/main/java/magicbees/tileentity/EffectJarHousing.java @@ -1,7 +1,20 @@ package magicbees.tileentity; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import magicbees.bees.BeeManager; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + import com.google.common.collect.ImmutableSet; import com.mojang.authlib.GameProfile; + import forestry.api.apiculture.DefaultBeeListener; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -13,15 +26,6 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import magicbees.bees.BeeManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; /** * Simulates enough of a bee house to fire the bee effects. =D @@ -117,6 +121,7 @@ public class EffectJarHousing implements IBeeHousing { } private static class JarBeeHousingInventory implements IBeeHousingInventory { + private final TileEntityEffectJar jarEntity; public JarBeeHousingInventory(TileEntityEffectJar jarEntity) { @@ -180,6 +185,7 @@ public class EffectJarHousing implements IBeeHousing { } private static class JarHousingModifier implements IBeeModifier { + @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { return 0.9f; diff --git a/src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java b/src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java index 4196766..ce49930 100644 --- a/src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java +++ b/src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java @@ -1,5 +1,6 @@ package magicbees.tileentity; public interface ITileEntityAuraCharged { + AuraCharges getAuraCharges(); } diff --git a/src/main/java/magicbees/tileentity/TileEntityEffectJar.java b/src/main/java/magicbees/tileentity/TileEntityEffectJar.java index ef9f1b4..be69667 100644 --- a/src/main/java/magicbees/tileentity/TileEntityEffectJar.java +++ b/src/main/java/magicbees/tileentity/TileEntityEffectJar.java @@ -1,9 +1,7 @@ package magicbees.tileentity; -import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.IBee; -import forestry.api.genetics.IEffectData; import magicbees.main.CommonProxy; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -12,7 +10,13 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants; +import com.mojang.authlib.GameProfile; + +import forestry.api.apiculture.IBee; +import forestry.api.genetics.IEffectData; + public class TileEntityEffectJar extends TileEntity implements IInventory { + public static final String tileEntityName = CommonProxy.DOMAIN + ".effectJar"; private static final int SLOT_COUNT = 2; public static final int DRONE_SLOT = 0; diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 46772ae..8def485 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -1,26 +1,11 @@ package magicbees.tileentity; -import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.DefaultBeeListener; -import forestry.api.apiculture.DefaultBeeModifier; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeHousingInventory; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IBeekeepingLogic; -import forestry.api.apiculture.IBeekeepingMode; -import forestry.api.apiculture.IHiveFrame; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.core.ForestryAPI; -import forestry.api.core.IErrorLogic; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; + import magicbees.api.bees.IMagicApiaryAuraProvider; import magicbees.bees.AuraCharge; import magicbees.bees.BeeManager; @@ -29,6 +14,7 @@ import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.ItemStackUtils; import magicbees.main.utils.net.EventAuraChargeUpdate; import magicbees.main.utils.net.NetworkEventHandler; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -47,6 +33,24 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.Constants; +import com.mojang.authlib.GameProfile; + +import forestry.api.apiculture.DefaultBeeListener; +import forestry.api.apiculture.DefaultBeeModifier; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeHousingInventory; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.apiculture.IBeekeepingMode; +import forestry.api.apiculture.IHiveFrame; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; +import forestry.api.core.IErrorLogic; + public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing, ITileEntityAuraCharged { // Constants @@ -356,8 +360,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory boolean auraChargesChanged = false; for (AuraCharge charge : AuraCharge.values()) { - if (auraCharges.isActive(charge) - && auraCharges.isExpired(charge, worldObj) + if (auraCharges.isActive(charge) && auraCharges.isExpired(charge, worldObj) && (auraProvider == null || !auraProvider.getCharge(charge.type))) { auraCharges.stop(charge); auraChargesChanged = true; @@ -391,20 +394,22 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private List getChunksInSearchRange() { List chunks = new ArrayList(4); - chunks.add(worldObj.getChunkFromBlockCoords( - xCoord - AURAPROVIDER_SEARCH_RADIUS, zCoord - AURAPROVIDER_SEARCH_RADIUS)); - Chunk chunk = worldObj.getChunkFromBlockCoords( - xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord - AURAPROVIDER_SEARCH_RADIUS); + chunks.add( + worldObj.getChunkFromBlockCoords( + xCoord - AURAPROVIDER_SEARCH_RADIUS, + zCoord - AURAPROVIDER_SEARCH_RADIUS)); + Chunk chunk = worldObj + .getChunkFromBlockCoords(xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord - AURAPROVIDER_SEARCH_RADIUS); if (!chunks.contains(chunk)) { chunks.add(chunk); } - chunk = worldObj.getChunkFromBlockCoords( - xCoord - AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS); + chunk = worldObj + .getChunkFromBlockCoords(xCoord - AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS); if (!chunks.contains(chunk)) { chunks.add(chunk); } - chunk = worldObj.getChunkFromBlockCoords( - xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS); + chunk = worldObj + .getChunkFromBlockCoords(xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS); if (!chunks.contains(chunk)) { chunks.add(chunk); } @@ -414,8 +419,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory @SuppressWarnings("unchecked") private boolean searchChunkForBooster(Chunk chunk) { Vec3 apiaryPos = Vec3.createVectorHelper(xCoord, yCoord, zCoord); - for (Map.Entry entry : - ((Map) chunk.chunkTileEntityMap).entrySet()) { + for (Map.Entry entry : ((Map) chunk.chunkTileEntityMap) + .entrySet()) { TileEntity entity = entry.getValue(); if (entity instanceof IMagicApiaryAuraProvider) { Vec3 tePos = Vec3.createVectorHelper(entity.xCoord, entity.yCoord, entity.zCoord); @@ -477,6 +482,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } private static class MagicApiaryInventory implements IBeeHousingInventory { + public static final int SLOT_QUEEN = 0; public static final int SLOT_DRONE = 1; public static final int SLOT_FRAME_START = 2; @@ -514,8 +520,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory @Override public boolean addProduct(ItemStack product, boolean all) { - int countAdded = - ItemStackUtils.addItemToInventory(magicApiary, product, SLOT_PRODUCTS_START, SLOT_PRODUCTS_COUNT); + int countAdded = ItemStackUtils + .addItemToInventory(magicApiary, product, SLOT_PRODUCTS_START, SLOT_PRODUCTS_COUNT); if (all) { return countAdded == product.stackSize; @@ -542,7 +548,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory public int[] getAccessibleSlotsFromSide(int side) { if (side == 0 || side == 1) { - return new int[] {SLOT_QUEEN, SLOT_DRONE}; + return new int[] { SLOT_QUEEN, SLOT_DRONE }; } else { int[] slots = new int[SLOT_PRODUCTS_COUNT]; for (int i = 0, slot = SLOT_PRODUCTS_START; i < SLOT_PRODUCTS_COUNT; ++i, ++slot) { @@ -553,8 +559,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } public boolean canInsertItem(int slot, ItemStack itemStack, int side) { - if (slot == SLOT_QUEEN - && BeeManager.beeRoot.isMember(itemStack) + if (slot == SLOT_QUEEN && BeeManager.beeRoot.isMember(itemStack) && !BeeManager.beeRoot.isDrone(itemStack)) { return true; } else if (slot == SLOT_DRONE && BeeManager.beeRoot.isDrone(itemStack)) { @@ -680,9 +685,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getBeekeepingMode(magicApiary.getWorldObj()); int wear = Math.round(amount * beekeepingMode.getWearModifier()); - for (int i = MagicApiaryInventory.SLOT_FRAME_START; - i < MagicApiaryInventory.SLOT_FRAME_START + MagicApiaryInventory.SLOT_FRAME_COUNT; - i++) { + for (int i = MagicApiaryInventory.SLOT_FRAME_START; i + < MagicApiaryInventory.SLOT_FRAME_START + MagicApiaryInventory.SLOT_FRAME_COUNT; i++) { ItemStack hiveFrameStack = magicApiary.getStackInSlot(i); if (hiveFrameStack == null) { continue; diff --git a/src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java b/src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java index a77a800..f2a782a 100644 --- a/src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java +++ b/src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java @@ -1,22 +1,24 @@ package magicbees.tileentity; -import cpw.mods.fml.common.Optional; import java.util.HashMap; import java.util.Map; + import magicbees.api.bees.AuraChargeType; import magicbees.api.bees.IMagicApiaryAuraProvider; import magicbees.bees.AuraCharge; import magicbees.main.CommonProxy; import magicbees.main.utils.compat.BotaniaHelper; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; + import vazkii.botania.api.mana.IManaReceiver; +import cpw.mods.fml.common.Optional; @Optional.InterfaceList({ - @Optional.Interface(iface = "vazkii.botania.api.mana.IManaReceiver", modid = BotaniaHelper.Name) -}) + @Optional.Interface(iface = "vazkii.botania.api.mana.IManaReceiver", modid = BotaniaHelper.Name) }) public class TileEntityManaAuraProvider extends TileEntity implements IMagicApiaryAuraProvider, IManaReceiver { public static final String tileEntityName = CommonProxy.DOMAIN + ".manaAuraProvider"; @@ -26,11 +28,12 @@ public class TileEntityManaAuraProvider extends TileEntity implements IMagicApia private static final int MAX_MANA = MANA_PER_CHARGE * 4; private static class ManaAuraCharge { + int charges; int mana; public int[] toArray() { - return new int[] {charges, mana}; + return new int[] { charges, mana }; } public void fromArray(int[] array) { diff --git a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java index dc45115..a1290cf 100644 --- a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java +++ b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java @@ -2,12 +2,15 @@ package magicbees.tileentity; import java.util.HashMap; import java.util.Map; + import magicbees.api.bees.AuraChargeType; import magicbees.api.bees.IMagicApiaryAuraProvider; import magicbees.bees.AuraCharge; import magicbees.main.CommonProxy; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.visnet.VisNetHandler; @@ -27,11 +30,12 @@ public class TileEntityVisAuraProvider extends TileEntity implements IMagicApiar } private static class VisAuraCharge { + int charges; int vis; public int[] toArray() { - return new int[] {charges, vis}; + return new int[] { charges, vis }; } public void fromArray(int[] array) { diff --git a/src/main/java/magicbees/world/feature/FeatureOreVein.java b/src/main/java/magicbees/world/feature/FeatureOreVein.java index c43992d..9a4fcd8 100644 --- a/src/main/java/magicbees/world/feature/FeatureOreVein.java +++ b/src/main/java/magicbees/world/feature/FeatureOreVein.java @@ -1,12 +1,15 @@ package magicbees.world.feature; import java.util.Random; + import magicbees.main.utils.BlockUtil; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; public class FeatureOreVein { + public static final FeatureOreVein redstoneGen; public static final FeatureOreVein netherQuartzGen; public static final FeatureOreVein glowstoneGen; diff --git a/src/main/java/magicbees/world/feature/HiveGenOblivion.java b/src/main/java/magicbees/world/feature/HiveGenOblivion.java index 9c80920..b1f0ead 100644 --- a/src/main/java/magicbees/world/feature/HiveGenOblivion.java +++ b/src/main/java/magicbees/world/feature/HiveGenOblivion.java @@ -1,11 +1,13 @@ package magicbees.world.feature; -import forestry.api.apiculture.hives.IHiveGen; import magicbees.main.utils.BlockUtil; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import forestry.api.apiculture.hives.IHiveGen; + public class HiveGenOblivion implements IHiveGen { @Override diff --git a/src/main/java/magicbees/world/feature/HiveGenUnderground.java b/src/main/java/magicbees/world/feature/HiveGenUnderground.java index 36126e9..de33ef5 100644 --- a/src/main/java/magicbees/world/feature/HiveGenUnderground.java +++ b/src/main/java/magicbees/world/feature/HiveGenUnderground.java @@ -1,12 +1,15 @@ package magicbees.world.feature; -import forestry.api.apiculture.hives.IHiveGen; import magicbees.main.utils.BlockUtil; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import forestry.api.apiculture.hives.IHiveGen; + public class HiveGenUnderground implements IHiveGen { + protected final int minLevel; protected final int range; protected final Block replace;