From 9dd73935d7d143be4582b8e02696ae865fbb2a6d Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sat, 4 Oct 2014 01:25:24 -0700 Subject: [PATCH 1/4] Refactoring BeekeepingLogic's monolithic update(). Down from 200+ lines to 20, and a buttload of functions. Hopefully it's a bit easier to read & understand now. Tabs. Switched order of hasQueen/tryBreedingPrincess to ensure that princesses are bred into queens. --- .../forestry/apiculture/BeekeepingLogic.java | 187 +++++++++++------- .../forestry/plugins/PluginApiculture.java | 2 +- 2 files changed, 112 insertions(+), 77 deletions(-) diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 685c3c9fb..6274beac9 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -36,7 +36,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { // Breeding private int breedingTime; private final int totalBreedingTime = Defaults.APIARY_BREEDING_TIME; - private int throttle; + private int queenWorkCycleThrottle; private IEffectData effectData[] = new IEffectData[2]; private IBee queen; private IIndividual pollen; @@ -51,7 +51,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { @Override public void readFromNBT(NBTTagCompound nbttagcompound) { breedingTime = nbttagcompound.getInteger("BreedingTime"); - throttle = nbttagcompound.getInteger("Throttle"); + queenWorkCycleThrottle = nbttagcompound.getInteger("Throttle"); NBTTagList nbttaglist = nbttagcompound.getTagList("Offspring", 10); for (int i = 0; i < nbttaglist.tagCount(); i++) { @@ -63,7 +63,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { @Override public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("BreedingTime", breedingTime); - nbttagcompound.setInteger("Throttle", throttle); + nbttagcompound.setInteger("Throttle", queenWorkCycleThrottle); Stack spawnCopy = new Stack(); spawnCopy.addAll(spawn); @@ -107,116 +107,151 @@ public class BeekeepingLogic implements IBeekeepingLogic { @Override public void update() { - resetQueen(null); + this.queen = null; - // Still something to spawn, try it - while (!spawn.isEmpty()) { - ItemStack next = spawn.peek(); - if (housing.addProduct(next, true)) { - spawn.pop(); - housing.setErrorState(EnumErrorCode.OK.ordinal()); - } else - housing.setErrorState(EnumErrorCode.NOSPACE.ordinal()); + if (!didSpawnPendingProducts()) { + return; + } + + if (tryBreedingPrincess() || !hasHealthyQueen()) { + return; + } + + if (!queenCanWork()) { return; } - // No queen? And no princess? - if (housing.getQueen() == null) { - housing.setErrorState(EnumErrorCode.NOQUEEN.ordinal()); - return; - } + queenWorkTick(); - // Princess available? Try to breed! - if (ForestryItem.beePrincessGE.isItemEqual(housing.getQueen())) { - if (ForestryItem.beeDroneGE.isItemEqual(housing.getDrone())) - housing.setErrorState(EnumErrorCode.OK.ordinal()); - else - housing.setErrorState(EnumErrorCode.NODRONE.ordinal()); - tickBreed(); - return; - } - - // Can't continue if an item of the wrong type is in the queen slot. - if (!ForestryItem.beeQueenGE.isItemEqual(housing.getQueen())) { - housing.setErrorState(EnumErrorCode.NOQUEEN.ordinal()); - return; - } - - IBee queen = PluginApiculture.beeInterface.getMember(housing.getQueen()); - // Kill dying queens - if (!queen.isAlive()) { - killQueen(queen); - housing.setErrorState(EnumErrorCode.OK.ordinal()); - return; - } - - resetQueen(queen); - - // Not while raining, at night or without light - EnumErrorCode state = EnumErrorCode.values()[queen.isWorking(housing)]; - if (state != EnumErrorCode.OK) { - housing.setErrorState(state.ordinal()); - return; - } else if (housing.getErrorOrdinal() != EnumErrorCode.NOFLOWER.ordinal()) - housing.setErrorState(EnumErrorCode.OK.ordinal()); + return; + } + private void queenWorkTick() { // Effects only fire when queen can work. effectData = queen.doEffect(effectData, housing); - // We have a queen, work! - throttle++; - - if (throttle >= PluginApiculture.beeCycleTicks) - throttle = 0; - else - return; - - // Need a flower - if (!queen.hasFlower(housing)) { - housing.setErrorState(EnumErrorCode.NOFLOWER.ordinal()); - return; - } else - housing.setErrorState(EnumErrorCode.OK.ordinal()); + // Work cycles are throttled, rather than occurring every game tick. + queenWorkCycleThrottle++; + if (queenWorkCycleThrottle >= PluginApiculture.ticksPerBeeWorkCycle) { + queenWorkCycleThrottle = 0; + + // Need a flower + if (queen.hasFlower(housing)) { + housing.setErrorState(EnumErrorCode.OK.ordinal()); + doQueenWorkCycle(); + } else { + housing.setErrorState(EnumErrorCode.NOFLOWER.ordinal()); + } + } + } + + private void doQueenWorkCycle() { + doProduction(); + queen.plantFlowerRandom(housing); + doPollination(); + // Age the queen + queen.age(housing.getWorld(), housing.getLifespanModifier(queen.getGenome(), queen.getMate(), 0f)); + updateQueenItemNBT(); + } + private void doProduction() { // Produce and add stacks ItemStack[] products = queen.produceStacks(housing); housing.wearOutEquipment(1); for (ItemStack stack : products) { housing.addProduct(stack, false); } + } - // Plant a flower - queen.plantFlowerRandom(housing); + private void doPollination() { // Get pollen if none available yet if (pollen == null) { pollen = queen.retrievePollen(housing); attemptedPollinations = 0; if (pollen != null) { - if (housing.onPollenRetrieved(queen, pollen, false)) + if (housing.onPollenRetrieved(queen, pollen, false)) { pollen = null; + } } } if (pollen != null) { attemptedPollinations++; - if (queen.pollinateRandom(housing, pollen) - || attemptedPollinations >= MAX_POLLINATION_ATTEMPTS) { + if (queen.pollinateRandom(housing, pollen) || attemptedPollinations >= MAX_POLLINATION_ATTEMPTS) { pollen = null; } } + } - // Age the queen - queen.age(housing.getWorld(), housing.getLifespanModifier(queen.getGenome(), queen.getMate(), 0f)); - + private void updateQueenItemNBT() { // Write the changed queen back into the item stack. NBTTagCompound nbttagcompound = new NBTTagCompound(); queen.writeToNBT(nbttagcompound); housing.getQueen().setTagCompound(nbttagcompound); - - return; } - private void resetQueen(IBee bee) { - this.queen = bee; + private boolean didSpawnPendingProducts() { + boolean didSpawnItem = true; + while (!spawn.isEmpty()) { + ItemStack next = spawn.peek(); + if (housing.addProduct(next, true)) { + spawn.pop(); + housing.setErrorState(EnumErrorCode.OK.ordinal()); + } else { + housing.setErrorState(EnumErrorCode.NOSPACE.ordinal()); + didSpawnItem = false; + } + } + return didSpawnItem; + } + + private boolean hasHealthyQueen() { + boolean hasQueen = true; + + if (housing.getQueen() == null || !ForestryItem.beeQueenGE.isItemEqual(housing.getQueen())) { + housing.setErrorState(EnumErrorCode.NOQUEEN.ordinal()); + hasQueen = false; + } else { + IBee queen = PluginApiculture.beeInterface.getMember(housing.getQueen()); + // Kill dying queens + if (!queen.isAlive()) { + killQueen(queen); + housing.setErrorState(EnumErrorCode.OK.ordinal()); + hasQueen = false; + } else { + this.queen = queen; + } + } + return hasQueen; + } + + private boolean tryBreedingPrincess() { + boolean isBreedingPrincess = false; + + // Princess available? Try to breed! + if (ForestryItem.beePrincessGE.isItemEqual(housing.getQueen())) { + if (ForestryItem.beeDroneGE.isItemEqual(housing.getDrone())) { + housing.setErrorState(EnumErrorCode.OK.ordinal()); + } else { + housing.setErrorState(EnumErrorCode.NODRONE.ordinal()); + } + tickBreed(); + isBreedingPrincess = true; + } + + return isBreedingPrincess; + } + + private boolean queenCanWork() { + boolean canWork = true; + // Not while raining, at night or without light + EnumErrorCode state = EnumErrorCode.values()[queen.isWorking(housing)]; + if (state != EnumErrorCode.OK) { + housing.setErrorState(state.ordinal()); + canWork = false; + } else if (housing.getErrorOrdinal() != EnumErrorCode.NOFLOWER.ordinal()) { + housing.setErrorState(EnumErrorCode.OK.ordinal()); + } + return canWork; } // / BREEDING diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 101cafe47..6b555b59d 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -167,7 +167,7 @@ public class PluginApiculture extends ForestryPlugin { private static final String CONFIG_CATEGORY = "apiculture"; private Configuration apicultureConfig; public static String beekeepingMode = "NORMAL"; - public static int beeCycleTicks = 550; + public static int ticksPerBeeWorkCycle = 550; public static boolean apiarySideSensitive = false; public static boolean fancyRenderedBees = false; public static Trigger triggerNoFrames; From ae3f75e22a365245e1b76efa579eb2c162440a91 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 16 Nov 2014 16:14:41 -0800 Subject: [PATCH 2/4] Improve bee logic performance --- api | 2 +- src/main/java/forestry/apiculture/genetics/Bee.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api b/api index 4f7ca8219..ccc4884f2 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 4f7ca8219091e9c453c715915f296de13aa9a9e1 +Subproject commit ccc4884f24ced8fd93045ff2a2f96cc2628f9fcc diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 1af89ed48..b56393b3a 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -226,7 +226,7 @@ public class Bee extends IndividualLiving implements IBee { BiomeGenBase biome = BiomeGenBase.getBiome(housing.getBiomeId()); if(biome == null) return EnumErrorCode.NOSKY.ordinal(); - if (!BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.NETHER) && !world.canBlockSeeTheSky(housing.getXCoord(), housing.getYCoord() + 3, housing.getZCoord()) + if (!EnumTemperature.isBiomeHellish(biome) && !world.canBlockSeeTheSky(housing.getXCoord(), housing.getYCoord() + 3, housing.getZCoord()) && !genome.getCaveDwelling() && !housing.isSunlightSimulated()) return EnumErrorCode.NOSKY.ordinal(); From b6ba59f9f987b03078fd5025a075d95ed7334a40 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 16 Nov 2014 16:45:20 -0800 Subject: [PATCH 3/4] Move EnumErrorCode to the API (tick performance) --- api | 2 +- .../forestry/apiculture/BeekeepingLogic.java | 45 +++++- .../apiculture/gadgets/TileAlvearyPlain.java | 2 +- .../apiculture/gadgets/TileBeehouse.java | 2 +- .../genetics/AlleleEffectThrottled.java | 2 +- .../forestry/apiculture/genetics/Bee.java | 26 ++-- .../apiculture/items/ItemBeealyzer.java | 2 +- .../apiculture/items/ItemBiomefinder.java | 2 +- .../arboriculture/gadgets/TileLeaves.java | 41 ++++-- .../arboriculture/items/ItemTreealyzer.java | 2 +- .../java/forestry/core/EnumErrorCode.java | 138 ------------------ .../java/forestry/core/EventHandlerCore.java | 14 +- .../core/circuits/ItemSolderingIron.java | 2 +- .../forestry/core/gadgets/TileAnalyzer.java | 6 +- .../forestry/core/gadgets/TileForestry.java | 2 +- .../java/forestry/core/gui/ErrorLedger.java | 2 +- .../core/interfaces/IErrorSource.java | 2 +- .../core/network/PacketTileUpdate.java | 2 +- .../core/triggers/TriggerMissingDrone.java | 2 +- .../core/triggers/TriggerMissingQueen.java | 2 +- .../forestry/energy/gadgets/EngineBronze.java | 2 +- .../forestry/energy/gadgets/EngineCopper.java | 2 +- .../forestry/energy/gadgets/EngineTin.java | 2 +- .../energy/gadgets/MachineGenerator.java | 4 +- .../factory/gadgets/MachineBottler.java | 2 +- .../factory/gadgets/MachineCarpenter.java | 2 +- .../factory/gadgets/MachineCentrifuge.java | 2 +- .../factory/gadgets/MachineFabricator.java | 2 +- .../factory/gadgets/MachineFermenter.java | 2 +- .../factory/gadgets/MachineMoistener.java | 3 +- .../factory/gadgets/MachineRaintank.java | 2 +- .../factory/gadgets/MachineSqueezer.java | 2 +- .../factory/gadgets/MachineStill.java | 2 +- .../farming/gadgets/TileFarmPlain.java | 2 +- .../forestry/farming/gadgets/TileGearbox.java | 2 +- .../items/ItemFlutterlyzer.java | 2 +- .../forestry/mail/gadgets/MachineTrader.java | 2 +- .../java/forestry/mail/items/ItemLetter.java | 2 +- 38 files changed, 120 insertions(+), 217 deletions(-) delete mode 100755 src/main/java/forestry/core/EnumErrorCode.java diff --git a/api b/api index ccc4884f2..2df3a991b 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit ccc4884f24ced8fd93045ff2a2f96cc2628f9fcc +Subproject commit 2df3a991b4096639ba3c95d9a537d7c68a8fd832 diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 6274beac9..e98d079c1 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -23,7 +23,7 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IIndividual; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; @@ -191,36 +191,53 @@ public class BeekeepingLogic implements IBeekeepingLogic { private boolean didSpawnPendingProducts() { boolean didSpawnItem = true; + EnumErrorCode housingErrorState = null; + while (!spawn.isEmpty()) { ItemStack next = spawn.peek(); if (housing.addProduct(next, true)) { spawn.pop(); - housing.setErrorState(EnumErrorCode.OK.ordinal()); + housingErrorState = EnumErrorCode.OK; } else { - housing.setErrorState(EnumErrorCode.NOSPACE.ordinal()); + housingErrorState = EnumErrorCode.NOSPACE; didSpawnItem = false; } } + if (housingErrorState != null) { + try { + housing.setErrorState(housingErrorState); + } catch (Error e) { + housing.setErrorState(housingErrorState.ordinal()); + } + } return didSpawnItem; } private boolean hasHealthyQueen() { boolean hasQueen = true; + EnumErrorCode housingErrorState = null; if (housing.getQueen() == null || !ForestryItem.beeQueenGE.isItemEqual(housing.getQueen())) { - housing.setErrorState(EnumErrorCode.NOQUEEN.ordinal()); + housingErrorState = EnumErrorCode.NOQUEEN; hasQueen = false; } else { IBee queen = PluginApiculture.beeInterface.getMember(housing.getQueen()); // Kill dying queens if (!queen.isAlive()) { killQueen(queen); - housing.setErrorState(EnumErrorCode.OK.ordinal()); + housingErrorState = EnumErrorCode.OK; hasQueen = false; } else { this.queen = queen; } } + if (housingErrorState != null) { + try { + housing.setErrorState(housingErrorState); + } catch (Error e) { + housing.setErrorState(housingErrorState.ordinal()); + } + } return hasQueen; } @@ -242,6 +259,24 @@ public class BeekeepingLogic implements IBeekeepingLogic { } private boolean queenCanWork() { + try { + boolean canWork = true; + // Not while raining, at night or without light + EnumErrorCode state = queen.canWork(housing); + if (state != EnumErrorCode.OK) { + housing.setErrorState(state); + canWork = false; + } else if (housing.getErrorState() != EnumErrorCode.NOFLOWER) { + housing.setErrorState(EnumErrorCode.OK); + } + return canWork; + } catch (Error e) { + return queenCanWorkDeprecated(); + } + } + + // fallback for outdated APIs + private boolean queenCanWorkDeprecated() { boolean canWork = true; // Not while raining, at night or without light EnumErrorCode state = EnumErrorCode.values()[queen.isWorking(housing)]; diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 35f2c398c..a21813ba4 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -33,7 +33,7 @@ import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.core.*; import forestry.api.genetics.IIndividual; import forestry.apiculture.gui.ContainerAlveary; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IClimatised; diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index 74d68a435..58518cdc6 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -27,7 +27,7 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; import forestry.api.genetics.IIndividual; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.gadgets.TileBase; diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java index a10a07fc5..dfd554053 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java @@ -16,7 +16,7 @@ import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.genetics.Allele; import forestry.core.genetics.EffectData; import forestry.core.utils.Vect; diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index b56393b3a..3606aec28 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -30,7 +30,7 @@ import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Defaults; import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; @@ -46,7 +46,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.BiomeDictionary; import java.util.ArrayList; import java.util.List; @@ -203,38 +202,43 @@ public class Bee extends IndividualLiving implements IBee { @Override public int isWorking(IBeeHousing housing) { + return canWork(housing).ordinal(); + } + + @Override + public EnumErrorCode canWork(IBeeHousing housing) { World world = housing.getWorld(); // / Rain needs tolerant flyers if (world.isRaining() && !genome.getTolerantFlyer() && housing.getHumidity() != EnumHumidity.ARID && !housing.isSealed()) - return EnumErrorCode.ISRAINING.ordinal(); + return EnumErrorCode.ISRAINING; // / Night or darkness requires nocturnal species if(world.isDaytime()) { if(!canWorkDuringDay()) - return EnumErrorCode.NOTNIGHT.ordinal(); + return EnumErrorCode.NOTNIGHT; } else if (!canWorkAtNight() && !housing.isSelfLighted()) - return EnumErrorCode.NOTDAY.ordinal(); + return EnumErrorCode.NOTDAY; if (world.getBlockLightValue(housing.getXCoord(), housing.getYCoord() + 2, housing.getZCoord()) > Defaults.APIARY_MIN_LEVEL_LIGHT) { if(!canWorkDuringDay()) - return EnumErrorCode.NOTGLOOMY.ordinal(); + return EnumErrorCode.NOTGLOOMY; } else if(!canWorkAtNight() && !housing.isSelfLighted()) - return EnumErrorCode.NOTLUCID.ordinal(); + return EnumErrorCode.NOTLUCID; // / No sky, except if in hell BiomeGenBase biome = BiomeGenBase.getBiome(housing.getBiomeId()); if(biome == null) - return EnumErrorCode.NOSKY.ordinal(); + return EnumErrorCode.NOSKY; if (!EnumTemperature.isBiomeHellish(biome) && !world.canBlockSeeTheSky(housing.getXCoord(), housing.getYCoord() + 3, housing.getZCoord()) && !genome.getCaveDwelling() && !housing.isSunlightSimulated()) - return EnumErrorCode.NOSKY.ordinal(); + return EnumErrorCode.NOSKY; // / And finally climate check if (!checkSuitableClimate(housing.getTemperature(), housing.getHumidity())) - return EnumErrorCode.INVALIDBIOME.ordinal(); + return EnumErrorCode.INVALIDBIOME; - return EnumErrorCode.OK.ordinal(); + return EnumErrorCode.OK; } private boolean canWorkAtNight() { diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java index fc74aa51b..d5a8210d5 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java +++ b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java @@ -19,7 +19,7 @@ import net.minecraft.world.World; import forestry.api.apiculture.IBee; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/apiculture/items/ItemBiomefinder.java b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java index a7c8b1909..a77af1765 100755 --- a/src/main/java/forestry/apiculture/items/ItemBiomefinder.java +++ b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java @@ -30,7 +30,7 @@ import forestry.api.apiculture.IBee; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.apiculture.render.TextureBiomefinder; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java index 216c03e6e..fb12ac95b 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java @@ -10,28 +10,14 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.EnumSet; - import com.mojang.authlib.GameProfile; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraftforge.common.EnumPlantType; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ILeafTickHandler; import forestry.api.arboriculture.ITree; +import forestry.api.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; @@ -50,6 +36,20 @@ import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; import forestry.core.utils.Utils; import forestry.plugins.PluginArboriculture; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.EnumPlantType; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery { @@ -438,7 +438,18 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } @Override public void setErrorState(int state) {} + + @Override + public void setErrorState(EnumErrorCode state) { + } + @Override public int getErrorOrdinal() { return 0; } + + @Override + public EnumErrorCode getErrorState() { + return null; + } + @Override public boolean addProduct(ItemStack product, boolean all) { return false; diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java index 15a63b279..d9156069e 100755 --- a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java +++ b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java @@ -19,7 +19,7 @@ import forestry.core.utils.AlyzerInventory; import forestry.api.arboriculture.ITree; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/core/EnumErrorCode.java b/src/main/java/forestry/core/EnumErrorCode.java deleted file mode 100755 index a81abd91e..000000000 --- a/src/main/java/forestry/core/EnumErrorCode.java +++ /dev/null @@ -1,138 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core; - -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.core.render.TextureManager; - -public enum EnumErrorCode { - - UNKNOWN("unknown", 0), - - OK("ok", 1), - - INVALIDBIOME("invalidBiome", 2), - - ISRAINING("isRaining", 3), - - NOTRAINING("notRaining", 4), - - NOFUEL("noFuel", 5), // Biogas & Peat-fired - - NOHEAT("noHeat", 6), // Biogas engine - - NODISPOSAL("noDisposal", 7), - - NORESOURCE("noResource", 8), - - NOTGLOOMY("notGloomy", 9), - - NOTLUCID("notLucid", 10), - - NOTDAY("notDay", 11), - - NOTNIGHT("notNight", 12), - - NOFLOWER("noFlower", 13), - - NOQUEEN("noQueen", 14), - - NODRONE("noDrone", 15), - - NOSKY("noSky", 16), - - NOSPACE("noSpace", 17), - - NORECIPE("noRecipe", 19), - - NOENERGYNET("noEnergyNet", 20), - - NOTHINGANALYZE("noSpecimen", 15), - - FORCEDCOOLDOWN("forcedCooldown", 21), - - NOHONEY("noHoney", 22), - - NOTPOSTPAID("notPostpaid", "noStamps", 23), - - NORECIPIENT("noRecipient", 24), - - NOTALPHANUMERIC("notAlphaNumeric", 25), - - NOTUNIQUE("notUnique", 26), - - NOSTAMPS("noStamps", 23), - - NOCIRCUITBOARD("noCircuitBoard", 28), - - WRONGSTACKSIZE("wrongStacksize", 26), - - NOFERTILIZER("noFertilizer", 5), - - NOFARMLAND("noFarmland", 27), - - CIRCUITMISMATCH("circuitMismatch", 26), - - NOLIQUID("noLiquid", 29), - - NOPAPER("noPaper", 30), - - NOSTAMPSNOPAPER("noStampsNoPaper", "noStamps", 31), - - NOSUPPLIES("noSupplies", "noResource", 32), - - NOTRADE("noTrade", "noResource", 33), - - NOPOWER("noPower", 34); - - private String name; - private String iconName; - @SideOnly(Side.CLIENT) - private IIcon icon; - - private EnumErrorCode(String name, int iconIndex) { - this(name, name, iconIndex); - } - - private EnumErrorCode(String name, String iconName, int iconIndex) { - this.name = name; - this.iconName = iconName; - } - - public String getDescription() { - return "errors." + name + ".desc"; - } - - public String getHelp() { - return "errors." + name + ".help"; - } - - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - icon = TextureManager.getInstance().registerTex(register, "errors/" + iconName); - } - - @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return icon; - } - - @SideOnly(Side.CLIENT) - public static void initIcons(IIconRegister register) { - for (EnumErrorCode code : values()) - code.registerIcons(register); - } -} diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index 85367a37e..4be006a84 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -10,24 +10,22 @@ ******************************************************************************/ package forestry.core; -import net.minecraft.item.ItemStack; - import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.oredict.OreDictionary; - +import forestry.api.core.EnumErrorCode; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPickupHandler; import forestry.core.interfaces.ISaveEventHandler; import forestry.core.render.TextureManager; import forestry.core.utils.LiquidHelper; import forestry.plugins.PluginManager; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.oredict.OreDictionary; public class EventHandlerCore { diff --git a/src/main/java/forestry/core/circuits/ItemSolderingIron.java b/src/main/java/forestry/core/circuits/ItemSolderingIron.java index ab6df7e8c..8235b75f1 100755 --- a/src/main/java/forestry/core/circuits/ItemSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ItemSolderingIron.java @@ -25,7 +25,7 @@ import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ISolderManager; import forestry.api.core.ForestryAPI; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.items.ItemForestry; import forestry.core.network.GuiId; diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 05b840f06..4d8b24d6e 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -19,7 +19,6 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.Packet; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -29,7 +28,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.fluids.TankManager; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; @@ -38,9 +37,6 @@ import forestry.core.fluids.Fluids; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; -import forestry.core.network.PacketIds; -import forestry.core.network.PacketInventoryStack; -import forestry.core.proxy.Proxies; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.inventory.InvTools; import forestry.core.inventory.wrappers.IInvSlot; diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index 6ba439961..5f5315f12 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -16,7 +16,7 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.Optional; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/core/gui/ErrorLedger.java b/src/main/java/forestry/core/gui/ErrorLedger.java index 95bc545dd..7c1ffc88e 100755 --- a/src/main/java/forestry/core/gui/ErrorLedger.java +++ b/src/main/java/forestry/core/gui/ErrorLedger.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.utils.StringUtil; diff --git a/src/main/java/forestry/core/interfaces/IErrorSource.java b/src/main/java/forestry/core/interfaces/IErrorSource.java index c67a5b535..342a2ad35 100755 --- a/src/main/java/forestry/core/interfaces/IErrorSource.java +++ b/src/main/java/forestry/core/interfaces/IErrorSource.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.core.interfaces; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; public interface IErrorSource { diff --git a/src/main/java/forestry/core/network/PacketTileUpdate.java b/src/main/java/forestry/core/network/PacketTileUpdate.java index 6dc309a42..e9443ca13 100755 --- a/src/main/java/forestry/core/network/PacketTileUpdate.java +++ b/src/main/java/forestry/core/network/PacketTileUpdate.java @@ -19,7 +19,7 @@ import net.minecraftforge.common.util.ForgeDirection; import com.mojang.authlib.GameProfile; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.gadgets.TileForestry; import forestry.core.utils.EnumAccess; diff --git a/src/main/java/forestry/core/triggers/TriggerMissingDrone.java b/src/main/java/forestry/core/triggers/TriggerMissingDrone.java index b190af196..2316aeffd 100755 --- a/src/main/java/forestry/core/triggers/TriggerMissingDrone.java +++ b/src/main/java/forestry/core/triggers/TriggerMissingDrone.java @@ -12,7 +12,7 @@ package forestry.core.triggers; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/forestry/core/triggers/TriggerMissingQueen.java b/src/main/java/forestry/core/triggers/TriggerMissingQueen.java index d76c2ef9f..210942222 100755 --- a/src/main/java/forestry/core/triggers/TriggerMissingQueen.java +++ b/src/main/java/forestry/core/triggers/TriggerMissingQueen.java @@ -12,7 +12,7 @@ package forestry.core.triggers; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index bbc8b282b..3067baa5a 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -27,7 +27,7 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.TankManager; diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 3db40fe3f..66783503d 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -16,7 +16,7 @@ import cpw.mods.fml.common.registry.GameData; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.TemperatureState; import forestry.core.config.Config; import forestry.core.config.Defaults; diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index 5951f515e..21c80ae32 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -22,7 +22,7 @@ import ic2.api.energy.prefab.BasicSink; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.ForestryAPI; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.TemperatureState; import forestry.core.config.Config; import forestry.core.config.Defaults; diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 8527de339..9ea87e404 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -27,10 +27,9 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; -import forestry.core.fluids.tanks.StandardTank; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.TankManager; import forestry.core.gadgets.TileBase; @@ -45,7 +44,6 @@ import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.plugins.PluginIC2; import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; public class MachineGenerator extends TileBase implements ISpecialInventory, ILiquidTankContainer, IRenderableMachine { diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index b35550b31..abb7b3b17 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -14,7 +14,7 @@ import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICraftingProvider; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.TankManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 61634920f..b3f7cd37e 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -12,7 +12,7 @@ package forestry.factory.gadgets; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICarpenterManager; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index fd1ab9015..c0b2f53be 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -15,7 +15,7 @@ import cpw.mods.fml.common.Optional; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.ICentrifugeManager; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.gadgets.TileBase; diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 0be0b9c4b..9b7756944 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index d808e6aca..51e501c43 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -16,7 +16,7 @@ import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IFermenterManager; import forestry.api.recipes.IVariableFermentable; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.TankManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 0292f1589..33b64ded6 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -17,13 +17,12 @@ import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.IMoistenerManager; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; -import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.interfaces.IRenderableMachine; import forestry.core.network.EntityNetData; diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index 8aed4a2b0..33bc77014 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -14,7 +14,7 @@ import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; import forestry.api.core.EnumHumidity; import forestry.api.core.ForestryAPI; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.TankManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 52120b869..ff01ec289 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -13,7 +13,7 @@ package forestry.factory.gadgets; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.ISqueezerManager; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.TankManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index 486e02fa4..aeba8b5f9 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -13,7 +13,7 @@ package forestry.factory.gadgets; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IStillManager; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.TankManager; diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 349c03e32..29ba8df0d 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -45,7 +45,7 @@ import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmListener; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmable; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.GameMode; import forestry.core.config.Config; import forestry.core.config.Defaults; diff --git a/src/main/java/forestry/farming/gadgets/TileGearbox.java b/src/main/java/forestry/farming/gadgets/TileGearbox.java index 2168b9c3d..eee383345 100644 --- a/src/main/java/forestry/farming/gadgets/TileGearbox.java +++ b/src/main/java/forestry/farming/gadgets/TileGearbox.java @@ -12,7 +12,7 @@ package forestry.farming.gadgets; import forestry.api.core.ITileStructure; import forestry.api.farming.IFarmHousing; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.gadgets.TileForestry; import forestry.core.interfaces.IPowerHandler; import forestry.energy.EnergyManager; diff --git a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java index 8d037ae50..a7f66e480 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java @@ -19,7 +19,7 @@ import forestry.core.utils.AlyzerInventory; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.api.lepidopterology.IButterfly; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index abd4107ad..0c3357ddf 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -16,7 +16,7 @@ import forestry.api.core.ForestryAPI; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.gadgets.TileBase; import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index fbdfc755d..d143399e1 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -25,7 +25,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.ForestryAPI; import forestry.api.mail.ILetter; -import forestry.core.EnumErrorCode; +import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; From 53f512d7aaa984824ed49cbf94c6e40c18862ebb Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 16 Nov 2014 18:23:11 -0800 Subject: [PATCH 4/4] Improve performance of reading bees from NBT --- .../apiculture/genetics/BeeTemplates.java | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/BeeTemplates.java b/src/main/java/forestry/apiculture/genetics/BeeTemplates.java index 014422631..7a57519bf 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeTemplates.java +++ b/src/main/java/forestry/apiculture/genetics/BeeTemplates.java @@ -15,6 +15,8 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IMutation; import forestry.core.genetics.Allele; +import java.util.Arrays; + public class BeeTemplates { // / MUTATIONS @@ -98,24 +100,27 @@ public class BeeTemplates { public static IMutation vengefulB; public static IMutation avengingA; + public static IAllele[] defaultTemplate; + public static IAllele[] getDefaultTemplate() { - IAllele[] alleles = new IAllele[EnumBeeChromosome.values().length]; + if (defaultTemplate == null) { + defaultTemplate = new IAllele[EnumBeeChromosome.values().length]; - alleles[EnumBeeChromosome.SPECIES.ordinal()] = Allele.speciesForest; - alleles[EnumBeeChromosome.SPEED.ordinal()] = Allele.speedSlowest; - alleles[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.lifespanShorter; - alleles[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.fertilityNormal; - alleles[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.toleranceNone; - alleles[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.boolFalse; - alleles[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.toleranceNone; - alleles[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.boolFalse; - alleles[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.boolFalse; - alleles[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowersVanilla; - alleles[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.floweringSlowest; - alleles[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.territoryDefault; - alleles[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNone; - - return alleles; + defaultTemplate[EnumBeeChromosome.SPECIES.ordinal()] = Allele.speciesForest; + defaultTemplate[EnumBeeChromosome.SPEED.ordinal()] = Allele.speedSlowest; + defaultTemplate[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.lifespanShorter; + defaultTemplate[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.fertilityNormal; + defaultTemplate[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.toleranceNone; + defaultTemplate[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.boolFalse; + defaultTemplate[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.toleranceNone; + defaultTemplate[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.boolFalse; + defaultTemplate[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.boolFalse; + defaultTemplate[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowersVanilla; + defaultTemplate[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.floweringSlowest; + defaultTemplate[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.territoryDefault; + defaultTemplate[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNone; + } + return Arrays.copyOf(defaultTemplate, defaultTemplate.length); } // / COMMON BRANCH