From ccdcce47cc77eb24102234c55d6d52ec7df89d50 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Mon, 15 Dec 2014 07:45:10 -0800 Subject: [PATCH] Fixes #369 The Solding Iron and other Cicruit stuff should no longer crash if no layouts are defined. The fix kind of grew out of control because I had to add a new EnumErrorCode and didn't want to keep breaking the API every time I did that. So I needed to decouple the ErrorStates from EnumErrorCode. --- api | 2 +- lang | 2 +- .../forestry/apiculture/BeekeepingLogic.java | 7 +- .../apiculture/gadgets/TileAlvearyPlain.java | 7 +- .../apiculture/gadgets/TileBeehouse.java | 4 +- .../genetics/AlleleEffectThrottled.java | 12 +- .../forestry/apiculture/genetics/Bee.java | 2 +- .../apiculture/items/ItemBeealyzer.java | 2 +- .../apiculture/items/ItemBiomefinder.java | 2 +- .../trigger/TriggerMissingDrone.java | 2 +- .../trigger/TriggerMissingQueen.java | 2 +- .../arboriculture/gadgets/TileLeaves.java | 5 +- .../arboriculture/items/ItemTreealyzer.java | 2 +- .../java/forestry/core/EnumErrorCode.java | 105 ++++++++++++++++++ .../java/forestry/core/EventHandlerCore.java | 4 +- src/main/java/forestry/core/ForestryCore.java | 2 + .../core/circuits/CircuitBoardManager.java | 14 --- .../forestry/core/circuits/CircuitLayout.java | 4 +- .../core/circuits/CircuitRegistry.java | 29 +++-- .../core/circuits/ItemSolderingIron.java | 81 ++++++-------- .../forestry/core/gadgets/TileAnalyzer.java | 2 +- .../forestry/core/gadgets/TileForestry.java | 10 +- .../java/forestry/core/gui/ErrorLedger.java | 12 +- .../core/interfaces/IErrorSource.java | 4 +- .../core/network/PacketTileUpdate.java | 23 ++-- .../java/forestry/core/proxy/ProxyLog.java | 31 ++++++ .../forestry/core/utils/RevolvingList.java | 69 ++++++++++++ .../forestry/energy/gadgets/EngineBronze.java | 2 +- .../forestry/energy/gadgets/EngineCopper.java | 2 +- .../forestry/energy/gadgets/EngineTin.java | 2 +- .../energy/gadgets/MachineGenerator.java | 2 +- .../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 | 2 +- .../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 +- .../textures/items/errors/noCircuitLayout.png | Bin 0 -> 370 bytes 46 files changed, 336 insertions(+), 141 deletions(-) create mode 100644 src/main/java/forestry/core/EnumErrorCode.java delete mode 100755 src/main/java/forestry/core/circuits/CircuitBoardManager.java create mode 100644 src/main/java/forestry/core/utils/RevolvingList.java create mode 100644 src/main/resources/assets/forestry/textures/items/errors/noCircuitLayout.png diff --git a/api b/api index c2f49cd4d..89067121c 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit c2f49cd4d292a7023d2310d81c24c54269b15d14 +Subproject commit 89067121c057bda5c535bf7a46c0112e245e311b diff --git a/lang b/lang index 71f517c5a..ab16b1a2e 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 71f517c5a6d4bb564b3996822b84da91bff791f3 +Subproject commit ab16b1a2efc80aa48e70d81c8859fd83e143a98f diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index fa1c70e86..19ccf272f 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -23,10 +23,12 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IIndividual; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; +import forestry.api.core.IErrorState; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; +import forestry.core.proxy.ProxyLog; import forestry.plugins.PluginApiculture; public class BeekeepingLogic implements IBeekeepingLogic { @@ -261,7 +263,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { try { boolean canWork = true; // Not while raining, at night or without light - EnumErrorCode state = queen.canWork(housing); + IErrorState state = queen.canWork(housing); if (state != EnumErrorCode.OK) { housing.setErrorState(state); canWork = false; @@ -270,6 +272,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { } return canWork; } catch (Error e) { + Proxies.log.logErrorAPI("Forestry", e, IBee.class); return queenCanWorkDeprecated(); } } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 13c3ff600..4b1dd4b44 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -18,10 +18,11 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.core.BiomeHelper; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; +import forestry.api.core.IErrorState; import forestry.api.core.ISpecialInventory; import forestry.api.core.ITileStructure; import forestry.api.genetics.IIndividual; @@ -424,7 +425,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS @Override public int getErrorOrdinal() { - return getErrorState().ordinal(); + return getErrorState().getID(); } @Override @@ -803,7 +804,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS /* IERRORSOURCE */ @Override - public EnumErrorCode getErrorState() { + public IErrorState getErrorState() { if (hasMaster()) { ITileStructure tile = this.getCentralTE(); if (tile != null) diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index d343f4a03..337d16656 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -15,7 +15,7 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; @@ -351,7 +351,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised { @Override public int getErrorOrdinal() { - return getErrorState().ordinal(); + return getErrorState().getID(); } @Override diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java index dfd554053..4fe7543a8 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.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.genetics.Allele; import forestry.core.genetics.EffectData; import forestry.core.utils.Vect; @@ -55,14 +55,14 @@ public abstract class AlleleEffectThrottled extends Allele implements IAlleleBee public boolean isHalted(IEffectData storedData, IBeeHousing housing) { - if (requiresWorkingQueen && housing.getErrorOrdinal() != EnumErrorCode.OK.ordinal()) + if (requiresWorkingQueen && housing.getErrorState() != EnumErrorCode.OK) return true; - int throttle = storedData.getInteger(0); - throttle++; - storedData.setInteger(0, throttle); + int throt = storedData.getInteger(0); + throt++; + storedData.setInteger(0, throt); - if (throttle < getThrottle()) + if (throt < getThrottle()) return true; // Reset since we are done throttling. diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 9a774a9bd..ea52b7f6e 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -20,7 +20,7 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeMutation; import forestry.api.apiculture.IBeekeepingMode; import forestry.api.core.BiomeHelper; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java index d5a8210d5..fc74aa51b 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.api.core.EnumErrorCode; +import forestry.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 a77af1765..a7c8b1909 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.api.core.EnumErrorCode; +import forestry.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/trigger/TriggerMissingDrone.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java index 7a8199113..5d3e99c2b 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java @@ -12,7 +12,7 @@ package forestry.apiculture.trigger; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.triggers.Trigger; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java index 12f38c772..89c2005a4 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java @@ -12,7 +12,7 @@ package forestry.apiculture.trigger; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.triggers.Trigger; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java index 21c07f8ce..0c474ea9b 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java @@ -17,9 +17,10 @@ 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.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorState; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IFruitBearer; @@ -442,7 +443,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public void setErrorState(int state) {} @Override - public void setErrorState(EnumErrorCode state) { + public void setErrorState(IErrorState state) { } @Override public int getErrorOrdinal() { return 0; } diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java index d9156069e..15a63b279 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.api.core.EnumErrorCode; +import forestry.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 new file mode 100644 index 000000000..6fcaa0fa8 --- /dev/null +++ b/src/main/java/forestry/core/EnumErrorCode.java @@ -0,0 +1,105 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +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.api.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; + +public enum EnumErrorCode implements IErrorState { + + UNKNOWN("unknown"), + OK("ok"), + INVALIDBIOME("invalidBiome"), + ISRAINING("isRaining"), + NOTRAINING("notRaining"), + NOFUEL("noFuel"), // Biogas & Peat-fired + NOHEAT("noHeat"), // Biogas engine + NODISPOSAL("noDisposal"), + NORESOURCE("noResource"), + NOTGLOOMY("notGloomy"), + NOTLUCID("notLucid"), + NOTDAY("notDay"), + NOTNIGHT("notNight"), + NOFLOWER("noFlower"), + NOQUEEN("noQueen"), + NODRONE("noDrone"), + NOSKY("noSky"), + NOSPACE("noSpace"), + NORECIPE("noRecipe"), + NOENERGYNET("noEnergyNet"), + NOTHINGANALYZE("noSpecimen"), + FORCEDCOOLDOWN("forcedCooldown"), + NOHONEY("noHoney"), + NOTPOSTPAID("notPostpaid", "noStamps"), + NORECIPIENT("noRecipient"), + NOTALPHANUMERIC("notAlphaNumeric"), + NOTUNIQUE("notUnique"), + NOSTAMPS("noStamps"), + NOCIRCUITBOARD("noCircuitBoard"), + NOCIRCUITLAYOUT("noCircuitLayout"), + WRONGSTACKSIZE("wrongStacksize"), + NOFERTILIZER("noFertilizer"), + NOFARMLAND("noFarmland"), + CIRCUITMISMATCH("circuitMismatch"), + NOLIQUID("noLiquid"), + NOPAPER("noPaper"), + NOSTAMPSNOPAPER("noStampsNoPaper", "noStamps"), + NOSUPPLIES("noSupplies", "noResource"), + NOTRADE("noTrade", "noResource"), + NOPOWER("noPower"); + + private String name; + private String iconName; + @SideOnly(Side.CLIENT) + private IIcon icon; + + private EnumErrorCode(String name) { + this(name, name); + } + + private EnumErrorCode(String name, String iconName) { + this.name = name; + this.iconName = iconName; + } + + @Override + public String getDescription() { + return "errors." + name + ".desc"; + } + + @Override + public String getHelp() { + return "errors." + name + ".help"; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister register) { + icon = register.registerIcon("forestry:errors/" + iconName); + } + + @SideOnly(Side.CLIENT) + @Override + public IIcon getIcon() { + return icon; + } + + @Override + public short getID() { + return (short) ordinal(); + } + + public static void init() { + for (IErrorState code : values()) { + ErrorStateRegistry.registerErrorState(code); + } + } +} diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index c3b3df08c..13c061bac 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -21,8 +21,8 @@ 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 forestry.api.core.ErrorStateRegistry; -import forestry.api.core.EnumErrorCode; import forestry.core.fluids.Fluids; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPickupHandler; @@ -87,7 +87,7 @@ public class EventHandlerCore { @SideOnly(Side.CLIENT) public void handleTextureRemap(TextureStitchEvent.Pre event) { if(event.map.getTextureType() == 1) { - EnumErrorCode.initIcons(event.map); + ErrorStateRegistry.initIcons(event.map); TextureManager.getInstance().initDefaultIcons(event.map); } else if(event.map.getTextureType() == 0) Fluids.resetFluidIcons(event.map); diff --git a/src/main/java/forestry/core/ForestryCore.java b/src/main/java/forestry/core/ForestryCore.java index 29f61b83a..2b797d3af 100755 --- a/src/main/java/forestry/core/ForestryCore.java +++ b/src/main/java/forestry/core/ForestryCore.java @@ -58,6 +58,8 @@ public class ForestryCore { Config.load(); if (!Config.disableVersionCheck) Version.versionCheck(); + + EnumErrorCode.init(); PluginManager.runPreInit(); } diff --git a/src/main/java/forestry/core/circuits/CircuitBoardManager.java b/src/main/java/forestry/core/circuits/CircuitBoardManager.java deleted file mode 100755 index 7de2ccfdd..000000000 --- a/src/main/java/forestry/core/circuits/CircuitBoardManager.java +++ /dev/null @@ -1,14 +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.circuits; - -public class CircuitBoardManager { -} diff --git a/src/main/java/forestry/core/circuits/CircuitLayout.java b/src/main/java/forestry/core/circuits/CircuitLayout.java index e649a9017..60cb2d29d 100755 --- a/src/main/java/forestry/core/circuits/CircuitLayout.java +++ b/src/main/java/forestry/core/circuits/CircuitLayout.java @@ -28,11 +28,11 @@ public class CircuitLayout implements ICircuitLayout { @Override public String getName() { - return StringUtil.localize("layout." + this.uid); + return StringUtil.localize("circuit.layout." + this.uid + ".name"); } @Override public String getUsage() { - return StringUtil.localize("usage." + this.uid); + return StringUtil.localize("circuit.layout." + this.uid + ".usage"); } } diff --git a/src/main/java/forestry/core/circuits/CircuitRegistry.java b/src/main/java/forestry/core/circuits/CircuitRegistry.java index bfcac9040..3d316449f 100755 --- a/src/main/java/forestry/core/circuits/CircuitRegistry.java +++ b/src/main/java/forestry/core/circuits/CircuitRegistry.java @@ -23,12 +23,19 @@ import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitLibrary; import forestry.api.circuits.ICircuitRegistry; import forestry.core.config.ForestryItem; +import java.util.Map; public class CircuitRegistry implements ICircuitRegistry { - private final LinkedHashMap layoutMap = new LinkedHashMap(); - private final LinkedHashMap circuitMap = new LinkedHashMap(); - private final HashMap legacyMap = new HashMap(); + public static final ICircuitLayout DUMMY_LAYOUT = new CircuitLayout("dummy"); + public static final Map DUMMY_MAP = new LinkedHashMap(); + private final Map layoutMap = new LinkedHashMap(); + private final Map circuitMap = new LinkedHashMap(); + private final Map legacyMap = new HashMap(); + + static { + DUMMY_MAP.put("dummy", DUMMY_LAYOUT); + } @Override public ICircuitLibrary getCircuitLibrary(World world, String playername) { @@ -47,12 +54,16 @@ public class CircuitRegistry implements ICircuitRegistry { public ICircuitLayout getDefaultLayout() { if (layoutMap.containsKey("forestry.engine.tin")) return layoutMap.get("forestry.engine.tin"); - else + else if (!layoutMap.isEmpty()) return layoutMap.values().iterator().next(); + else + return DUMMY_LAYOUT; } @Override - public LinkedHashMap getRegisteredLayouts() { + public Map getRegisteredLayouts() { + if (layoutMap.isEmpty()) + return DUMMY_MAP; return layoutMap; } @@ -71,7 +82,7 @@ public class CircuitRegistry implements ICircuitRegistry { /* CIRCUITS */ @Override - public HashMap getRegisteredCircuits() { + public Map getRegisteredCircuits() { return circuitMap; } @@ -100,14 +111,12 @@ public class CircuitRegistry implements ICircuitRegistry { public void initialize() { } - - - + @Override public boolean isChipset(ItemStack itemstack) { return ForestryItem.circuitboards.isItemEqual(itemstack); } - + @Override public ICircuitBoard getCircuitboard(ItemStack itemstack) { NBTTagCompound nbttagcompound = itemstack.getTagCompound(); diff --git a/src/main/java/forestry/core/circuits/ItemSolderingIron.java b/src/main/java/forestry/core/circuits/ItemSolderingIron.java index 0a6e3413e..3c213d4fb 100755 --- a/src/main/java/forestry/core/circuits/ItemSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ItemSolderingIron.java @@ -12,8 +12,6 @@ package forestry.core.circuits; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; -import java.util.Map.Entry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -25,16 +23,19 @@ import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ISolderManager; import forestry.api.core.ForestryAPI; -import forestry.api.core.EnumErrorCode; +import forestry.api.core.IErrorState; +import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.items.ItemForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemInventory; +import forestry.core.utils.RevolvingList; public class ItemSolderingIron extends ItemForestry implements ISolderingIron { public static class CircuitRecipe { + private final ICircuitLayout layout; private final ItemStack resource; public final ICircuit circuit; @@ -54,6 +55,7 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } public static class SolderManager implements ISolderManager { + public static final ArrayList recipes = new ArrayList(); @Override @@ -71,9 +73,10 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { if (layout == null || resource == null) return null; - for (CircuitRecipe recipe : recipes) + for (CircuitRecipe recipe : recipes) { if (recipe.matches(layout, resource)) return recipe; + } return null; } @@ -82,7 +85,7 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { // / INVENTORY MANAGMENT public static class SolderingInventory extends ItemInventory implements IErrorSource { - private ICircuitLayout layout; + private final RevolvingList layouts = new RevolvingList(ChipsetManager.circuitRegistry.getRegisteredLayouts().values()); private EnumErrorCode errorState; private final short blankSlot = 0; @@ -91,57 +94,32 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { public SolderingInventory() { super(ItemSolderingIron.class, 6); - layout = ChipsetManager.circuitRegistry.getDefaultLayout(); + init(); } public SolderingInventory(ItemStack itemstack) { super(ItemSolderingIron.class, 6, itemstack); - layout = ChipsetManager.circuitRegistry.getDefaultLayout(); + init(); + } + + private void init() { + layouts.setCurrent(ChipsetManager.circuitRegistry.getDefaultLayout()); } public ICircuitLayout getLayout() { - return this.layout; + return layouts.getCurrent(); } public void setLayout(String uid) { - this.layout = ChipsetManager.circuitRegistry.getLayout(uid); + layouts.setCurrent(ChipsetManager.circuitRegistry.getLayout(uid)); } public void advanceLayout() { - Iterator> it = ChipsetManager.circuitRegistry.getRegisteredLayouts().entrySet().iterator(); - while (it.hasNext()) { - Entry entry = it.next(); - if (entry.getKey().equals(layout.getUID())) { - - if (it.hasNext()) - layout = it.next().getValue(); - else - layout = ChipsetManager.circuitRegistry.getRegisteredLayouts().entrySet().iterator().next().getValue(); - - break; - } - } + layouts.rotateRight(); } public void regressLayout() { - Iterator> it = ChipsetManager.circuitRegistry.getRegisteredLayouts().entrySet().iterator(); - - ICircuitLayout previous = null; - while (it.hasNext()) { - Entry entry = it.next(); - if (entry.getKey().equals(layout.getUID())) { - - if (previous != null) - layout = previous; - else - while (it.hasNext()) - layout = it.next().getValue(); - - break; - } - - previous = entry.getValue(); - } + layouts.rotateLeft(); } private Collection getCircuits(EnumCircuitBoardType type, boolean doConsume) { @@ -153,7 +131,7 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { if (ingredient == null) continue; - CircuitRecipe recipe = SolderManager.getMatchingRecipe(layout, ingredient); + CircuitRecipe recipe = SolderManager.getMatchingRecipe(layouts.getCurrent(), ingredient); if (recipe == null) continue; @@ -170,16 +148,18 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } public void trySolder() { - - // Requires blank slot - if (inventoryStacks[blankSlot] == null) + if (layouts.getCurrent() == CircuitRegistry.DUMMY_LAYOUT) return; - if (inventoryStacks[blankSlot].stackSize > 1) + + ItemStack blank = inventoryStacks[blankSlot]; + // Requires blank slot + if (blank == null) + return; + if (blank.stackSize > 1) return; if (inventoryStacks[finishedSlot] != null) return; - ItemStack blank = inventoryStacks[blankSlot]; // Need a chipset item if (!ChipsetManager.circuitRegistry.isChipset(blank)) return; @@ -199,15 +179,16 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } circuits = getCircuits(type, true); - inventoryStacks[finishedSlot] = ItemCircuitBoard.createCircuitboard(type, layout, circuits.toArray(new ICircuit[circuits.size()])); + inventoryStacks[finishedSlot] = ItemCircuitBoard.createCircuitboard(type, layouts.getCurrent(), circuits.toArray(new ICircuit[circuits.size()])); inventoryStacks[blankSlot] = null; } public int getCount(ICircuit circuit, ArrayList circuits) { int count = 0; - for (ICircuit other : circuits) + for (ICircuit other : circuits) { if (other.getUID().equals(circuit.getUID())) count++; + } return count; } @@ -231,7 +212,9 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } @Override - public EnumErrorCode getErrorState() { + public IErrorState getErrorState() { + if (layouts.getCurrent() == CircuitRegistry.DUMMY_LAYOUT) + return EnumErrorCode.NOCIRCUITLAYOUT; if (inventoryStacks[blankSlot] == null) return EnumErrorCode.NOCIRCUITBOARD; if (inventoryStacks[blankSlot].stackSize > 1) diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index daa496611..537fe6a03 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -26,7 +26,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index a6e1aedcd..bc49ad212 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -16,7 +16,8 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.Optional; -import forestry.api.core.EnumErrorCode; +import forestry.api.core.IErrorState; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.interfaces.IErrorSource; @@ -186,9 +187,9 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit this.sendNetworkUpdate(); } // / ERROR HANDLING - public EnumErrorCode errorState = EnumErrorCode.OK; + public IErrorState errorState = EnumErrorCode.OK; - public void setErrorState(EnumErrorCode state) { + public void setErrorState(IErrorState state) { if (this.errorState == state) return; this.errorState = state; @@ -201,7 +202,7 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit } @Override - public EnumErrorCode getErrorState() { + public IErrorState getErrorState() { return errorState; } // / OWNERSHIP @@ -288,6 +289,7 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit /** * Gets the tile's unlocalized name, based on the block at the location of this entity (client-only). + * @return */ public String getUnlocalizedName() { String blockUnlocalizedName = getBlockType().getUnlocalizedName().replace("tile.for.",""); diff --git a/src/main/java/forestry/core/gui/ErrorLedger.java b/src/main/java/forestry/core/gui/ErrorLedger.java index 7c1ffc88e..7ea4c454b 100755 --- a/src/main/java/forestry/core/gui/ErrorLedger.java +++ b/src/main/java/forestry/core/gui/ErrorLedger.java @@ -10,7 +10,8 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; +import forestry.api.core.IErrorState; import forestry.core.interfaces.IErrorSource; import forestry.core.utils.StringUtil; @@ -30,7 +31,7 @@ public class ErrorLedger extends Ledger { @Override public void draw(int x, int y) { - EnumErrorCode state = tile.getErrorState(); + IErrorState state = tile.getErrorState(); if (state == EnumErrorCode.OK) return; @@ -52,11 +53,8 @@ public class ErrorLedger extends Ledger { @Override public boolean isVisible() { - EnumErrorCode state = tile.getErrorState(); - if (state == EnumErrorCode.OK) - return false; - else - return true; + IErrorState state = tile.getErrorState(); + return state != EnumErrorCode.OK; } @Override diff --git a/src/main/java/forestry/core/interfaces/IErrorSource.java b/src/main/java/forestry/core/interfaces/IErrorSource.java index 342a2ad35..019c03f78 100755 --- a/src/main/java/forestry/core/interfaces/IErrorSource.java +++ b/src/main/java/forestry/core/interfaces/IErrorSource.java @@ -10,12 +10,12 @@ ******************************************************************************/ package forestry.core.interfaces; -import forestry.api.core.EnumErrorCode; +import forestry.api.core.IErrorState; public interface IErrorSource { boolean throwsErrors(); - EnumErrorCode getErrorState(); + IErrorState getErrorState(); } diff --git a/src/main/java/forestry/core/network/PacketTileUpdate.java b/src/main/java/forestry/core/network/PacketTileUpdate.java index e9443ca13..819d94eb7 100755 --- a/src/main/java/forestry/core/network/PacketTileUpdate.java +++ b/src/main/java/forestry/core/network/PacketTileUpdate.java @@ -18,15 +18,17 @@ import java.util.UUID; import net.minecraftforge.common.util.ForgeDirection; import com.mojang.authlib.GameProfile; +import forestry.api.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.gadgets.TileForestry; import forestry.core.utils.EnumAccess; public class PacketTileUpdate extends PacketUpdate { private ForgeDirection orientation = ForgeDirection.WEST; - private EnumErrorCode errorState = EnumErrorCode.OK; + private IErrorState errorState = EnumErrorCode.OK; private boolean isOwnable = false; private EnumAccess access = EnumAccess.SHARED; @@ -57,11 +59,14 @@ public class PacketTileUpdate extends PacketUpdate { data.writeInt(posY); data.writeInt(posZ); - data.writeInt(this.orientation.ordinal()); - data.writeInt(this.errorState.ordinal()); + data.writeByte(this.orientation.ordinal()); + data.writeShort(this.errorState.getID()); + // TODO: Should this really be sent to the client? Huge network cost. + // As far as I know, only GUIs need it, and there are better ways to get the information to a GUI. + // -CovertJaguar if (isOwnable) { - data.writeInt(access.ordinal()); + data.writeByte(access.ordinal()); if (owner == null) { data.writeBoolean(false); } else { @@ -83,10 +88,10 @@ public class PacketTileUpdate extends PacketUpdate { posY = data.readInt(); posZ = data.readInt(); - orientation = ForgeDirection.values()[data.readInt()]; - errorState = EnumErrorCode.values()[data.readInt()]; + orientation = ForgeDirection.getOrientation(data.readByte()); + errorState = ErrorStateRegistry.getErrorStateFromCode(data.readShort()); - int ordinal = data.readInt(); + int ordinal = data.readByte(); isOwnable = ordinal >= 0; if (isOwnable) { access = EnumAccess.values()[ordinal]; @@ -105,7 +110,7 @@ public class PacketTileUpdate extends PacketUpdate { return this.orientation; } - public EnumErrorCode getErrorState() { + public IErrorState getErrorState() { return this.errorState; } diff --git a/src/main/java/forestry/core/proxy/ProxyLog.java b/src/main/java/forestry/core/proxy/ProxyLog.java index 4d6d21c1f..7b4e168dc 100755 --- a/src/main/java/forestry/core/proxy/ProxyLog.java +++ b/src/main/java/forestry/core/proxy/ProxyLog.java @@ -101,4 +101,35 @@ public class ProxyLog { LogManager.getLogger(Defaults.MOD).log(logLevel, new MessageFormatMessage(String.format(message, params), params)); } + /* EXCEPTIONS */ + public void logThrowable(String msg, Throwable error, Object... args) { + logThrowable(Level.ERROR, msg, 3, error, args); + } + + public void logThrowable(String msg, int lines, Throwable error, Object... args) { + logThrowable(Level.ERROR, msg, lines, error, args); + } + + public void logThrowable(Level level, String msg, int lines, Throwable error, Object... args) { + StackTraceElement[] oldtrace = error.getStackTrace(); + if (lines < oldtrace.length) { + StackTraceElement[] newtrace = new StackTraceElement[lines]; + System.arraycopy(oldtrace, 0, newtrace, 0, newtrace.length); + error.setStackTrace(newtrace); + } + LogManager.getLogger(Defaults.MOD).log(level, new MessageFormatMessage(msg, args), error); + } + + public void logErrorAPI(String mod, Throwable error, Class classFile) { + StringBuilder msg = new StringBuilder(mod); + msg.append(" API error, please update your mods. Error: ").append(error); + logThrowable(Level.ERROR, msg.toString(), 2, error); + + if (classFile != null) { + msg = new StringBuilder(mod); + msg.append(" API error: ").append(classFile.getSimpleName()).append(" is loaded from ").append(classFile.getProtectionDomain().getCodeSource().getLocation()); + log(Level.ERROR, msg.toString()); + } + } + } diff --git a/src/main/java/forestry/core/utils/RevolvingList.java b/src/main/java/forestry/core/utils/RevolvingList.java new file mode 100644 index 000000000..7a5a385f2 --- /dev/null +++ b/src/main/java/forestry/core/utils/RevolvingList.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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.utils; + +import com.google.common.collect.ForwardingCollection; +import java.util.*; + +/** + * + * @author CovertJaguar + * @param + */ +public class RevolvingList extends ForwardingCollection { + + private final Deque list = new LinkedList(); + + public RevolvingList() { + } + + public RevolvingList(Collection collection) { + list.addAll(collection); + } + + @Override + protected Collection delegate() { + return list; + } + + public void rotateLeft() { + if (list.isEmpty()) + return; + list.addFirst(list.removeLast()); + } + + public void rotateRight() { + if (list.isEmpty()) + return; + list.addLast(list.removeFirst()); + } + + public T getCurrent() { + if (list.isEmpty()) + return null; + return list.getFirst(); + } + + public void setCurrent(T e) { + if (!contains(e)) + return; + + if (e == null) + while (getCurrent() != null) { + rotateRight(); + } + else + while (getCurrent() == null || !getCurrent().equals(e)) { + rotateRight(); + } + } + +} diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index b26ba5d61..ab9d9b245 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -24,7 +24,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 9e98ee7f9..6bb079f48 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -13,7 +13,7 @@ package forestry.energy.gadgets; import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameData; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.core.TemperatureState; diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index e584daadc..f8bfb5ec7 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.api.core.EnumErrorCode; +import forestry.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 487c65598..4b45022ae 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -21,7 +21,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 1b64b721e..f2c7d15ac 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import cpw.mods.fml.common.Optional; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICraftingProvider; import forestry.core.config.Config; diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index e1f88dbf6..43f02f007 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -32,7 +32,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICarpenterManager; import forestry.core.config.Config; diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index cf1b0a6e7..5aeb1a73e 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.api.core.EnumErrorCode; +import forestry.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 6bf4f9f12..4e6388855 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.factory.gadgets; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IFabricatorManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index 6f4061e27..146562792 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -32,7 +32,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import cpw.mods.fml.common.Optional; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IFermenterManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 1e70d4b3f..d27cec204 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -27,7 +27,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index b9ddcf208..b909c1ad6 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -25,7 +25,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.BiomeHelper; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.core.config.Config; import forestry.core.config.Defaults; diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 2760641a6..7408793ea 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -30,7 +30,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.ISqueezerManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index 60f9d3ea8..35c136765 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -27,7 +27,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IStillManager; diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 31543a143..d5e2eebc8 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.BiomeHelper; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.farming.ICrop; diff --git a/src/main/java/forestry/farming/gadgets/TileGearbox.java b/src/main/java/forestry/farming/gadgets/TileGearbox.java index 059268bf1..dd5d4ddef 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.api.core.EnumErrorCode; +import forestry.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 a7f66e480..8d037ae50 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.api.core.EnumErrorCode; +import forestry.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 afce32272..bf69b9644 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -25,7 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index d143399e1..fbdfc755d 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.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; diff --git a/src/main/resources/assets/forestry/textures/items/errors/noCircuitLayout.png b/src/main/resources/assets/forestry/textures/items/errors/noCircuitLayout.png new file mode 100644 index 0000000000000000000000000000000000000000..3c458744ff9222380bf9d81555c02bdeadc3f06f GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@p$DS^ZAr}70C$_C`PxkaY`MHV$Aix}X>98Yb9s`Fp1Fy@p z_DnZJh9~wZt|!&G+D6ifRwA@t~BEX;UARK+r21*t@YsH zU=<02&8H_DF;6f(Y!Jw%Gvh(?BF?)8O^qFEB%Vo?I2TAYtkF0W&wZ3ZTR2n1*?`Ak z8cU{wf2Wum%Os;sX(c?TxE0PO^k^F&v{3jjc*tO@z@Pby45o1&R;r$NeSqF&@O1Ta JS?83{1OR0LfFu9_ literal 0 HcmV?d00001