Fix Error States on Server

This commit is contained in:
Nedelosk committed 2017-07-31 16:36:57 +02:00
1 parent 5a93a3d0a9
commit 79a49341e9
31 files changed
+233 -215

No files matched your search

@@ -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;