diff --git a/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java index 8a2e4913..3a77cd06 100644 --- a/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/gui/minecraft/ContainerCraftGUI.java @@ -31,9 +31,9 @@ import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.gui.minecraft.control.EnumHighlighting; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; +import binnie.core.machines.errors.ErrorState; +import binnie.core.machines.errors.IErrorStateSource; import binnie.core.machines.network.INetwork; -import binnie.core.machines.power.ErrorState; -import binnie.core.machines.power.IErrorStateSource; import binnie.core.machines.power.IPoweredMachine; import binnie.core.machines.power.IProcess; import binnie.core.machines.power.ITankMachine; @@ -340,7 +340,7 @@ public class ContainerCraftGUI extends Container { public void onErrorUpdate(final NBTTagCompound nbt) { this.errorType = nbt.getByte("type"); if (nbt.hasKey("name")) { - (this.error = new ErrorState("", "")).readFromNBT(nbt); + this.error = new ErrorState(nbt); } else { this.error = null; } diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java index 544b73b3..c709a0b5 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java @@ -18,7 +18,7 @@ import binnie.core.gui.minecraft.CustomSlot; import binnie.core.gui.minecraft.MinecraftTooltip; import binnie.core.gui.minecraft.Window; import binnie.core.gui.resource.minecraft.CraftGUITexture; -import binnie.core.machines.power.ErrorState; +import binnie.core.machines.errors.ErrorState; public class ControlErrorState extends Control implements ITooltip { @Nullable diff --git a/src/main/java/binnie/core/machines/power/CoreErrorCode.java b/src/main/java/binnie/core/machines/errors/CoreErrorCode.java similarity index 81% rename from src/main/java/binnie/core/machines/power/CoreErrorCode.java rename to src/main/java/binnie/core/machines/errors/CoreErrorCode.java index 57642996..e93f4022 100644 --- a/src/main/java/binnie/core/machines/power/CoreErrorCode.java +++ b/src/main/java/binnie/core/machines/errors/CoreErrorCode.java @@ -1,10 +1,12 @@ -package binnie.core.machines.power; +package binnie.core.machines.errors; import javax.annotation.Nullable; +import binnie.Constants; import binnie.core.util.I18N; public enum CoreErrorCode implements IErrorStateDefinition { + UNKNOWN("unknown"), NO_ITEM("no.item", EnumErrorType.ITEM), NO_SPACE("no.space", EnumErrorType.ITEM), NO_SPACE_TANK("no.space.tank", CoreErrorCode.NO_SPACE), @@ -15,7 +17,10 @@ public enum CoreErrorCode implements IErrorStateDefinition { TANK_DIFFRENT_FLUID("tank.different", CoreErrorCode.NO_SPACE_TANK), INSUFFICIENT_LIQUID("insufficient.liquid", EnumErrorType.TANK), NO_RECIPE("no.recipe"), - INVALID_RECIPE("invalid.recipe"); + INVALID_RECIPE("invalid.recipe"), + //Buildcraft + TASK_CANCELLED("task.cancelled"), + TASK_PAUSED("task.paused"); String name; @Nullable @@ -39,6 +44,7 @@ public enum CoreErrorCode implements IErrorStateDefinition { this.name = name; this.parent = parent; this.type = type; + ErrorStateRegistry.registerErrorState(this); } public String getDescription(){ @@ -48,7 +54,12 @@ public enum CoreErrorCode implements IErrorStateDefinition { public String getName(){ return I18N.localise("binniecore.errors." + name + ".name"); } - + + @Override + public String getUID() { + return Constants.CORE_MOD_ID + ":" + name; + } + @Override @Nullable public EnumErrorType getType() { diff --git a/src/main/java/binnie/core/machines/power/EnumErrorType.java b/src/main/java/binnie/core/machines/errors/EnumErrorType.java similarity index 88% rename from src/main/java/binnie/core/machines/power/EnumErrorType.java rename to src/main/java/binnie/core/machines/errors/EnumErrorType.java index 5c450589..825f1d7d 100644 --- a/src/main/java/binnie/core/machines/power/EnumErrorType.java +++ b/src/main/java/binnie/core/machines/errors/EnumErrorType.java @@ -1,4 +1,4 @@ -package binnie.core.machines.power; +package binnie.core.machines.errors; public enum EnumErrorType { NONE, diff --git a/src/main/java/binnie/core/machines/errors/ErrorState.java b/src/main/java/binnie/core/machines/errors/ErrorState.java new file mode 100644 index 00000000..c406294d --- /dev/null +++ b/src/main/java/binnie/core/machines/errors/ErrorState.java @@ -0,0 +1,120 @@ +package binnie.core.machines.errors; + +import net.minecraft.nbt.NBTTagCompound; + +import forestry.api.core.INbtReadable; +import forestry.api.core.INbtWritable; + +public class ErrorState implements INbtReadable, INbtWritable { + /*private String name; + private String desc;*/ + private IErrorStateDefinition nameDefinition; + private IErrorStateDefinition definition; + private int[] data; + private boolean progress; + private boolean itemError; + private boolean tankError; + private boolean powerError; + + public ErrorState(IErrorStateDefinition definition) { + this(definition, definition); + } + + public ErrorState(IErrorStateDefinition definition, int[] data) { + this(definition, definition, data); + } + + public ErrorState(IErrorStateDefinition definition, int data) { + this(definition, definition, new int[]{data}); + } + + public ErrorState(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition) { + this(nameDefinition, definition, new int[0]); + } + + public ErrorState(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition, int data) { + this(nameDefinition, definition, new int[]{data}); + } + + public ErrorState(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition, int[] data) { + EnumErrorType type = definition.getType(); + this.data = data; + this.progress = false; + this.itemError = type.isItemError(); + this.tankError = type.isTankError(); + this.powerError = type.isPowerError(); + this.nameDefinition = nameDefinition; + this.definition = definition; + } + + public ErrorState(NBTTagCompound nbtTagCompound) { + this.data = new int[0]; + this.progress = false; + this.itemError = false; + this.tankError = false; + this.powerError = false; + this.definition = CoreErrorCode.UNKNOWN; + this.nameDefinition = CoreErrorCode.UNKNOWN; + readFromNBT(nbtTagCompound); + } + + @Override + public String toString() { + return nameDefinition.getName(); + } + + public String getTooltip() { + return definition.getDescription(); + } + + public int[] getData() { + return this.data; + } + + public boolean isProgress() { + return this.progress; + } + + public void setIsProgress() { + this.progress = true; + } + + @Override + public void readFromNBT(final NBTTagCompound nbt) { + this.nameDefinition = ErrorStateRegistry.getErrorState(nbt.getString("name")); + this.definition = ErrorStateRegistry.getErrorState(nbt.getString("desc")); + this.data = nbt.getIntArray("data"); + this.itemError = nbt.getBoolean("item"); + this.tankError = nbt.getBoolean("tank"); + this.powerError = nbt.getBoolean("power"); + } + + @Override + public NBTTagCompound writeToNBT(final NBTTagCompound nbt) { + nbt.setString("name", nameDefinition.getUID()); + nbt.setString("desc", definition.getUID()); + nbt.setIntArray("data", this.data); + if (this.isItemError()) { + nbt.setBoolean("item", true); + } + if (this.isTankError()) { + nbt.setBoolean("tank", true); + } + if (this.isPowerError()) { + nbt.setBoolean("power", true); + } + return nbt; + } + + public boolean isItemError() { + return this.itemError; + } + + public boolean isTankError() { + return this.tankError; + } + + public boolean isPowerError() { + return this.powerError; + } +} diff --git a/src/main/java/binnie/core/machines/errors/ErrorStateRegistry.java b/src/main/java/binnie/core/machines/errors/ErrorStateRegistry.java new file mode 100644 index 00000000..f59323d3 --- /dev/null +++ b/src/main/java/binnie/core/machines/errors/ErrorStateRegistry.java @@ -0,0 +1,28 @@ +package binnie.core.machines.errors; + +import java.util.HashMap; +import java.util.Map; + +public class ErrorStateRegistry { + private static final Map states = new HashMap<>(); + + public static void registerErrorState(IErrorStateDefinition state) { + String uid = state.getUID(); + if (!uid.contains(":")) { + throw new RuntimeException("Binnie Error State name must be in the format :."); + } + + if (states.containsKey(uid)) { + throw new RuntimeException("Binnie Error State does not possess a unique name."); + } + + states.put(uid, state); + } + + public static IErrorStateDefinition getErrorState(String name) { + if(name == null || name.isEmpty()){ + return CoreErrorCode.UNKNOWN; + } + return states.get(name); + } +} diff --git a/src/main/java/binnie/core/machines/power/IErrorStateDefinition.java b/src/main/java/binnie/core/machines/errors/IErrorStateDefinition.java similarity index 68% rename from src/main/java/binnie/core/machines/power/IErrorStateDefinition.java rename to src/main/java/binnie/core/machines/errors/IErrorStateDefinition.java index ebb2a064..c6a2160f 100644 --- a/src/main/java/binnie/core/machines/power/IErrorStateDefinition.java +++ b/src/main/java/binnie/core/machines/errors/IErrorStateDefinition.java @@ -1,9 +1,11 @@ -package binnie.core.machines.power; +package binnie.core.machines.errors; public interface IErrorStateDefinition { String getDescription(); String getName(); + + String getUID(); EnumErrorType getType(); } diff --git a/src/main/java/binnie/core/machines/power/IErrorStateSource.java b/src/main/java/binnie/core/machines/errors/IErrorStateSource.java similarity index 80% rename from src/main/java/binnie/core/machines/power/IErrorStateSource.java rename to src/main/java/binnie/core/machines/errors/IErrorStateSource.java index a8d03e2d..b1d8bf43 100644 --- a/src/main/java/binnie/core/machines/power/IErrorStateSource.java +++ b/src/main/java/binnie/core/machines/errors/IErrorStateSource.java @@ -1,4 +1,4 @@ -package binnie.core.machines.power; +package binnie.core.machines.errors; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index d6ca93c3..777971a0 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -6,6 +6,8 @@ import net.minecraft.nbt.NBTTagCompound; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.network.INetwork; import binnie.core.util.I18N; @@ -81,7 +83,7 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem if (this.actionCancelTask == 0.0f) { return null; } else { - return new ErrorState(I18N.localise("binniecore.machine.errors.task.cancelled.desc"), I18N.localise("binniecore.machine.errors.task.cancelled.info")); + return new ErrorState(CoreErrorCode.TASK_CANCELLED); } } @@ -89,9 +91,9 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem @Nullable public ErrorState canProgress() { if (this.actionPauseProcess != 0.0f) { - return new ErrorState(I18N.localise("binniecore.machine.errors.task.process.paused.desc"), I18N.localise("binniecore.machine.errors.task.process.paused.info")); + return new ErrorState(CoreErrorCode.TASK_PAUSED); } else if (this.getPower().getInterface().getEnergy(PowerSystem.RF) < this.getEnergyPerTick()) { - return new ErrorState.InsufficientPower(); + return new ErrorState(CoreErrorCode.INSUFFICIENT_POWER); } else { return null; } diff --git a/src/main/java/binnie/core/machines/power/ErrorState.java b/src/main/java/binnie/core/machines/power/ErrorState.java deleted file mode 100644 index 38419f6a..00000000 --- a/src/main/java/binnie/core/machines/power/ErrorState.java +++ /dev/null @@ -1,167 +0,0 @@ -package binnie.core.machines.power; - -import net.minecraft.nbt.NBTTagCompound; - -import forestry.api.core.INbtReadable; -import forestry.api.core.INbtWritable; - -public class ErrorState implements INbtReadable, INbtWritable { - private String name; - private String desc; - private int[] data; - private boolean progress; - private boolean itemError; - private boolean tankError; - private boolean powerError; - - public ErrorState(IErrorStateDefinition definition) { - this(definition, definition); - } - - public ErrorState(IErrorStateDefinition definition, int[] data) { - this(definition, definition, data); - } - - public ErrorState(IErrorStateDefinition definition, int data) { - this(definition, definition, new int[]{data}); - } - - public ErrorState(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition) { - this(nameDefinition.getName(), definition.getDescription()); - EnumErrorType type = definition.getType(); - this.itemError = type.isItemError(); - this.tankError = type.isTankError(); - this.powerError = type.isPowerError(); - } - - public ErrorState(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition, int data) { - this(nameDefinition.getName(), definition.getDescription(), new int[]{data}); - EnumErrorType type = definition.getType(); - this.itemError = type.isItemError(); - this.tankError = type.isTankError(); - this.powerError = type.isPowerError(); - } - - public ErrorState(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition, int[] data) { - this(nameDefinition.getName(), definition.getDescription(), data); - EnumErrorType type = definition.getType(); - this.itemError = type.isItemError(); - this.tankError = type.isTankError(); - this.powerError = type.isPowerError(); - } - - public ErrorState(String name, String desc) { - this.data = new int[0]; - this.progress = false; - this.itemError = false; - this.tankError = false; - this.powerError = false; - this.name = name; - this.desc = desc; - } - - public ErrorState(String name, String desc, int[] data) { - this.data = new int[0]; - this.progress = false; - this.itemError = false; - this.tankError = false; - this.powerError = false; - this.name = name; - this.desc = desc; - this.data = data; - } - - @Override - public String toString() { - return this.name; - } - - public String getTooltip() { - return this.desc; - } - - public int[] getData() { - return this.data; - } - - public boolean isProgress() { - return this.progress; - } - - public void setIsProgress() { - this.progress = true; - } - - @Override - public void readFromNBT(final NBTTagCompound nbt) { - this.name = nbt.getString("name"); - this.desc = nbt.getString("desc"); - this.data = nbt.getIntArray("data"); - this.itemError = nbt.getBoolean("item"); - this.tankError = nbt.getBoolean("tank"); - this.powerError = nbt.getBoolean("power"); - } - - @Override - public NBTTagCompound writeToNBT(final NBTTagCompound nbt) { - nbt.setString("name", this.toString()); - nbt.setString("desc", this.getTooltip()); - nbt.setIntArray("data", this.data); - if (this.isItemError()) { - nbt.setBoolean("item", true); - } - if (this.isTankError()) { - nbt.setBoolean("tank", true); - } - if (this.isPowerError()) { - nbt.setBoolean("power", true); - } - return nbt; - } - - public boolean isItemError() { - return this.itemError || this instanceof Item; - } - - public boolean isTankError() { - return this.tankError ; - } - - public boolean isPowerError() { - return this.powerError || this instanceof InsufficientPower; - } - - public static class Item extends ErrorState { - public Item(final String name, final String desc, final int[] slots) { - super(name, desc, slots); - } - - public Item(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition, final int[] slots) { - super(nameDefinition, definition, slots); - } - } - - public static class NoItem extends Item { - public NoItem(final String desc, final int slot) { - this(desc, new int[]{slot}); - } - - public NoItem(final String desc, final int[] slots) { - super("No Item", desc, slots); - } - - public NoItem(IErrorStateDefinition definition, final int[] slots) { - super("No Item", definition.getDescription(), slots); - } - - public NoItem(IErrorStateDefinition definition, final int slot) { - this(definition.getDescription(), new int[]{slot}); - } - } - - public static class InsufficientPower extends ErrorState { - public InsufficientPower() { - super(CoreErrorCode.INSUFFICIENT_POWER); - } - } -} diff --git a/src/main/java/binnie/core/machines/power/IProcess.java b/src/main/java/binnie/core/machines/power/IProcess.java index 8acebc2d..15361d4a 100644 --- a/src/main/java/binnie/core/machines/power/IProcess.java +++ b/src/main/java/binnie/core/machines/power/IProcess.java @@ -1,5 +1,7 @@ package binnie.core.machines.power; +import binnie.core.machines.errors.IErrorStateSource; + public interface IProcess extends IErrorStateSource { float getEnergyPerTick(); diff --git a/src/main/java/binnie/core/machines/power/IProcessTimed.java b/src/main/java/binnie/core/machines/power/IProcessTimed.java index 5346ebe2..fb9ff929 100644 --- a/src/main/java/binnie/core/machines/power/IProcessTimed.java +++ b/src/main/java/binnie/core/machines/power/IProcessTimed.java @@ -1,5 +1,7 @@ package binnie.core.machines.power; +import binnie.core.machines.errors.IErrorStateSource; + interface IProcessTimed extends IProcess, IErrorStateSource { int getProcessLength(); diff --git a/src/main/java/binnie/extratrees/gui/machines/WindowPress.java b/src/main/java/binnie/extratrees/gui/machines/WindowPress.java index 8a7677b1..76fbe68f 100644 --- a/src/main/java/binnie/extratrees/gui/machines/WindowPress.java +++ b/src/main/java/binnie/extratrees/gui/machines/WindowPress.java @@ -19,7 +19,6 @@ import binnie.core.gui.minecraft.control.ControlLiquidTank; import binnie.core.gui.minecraft.control.ControlPlayerInventory; import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; -import binnie.core.machines.power.ErrorState; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.fruitpress.FruitPressLogic; import binnie.extratrees.machines.fruitpress.FruitPressMachine; @@ -64,7 +63,7 @@ public class WindowPress extends Window { super.receiveGuiNBTOnServer(player, name, nbt); final FruitPressLogic logic = Machine.getInterface(FruitPressLogic.class, this.getInventory()); if (logic != null) { - if (name.equals("fruitpress-click") && logic.canWork() == null && (logic.canProgress() == null || logic.canProgress() instanceof ErrorState.InsufficientPower)) { + if (name.equals("fruitpress-click") && logic.canWork() == null && (logic.canProgress() == null || logic.canProgress().isPowerError())) { logic.alterProgress(2.0f); } else if (name.equals("clear-fruit")) { logic.setProgress(0.0f); diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java b/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java index 630cfefe..866d091a 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java @@ -2,9 +2,11 @@ package binnie.extratrees.machines; import javax.annotation.Nullable; -import binnie.core.machines.power.CoreErrorCode; -import binnie.core.machines.power.EnumErrorType; -import binnie.core.machines.power.IErrorStateDefinition; +import binnie.Constants; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.EnumErrorType; +import binnie.core.machines.errors.ErrorStateRegistry; +import binnie.core.machines.errors.IErrorStateDefinition; import binnie.core.util.I18N; public enum ExtraTreesErrorCode implements IErrorStateDefinition { @@ -41,6 +43,12 @@ public enum ExtraTreesErrorCode implements IErrorStateDefinition { this.name = name; this.parent = parent; this.type = type; + ErrorStateRegistry.registerErrorState(this); + } + + @Override + public String getUID() { + return Constants.EXTRA_TREES_MOD_ID + ":" + name; } public String getDescription(){ diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java index 7aec1d98..30074d18 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java @@ -13,10 +13,10 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import binnie.core.machines.Machine; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.network.INetwork; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.CoreErrorCode; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; import binnie.extratrees.machines.ExtraTreesErrorCode; diff --git a/src/main/java/binnie/extratrees/machines/designer/ComponentDesignerRecipe.java b/src/main/java/binnie/extratrees/machines/designer/ComponentDesignerRecipe.java index 8f1f7ec5..50abb92c 100644 --- a/src/main/java/binnie/extratrees/machines/designer/ComponentDesignerRecipe.java +++ b/src/main/java/binnie/extratrees/machines/designer/ComponentDesignerRecipe.java @@ -12,9 +12,9 @@ import net.minecraft.nbt.NBTTagCompound; import binnie.core.machines.Machine; import binnie.core.machines.component.ComponentRecipe; import binnie.core.machines.component.IComponentRecipe; +import binnie.core.machines.errors.ErrorState; +import binnie.core.machines.errors.IErrorStateSource; import binnie.core.machines.network.INetwork; -import binnie.core.machines.power.ErrorState; -import binnie.core.machines.power.IErrorStateSource; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java index 0bcd241b..f9cbeaad 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java @@ -10,10 +10,10 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import binnie.core.machines.Machine; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.network.INetwork; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.CoreErrorCode; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; import binnie.extratrees.machines.ExtraTreesErrorCode; diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java index 76e56fdd..17bb6e04 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java @@ -3,9 +3,9 @@ package binnie.extratrees.machines.fruitpress; import net.minecraftforge.fluids.FluidStack; import binnie.core.machines.Machine; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.CoreErrorCode; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.extratrees.machines.ExtraTreesErrorCode; diff --git a/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java b/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java index 5606c806..0a392d4d 100644 --- a/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java +++ b/src/main/java/binnie/extratrees/machines/infuser/InfuserLogic.java @@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import binnie.core.machines.Machine; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.CoreErrorCode; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; public class InfuserLogic extends ComponentProcessSetCost implements IProcess { diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java index b1563bc2..a3eaa6f0 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillLogic.java @@ -4,8 +4,8 @@ import net.minecraft.item.ItemStack; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.extratrees.item.ExtraTreeItems; import binnie.extratrees.machines.ExtraTreesErrorCode; diff --git a/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java b/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java index b77000c8..8897e812 100644 --- a/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java +++ b/src/main/java/binnie/genetics/machine/GeneticsErrorCode.java @@ -2,9 +2,11 @@ package binnie.genetics.machine; import javax.annotation.Nullable; -import binnie.core.machines.power.CoreErrorCode; -import binnie.core.machines.power.EnumErrorType; -import binnie.core.machines.power.IErrorStateDefinition; +import binnie.Constants; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.EnumErrorType; +import binnie.core.machines.errors.ErrorStateRegistry; +import binnie.core.machines.errors.IErrorStateDefinition; import binnie.core.util.I18N; public enum GeneticsErrorCode implements IErrorStateDefinition { @@ -68,6 +70,12 @@ public enum GeneticsErrorCode implements IErrorStateDefinition { this.name = name; this.parent = parent; this.type = type; + ErrorStateRegistry.registerErrorState(this); + } + + @Override + public String getUID() { + return Constants.GENETICS_MOD_ID + ":" + name; } public String getDescription(){ @@ -80,7 +88,7 @@ public enum GeneticsErrorCode implements IErrorStateDefinition { } return I18N.localise("genetics.errors." + name + ".name"); } - + @Override public EnumErrorType getType() { if(parent != null){ diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java index b371b0d4..93906d46 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserLogic.java @@ -6,8 +6,8 @@ import java.util.List; import net.minecraft.item.ItemStack; import binnie.core.machines.IMachine; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcessIndefinate; -import binnie.core.machines.power.ErrorState; import binnie.genetics.machine.GeneticsErrorCode; public class AcclimatiserLogic extends ComponentProcessIndefinate { diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java index 682d5f2a..71ac72d1 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserLogic.java @@ -3,8 +3,8 @@ package binnie.genetics.machine.analyser; import net.minecraft.item.ItemStack; import binnie.core.machines.Machine; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.machine.GeneticsErrorCode; diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java index 4f78064e..5275bdd3 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java @@ -8,10 +8,10 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.Binnie; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.inventory.IChargedSlots; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.CoreErrorCode; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.item.GeneticLiquid; import binnie.genetics.machine.GeneticsErrorCode; diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java index b51d081b..6e31e269 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -9,9 +9,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import binnie.core.machines.Machine; +import binnie.core.machines.errors.CoreErrorCode; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcessIndefinate; -import binnie.core.machines.power.CoreErrorCode; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.machines.transfer.TransferRequest; import binnie.genetics.api.IIncubatorRecipe; diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java index 6462e54b..6a745769 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorLogic.java @@ -14,8 +14,8 @@ import forestry.api.genetics.IIndividual; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcess; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; import binnie.genetics.api.IGene; diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java index 1ab454f3..2ed5e714 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java @@ -14,9 +14,9 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.core.genetics.Gene; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.inventory.IChargedSlots; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.item.ItemSequence; import binnie.genetics.machine.GeneticsErrorCode; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java index 0c78104a..73ccd48e 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java @@ -5,8 +5,8 @@ import com.google.common.base.Preconditions; import net.minecraft.item.ItemStack; import binnie.core.machines.Machine; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; import binnie.genetics.genetics.Engineering; diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index 125e456f..65231bed 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -5,8 +5,8 @@ import com.google.common.base.Preconditions; import net.minecraft.item.ItemStack; import binnie.core.machines.Machine; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcess; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java index 1063f91b..90fe30ba 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerLogic.java @@ -12,8 +12,8 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IIndividual; import binnie.core.machines.Machine; +import binnie.core.machines.errors.ErrorState; import binnie.core.machines.power.ComponentProcess; -import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/src/main/resources/assets/binniecore/lang/en_US.lang index 4a47ce1d..e566c289 100644 --- a/src/main/resources/assets/binniecore/lang/en_US.lang +++ b/src/main/resources/assets/binniecore/lang/en_US.lang @@ -203,11 +203,14 @@ binniecore.machine.storage.compartment_gold=Gold Compartment binniecore.machine.tooltips.processing=Processing -binniecore.machine.errors.task.cancelled.desc=Task Cancelled -binniecore.machine.errors.task.cancelled.info=Cancelled by Buildcraft Gate -binniecore.machine.errors.task.process.paused.desc=Process Paused -binniecore.machine.errors.task.process.paused.info=Paused by Buildcraft Gate +binniecore.errors.task.cancelled.desc=Task Cancelled +binniecore.errors.task.cancelled.info=Cancelled by Buildcraft Gate +binniecore.errors.task.paused.desc=Process Paused +binniecore.errors.task.paused.info=Paused by Buildcraft Gate + +binniecore.errors.unknown.name=Unknown +binniecore.errors.unknown.desc=This error is broken, please report this to the mod authors binniecore.errors.no.item.name=No Item binniecore.errors.invalid.item.name=Invalid Item binniecore.errors.no.space.name=No Space