dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

importer + exporter now have side buttons instead of guibuttons

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-20 18:26:07 +01:00
parent 9aaad17b7e
commit 62c5a1d82f
20 changed files with 230 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/storagecraft/tile/ICompareSetting.java Normal file
View File

@@ -0,0 +1,13 @@
package storagecraft.tile;
public interface ICompareSetting {
public int getCompare();
public void setCompare(int flags);
public int getX();
public int getY();
public int getZ();
}

2
src/main/java/storagecraft/tile/IRedstoneControllable.java → src/main/java/storagecraft/tile/IRedstoneModeSetting.java
View File

@@ -1,6 +1,6 @@
package storagecraft.tile;
public interface IRedstoneControllable {
public interface IRedstoneModeSetting {
public RedstoneMode getRedstoneMode();
public void setRedstoneMode(RedstoneMode mode);

2
src/main/java/storagecraft/tile/TileController.java
View File

@@ -15,7 +15,7 @@ import storagecraft.storage.IStorageProvider;
import storagecraft.storage.StorageItem;
import storagecraft.util.InventoryUtils;
public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneControllable {
public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting {
private List<StorageItem> items = new ArrayList<StorageItem>();
private List<IStorage> storages = new ArrayList<IStorage>();

28
src/main/java/storagecraft/tile/TileExporter.java
View File

@@ -10,12 +10,12 @@ import net.minecraft.tileentity.TileEntity;
import storagecraft.inventory.InventorySimple;
import storagecraft.util.InventoryUtils;
public class TileExporter extends TileMachine implements IInventory, ISidedInventory {
public static final String NBT_COMPARE_FLAGS = "CompareFlags";
public class TileExporter extends TileMachine implements IInventory, ISidedInventory, ICompareSetting {
public static final String NBT_COMPARE = "Compare";
private InventorySimple inventory = new InventorySimple("exporter", 9);
private int compareFlags = 0;
private int compare = 0;
@Override
public int getEnergyUsage() {
@@ -38,7 +38,7 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven
toTake.stackSize = 64;
ItemStack took = getController().take(toTake, compareFlags);
ItemStack took = getController().take(toTake, compare);
if (took != null) {
if (connectedInventory instanceof ISidedInventory) {
@@ -73,12 +73,14 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven
}
}
public int getCompareFlags() {
return compareFlags;
@Override
public int getCompare() {
return compare;
}
public void setCompareFlags(int flags) {
this.compareFlags = flags;
@Override
public void setCompare(int flags) {
this.compare = flags;
}
@Override
@@ -160,8 +162,8 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
if (nbt.hasKey(NBT_COMPARE_FLAGS)) {
compareFlags = nbt.getInteger(NBT_COMPARE_FLAGS);
if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE);
}
InventoryUtils.restoreInventory(this, nbt);
@@ -171,7 +173,7 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setInteger(NBT_COMPARE_FLAGS, compareFlags);
nbt.setInteger(NBT_COMPARE, compare);
InventoryUtils.saveInventory(this, nbt);
}
@@ -180,13 +182,13 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
compareFlags = buf.readInt();
compare = buf.readInt();
}
@Override
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
buf.writeInt(compareFlags);
buf.writeInt(compare);
}
}

28
src/main/java/storagecraft/tile/TileImporter.java
View File

@@ -10,16 +10,16 @@ import net.minecraft.tileentity.TileEntity;
import storagecraft.inventory.InventorySimple;
import storagecraft.util.InventoryUtils;
public class TileImporter extends TileMachine implements IInventory, ISidedInventory {
public class TileImporter extends TileMachine implements IInventory, ISidedInventory, ICompareSetting {
public static final int MODE_WHITELIST = 0;
public static final int MODE_BLACKLIST = 1;
public static final String NBT_COMPARE_FLAGS = "CompareFlags";
public static final String NBT_COMPARE = "Compare";
public static final String NBT_MODE = "Mode";
private InventorySimple inventory = new InventorySimple("importer", 9);
private int compareFlags = 0;
private int compare = 0;
private int mode = MODE_WHITELIST;
private int currentSlot = 0;
@@ -81,7 +81,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
if (slot != null) {
slots++;
if (InventoryUtils.compareStack(stack, slot, compareFlags)) {
if (InventoryUtils.compareStack(stack, slot, compare)) {
if (mode == MODE_WHITELIST) {
return true;
} else if (mode == MODE_BLACKLIST) {
@@ -98,12 +98,14 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
return true;
}
public int getCompareFlags() {
return compareFlags;
@Override
public int getCompare() {
return compare;
}
public void setCompareFlags(int flags) {
this.compareFlags = flags;
@Override
public void setCompare(int flags) {
this.compare = flags;
}
public int getMode() {
@@ -193,8 +195,8 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
if (nbt.hasKey(NBT_COMPARE_FLAGS)) {
compareFlags = nbt.getInteger(NBT_COMPARE_FLAGS);
if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE);
}
if (nbt.hasKey(NBT_MODE)) {
@@ -208,7 +210,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setInteger(NBT_COMPARE_FLAGS, compareFlags);
nbt.setInteger(NBT_COMPARE, compare);
nbt.setInteger(NBT_MODE, mode);
InventoryUtils.saveInventory(this, nbt);
@@ -218,7 +220,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
compareFlags = buf.readInt();
compare = buf.readInt();
mode = buf.readInt();
}
@@ -226,7 +228,7 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
buf.writeInt(compareFlags);
buf.writeInt(compare);
buf.writeInt(mode);
}
}

2
src/main/java/storagecraft/tile/TileMachine.java
View File

@@ -3,7 +3,7 @@ package storagecraft.tile;
import io.netty.buffer.ByteBuf;
import net.minecraft.nbt.NBTTagCompound;
public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneControllable {
public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting {
protected boolean connected = false;
private RedstoneMode redstoneMode = RedstoneMode.LOW;