mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 12:42:53 +00:00
Fix Error States on Server
This commit is contained in:
1 parent
5a93a3d0a9
commit
79a49341e9
31 files changed
+233
-215
No files matched your search
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
+14
-3
@@ -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() {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.core.machines.power;
|
||||
package binnie.core.machines.errors;
|
||||
|
||||
public enum EnumErrorType {
|
||||
NONE,
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package binnie.core.machines.errors;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class ErrorStateRegistry {
|
||||
private static final Map<String, IErrorStateDefinition> 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 <modid>:<name>.");
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
+3
-1
@@ -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();
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package binnie.core.machines.power;
|
||||
package binnie.core.machines.errors;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package binnie.core.machines.power;
|
||||
|
||||
import binnie.core.machines.errors.IErrorStateSource;
|
||||
|
||||
public interface IProcess extends IErrorStateSource {
|
||||
float getEnergyPerTick();
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package binnie.core.machines.power;
|
||||
|
||||
import binnie.core.machines.errors.IErrorStateSource;
|
||||
|
||||
interface IProcessTimed extends IProcess, IErrorStateSource {
|
||||
int getProcessLength();
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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(){
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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){
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user