diff --git a/CHANGELOG.md b/CHANGELOG.md index da73e5aaf..d90da6d3e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined S - Removed Project E integration (raoulvdberge) - Removed blocking mode in autocrafting (raoulvdberge) - Removed the Wrench (raoulvdberge) +- Removed "void excess items or fluids" functionality on storages (raoulvdberge) - Rewrote autocrafting (raoulvdberge) - Autocrafting tasks that take longer than 5 seconds to calculate are automatically stopped to avoid server strain (raoulvdberge) - Added new storage disk system where the storage disk data (items, fluids) are stored off the disk itself, in another file (refinedstorage_disks.dat). The disk itself only stores its ID (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java index 86804285f..35b8bd079 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskContainerContext.java @@ -6,11 +6,6 @@ import com.raoulvdberge.refinedstorage.api.storage.AccessType; * Stores relevant information about the container where the {@link IStorageDisk} is in. */ public interface IStorageDiskContainerContext { - /** - * @return true if excess stacks can be voided, false otherwise - */ - boolean isVoidExcess(); - /** * @return the access type */ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IGuiStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IGuiStorage.java index 4618895ec..56ff7b238 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IGuiStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/IGuiStorage.java @@ -18,8 +18,6 @@ public interface IGuiStorage { TileDataParameter getAccessTypeParameter(); - TileDataParameter getVoidExcessParameter(); - String getVoidExcessType(); int getStored(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java index f3c7cd6bd..11ee1fd5b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/NetworkNodeDiskDrive.java @@ -36,7 +36,7 @@ import net.minecraftforge.items.IItemHandler; import java.util.List; import java.util.function.Predicate; -public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IStorageProvider, IComparable, IFilterable, IPrioritizable, IType, IExcessVoidable, IAccessType, IStorageDiskContainerContext { +public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IStorageProvider, IComparable, IFilterable, IPrioritizable, IType, IAccessType, IStorageDiskContainerContext { public static final Predicate VALIDATOR_STORAGE_DISK = s -> s.getItem() instanceof IStorageDiskProvider && ((IStorageDiskProvider) s.getItem()).isValid(s); public static final String ID = "disk_drive"; @@ -45,7 +45,6 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS private static final String NBT_COMPARE = "Compare"; private static final String NBT_MODE = "Mode"; private static final String NBT_TYPE = "Type"; - private static final String NBT_VOID_EXCESS = "VoidExcess"; private ItemHandlerBase disks = new ItemHandlerBase(8, new ItemHandlerListenerNetworkNode(this), VALIDATOR_STORAGE_DISK) { @Override @@ -84,7 +83,6 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; private int mode = IFilterable.BLACKLIST; private int type = IType.ITEMS; - private boolean voidExcess = false; public NetworkNodeDiskDrive(World world, BlockPos pos) { super(world, pos); @@ -180,7 +178,6 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS tag.setInteger(NBT_COMPARE, compare); tag.setInteger(NBT_MODE, mode); tag.setInteger(NBT_TYPE, type); - tag.setBoolean(NBT_VOID_EXCESS, voidExcess); AccessTypeUtils.writeAccessType(tag, accessType); @@ -210,10 +207,6 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS type = tag.getInteger(NBT_TYPE); } - if (tag.hasKey(NBT_VOID_EXCESS)) { - voidExcess = tag.getBoolean(NBT_VOID_EXCESS); - } - accessType = AccessTypeUtils.readAccessType(tag); OneSixMigrationHelper.migrateEmptyWhitelistToEmptyBlacklist(version, this, itemFilters, fluidFilters); @@ -273,11 +266,6 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS return TileDiskDrive.PRIORITY; } - @Override - public TileDataParameter getVoidExcessParameter() { - return TileDiskDrive.VOID_EXCESS; - } - @Override public TileDataParameter getAccessTypeParameter() { return TileDiskDrive.ACCESS_TYPE; @@ -336,18 +324,6 @@ public class NetworkNodeDiskDrive extends NetworkNode implements IGuiStorage, IS return disks; } - @Override - public boolean isVoidExcess() { - return voidExcess; - } - - @Override - public void setVoidExcess(boolean voidExcess) { - this.voidExcess = voidExcess; - - markDirty(); - } - @Override public int getType() { return world.isRemote ? TileDiskDrive.TYPE.getValue() : type; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java index bd490b68b..da8b0d8fc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java @@ -534,11 +534,6 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab return new CombinedInvWrapper(inputDisks, outputDisks, upgrades); } - @Override - public boolean isVoidExcess() { - return false; - } - @Override public AccessType getAccessType() { return AccessType.INSERT_EXTRACT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/NetworkNodeExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/NetworkNodeExternalStorage.java index d5ba890d2..d74896fc5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/NetworkNodeExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/NetworkNodeExternalStorage.java @@ -251,11 +251,6 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP return TileExternalStorage.PRIORITY; } - @Override - public TileDataParameter getVoidExcessParameter() { - return null; - } - @Override public TileDataParameter getAccessTypeParameter() { return TileExternalStorage.ACCESS_TYPE; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java index 6d52dc18c..8673ab290 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java @@ -19,7 +19,10 @@ import com.raoulvdberge.refinedstorage.block.FluidStorageType; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode; import com.raoulvdberge.refinedstorage.tile.TileFluidStorage; -import com.raoulvdberge.refinedstorage.tile.config.*; +import com.raoulvdberge.refinedstorage.tile.config.IAccessType; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; +import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; import com.raoulvdberge.refinedstorage.util.StackUtils; @@ -32,13 +35,12 @@ import net.minecraftforge.fluids.FluidStack; import java.util.List; import java.util.UUID; -public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, IStorageProvider, IComparable, IFilterable, IPrioritizable, IExcessVoidable, IAccessType, IStorageDiskContainerContext { +public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, IStorageProvider, IComparable, IFilterable, IPrioritizable, IAccessType, IStorageDiskContainerContext { public static final String ID = "fluid_storage"; private static final String NBT_PRIORITY = "Priority"; private static final String NBT_COMPARE = "Compare"; private static final String NBT_MODE = "Mode"; - private static final String NBT_VOID_EXCESS = "VoidExcess"; public static final String NBT_ID = "Id"; private ItemHandlerFluid filters = new ItemHandlerFluid(9, new ItemHandlerListenerNetworkNode(this)); @@ -49,7 +51,6 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, private int priority = 0; private int compare = IComparer.COMPARE_NBT; private int mode = IFilterable.BLACKLIST; - private boolean voidExcess = false; private UUID storageId; private IStorageDisk storage; @@ -141,7 +142,6 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, tag.setInteger(NBT_PRIORITY, priority); tag.setInteger(NBT_COMPARE, compare); tag.setInteger(NBT_MODE, mode); - tag.setBoolean(NBT_VOID_EXCESS, voidExcess); AccessTypeUtils.writeAccessType(tag, accessType); @@ -166,10 +166,6 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, mode = tag.getInteger(NBT_MODE); } - if (tag.hasKey(NBT_VOID_EXCESS)) { - voidExcess = tag.getBoolean(NBT_VOID_EXCESS); - } - accessType = AccessTypeUtils.readAccessType(tag); OneSixMigrationHelper.migrateEmptyWhitelistToEmptyBlacklist(version, this, null, filters); @@ -241,11 +237,6 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, return TileFluidStorage.PRIORITY; } - @Override - public TileDataParameter getVoidExcessParameter() { - return TileFluidStorage.VOID_EXCESS; - } - @Override public TileDataParameter getAccessTypeParameter() { return TileFluidStorage.ACCESS_TYPE; @@ -297,16 +288,4 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage, network.getFluidStorageCache().sort(); } } - - @Override - public boolean isVoidExcess() { - return voidExcess; - } - - @Override - public void setVoidExcess(boolean value) { - this.voidExcess = value; - - markDirty(); - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java index b7cc39d9d..3b7e55714 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java @@ -19,7 +19,10 @@ import com.raoulvdberge.refinedstorage.block.ItemStorageType; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode; import com.raoulvdberge.refinedstorage.tile.TileStorage; -import com.raoulvdberge.refinedstorage.tile.config.*; +import com.raoulvdberge.refinedstorage.tile.config.IAccessType; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; +import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; import com.raoulvdberge.refinedstorage.util.StackUtils; @@ -32,13 +35,12 @@ import net.minecraftforge.fluids.FluidStack; import java.util.List; import java.util.UUID; -public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, IStorageProvider, IComparable, IFilterable, IPrioritizable, IExcessVoidable, IAccessType, IStorageDiskContainerContext { +public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, IStorageProvider, IComparable, IFilterable, IPrioritizable, IAccessType, IStorageDiskContainerContext { public static final String ID = "storage"; private static final String NBT_PRIORITY = "Priority"; private static final String NBT_COMPARE = "Compare"; private static final String NBT_MODE = "Mode"; - private static final String NBT_VOID_EXCESS = "VoidExcess"; public static final String NBT_ID = "Id"; private ItemHandlerBase filters = new ItemHandlerBase(9, new ItemHandlerListenerNetworkNode(this)); @@ -49,7 +51,6 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto private int priority = 0; private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; private int mode = IFilterable.BLACKLIST; - private boolean voidExcess = false; private UUID storageId; private IStorageDisk storage; @@ -141,7 +142,6 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto tag.setInteger(NBT_PRIORITY, priority); tag.setInteger(NBT_COMPARE, compare); tag.setInteger(NBT_MODE, mode); - tag.setBoolean(NBT_VOID_EXCESS, voidExcess); AccessTypeUtils.writeAccessType(tag, accessType); @@ -166,10 +166,6 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto mode = tag.getInteger(NBT_MODE); } - if (tag.hasKey(NBT_VOID_EXCESS)) { - voidExcess = tag.getBoolean(NBT_VOID_EXCESS); - } - accessType = AccessTypeUtils.readAccessType(tag); OneSixMigrationHelper.migrateEmptyWhitelistToEmptyBlacklist(version, this, filters, null); @@ -207,18 +203,6 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto markDirty(); } - @Override - public boolean isVoidExcess() { - return voidExcess; - } - - @Override - public void setVoidExcess(boolean voidExcess) { - this.voidExcess = voidExcess; - - markDirty(); - } - public ItemHandlerBase getFilters() { return filters; } @@ -253,11 +237,6 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto return TileStorage.PRIORITY; } - @Override - public TileDataParameter getVoidExcessParameter() { - return TileStorage.VOID_EXCESS; - } - @Override public TileDataParameter getAccessTypeParameter() { return TileStorage.ACCESS_TYPE; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java index a7f0b097b..424e30460 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskFluid.java @@ -72,10 +72,6 @@ public class StorageDiskFluid implements IStorageDisk { int remainingSpace = getCapacity() - getStored(); if (remainingSpace <= 0) { - if (context.isVoidExcess()) { - return null; - } - return StackUtils.copy(stack, size); } @@ -85,7 +81,7 @@ public class StorageDiskFluid implements IStorageDisk { onChanged(); } - return context.isVoidExcess() ? null : StackUtils.copy(otherStack, size - remainingSpace); + return StackUtils.copy(otherStack, size - remainingSpace); } else { if (!simulate) { otherStack.amount += size; @@ -102,10 +98,6 @@ public class StorageDiskFluid implements IStorageDisk { int remainingSpace = getCapacity() - getStored(); if (remainingSpace <= 0) { - if (context.isVoidExcess()) { - return null; - } - return StackUtils.copy(stack, size); } @@ -115,7 +107,7 @@ public class StorageDiskFluid implements IStorageDisk { onChanged(); } - return context.isVoidExcess() ? null : StackUtils.copy(stack, size - remainingSpace); + return StackUtils.copy(stack, size - remainingSpace); } else { if (!simulate) { stacks.put(stack.getFluid(), StackUtils.copy(stack, size)); @@ -179,13 +171,7 @@ public class StorageDiskFluid implements IStorageDisk { return 0; } - int inserted = remainder == null ? size : (size - remainder.amount); - - if (context.isVoidExcess() && storedPreInsertion + inserted > getCapacity()) { - inserted = getCapacity() - storedPreInsertion; - } - - return inserted; + return remainder == null ? size : (size - remainder.amount); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java index b81199ddf..ce41031af 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskItem.java @@ -107,10 +107,6 @@ public class StorageDiskItem implements IStorageDisk { int remainingSpace = getCapacity() - getStored(); if (remainingSpace <= 0) { - if (context.isVoidExcess()) { - return null; - } - return ItemHandlerHelper.copyStackWithSize(stack, size); } @@ -120,7 +116,7 @@ public class StorageDiskItem implements IStorageDisk { onChanged(); } - return context.isVoidExcess() ? null : ItemHandlerHelper.copyStackWithSize(otherStack, size - remainingSpace); + return ItemHandlerHelper.copyStackWithSize(otherStack, size - remainingSpace); } else { if (!simulate) { otherStack.grow(size); @@ -137,10 +133,6 @@ public class StorageDiskItem implements IStorageDisk { int remainingSpace = getCapacity() - getStored(); if (remainingSpace <= 0) { - if (context.isVoidExcess()) { - return null; - } - return ItemHandlerHelper.copyStackWithSize(stack, size); } @@ -150,7 +142,7 @@ public class StorageDiskItem implements IStorageDisk { onChanged(); } - return context.isVoidExcess() ? null : ItemHandlerHelper.copyStackWithSize(stack, size - remainingSpace); + return ItemHandlerHelper.copyStackWithSize(stack, size - remainingSpace); } else { if (!simulate) { stacks.put(stack.getItem(), ItemHandlerHelper.copyStackWithSize(stack, size)); @@ -236,13 +228,7 @@ public class StorageDiskItem implements IStorageDisk { return 0; } - int inserted = remainder == null ? size : (size - remainder.getCount()); - - if (context.isVoidExcess() && storedPreInsertion + inserted > getCapacity()) { - inserted = getCapacity() - storedPreInsertion; - } - - return inserted; + return remainder == null ? size : (size - remainder.getCount()); } Multimap getRawStacks() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java index 1ebe89bca..14cd96fcd 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java @@ -53,10 +53,6 @@ public class GuiStorage extends GuiBase { addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_OREDICT)); } - if (gui.getVoidExcessParameter() != null) { - addSideButton(new SideButtonVoidExcess(this, gui.getVoidExcessParameter(), gui.getVoidExcessType())); - } - if (gui.getAccessTypeParameter() != null) { addSideButton(new SideButtonAccessType(this, gui.getAccessTypeParameter())); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonVoidExcess.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonVoidExcess.java deleted file mode 100644 index aef5a506b..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonVoidExcess.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.raoulvdberge.refinedstorage.gui.control; - -import com.raoulvdberge.refinedstorage.gui.GuiBase; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.util.text.TextFormatting; - -public class SideButtonVoidExcess extends SideButton { - private TileDataParameter parameter; - private String type; - - public SideButtonVoidExcess(GuiBase gui, TileDataParameter parameter, String type) { - super(gui); - - this.parameter = parameter; - this.type = type; - } - - @Override - public String getTooltip() { - return GuiBase.t("sidebutton.refinedstorage:void_excess." + type) + "\n" + TextFormatting.GRAY + GuiBase.t(parameter.getValue() ? "gui.yes" : "gui.no"); - } - - @Override - protected void drawButtonIcon(int x, int y) { - gui.drawTexture(x, y, parameter.getValue() ? 16 : 0, 192, 16, 16); - } - - @Override - public void actionPerformed() { - TileDataManager.setParameter(parameter, !parameter.getValue()); - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java index 4d68c6607..2a8905545 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java @@ -21,7 +21,6 @@ public class TileDiskDrive extends TileNode { public static final TileDataParameter COMPARE = IComparable.createParameter(); public static final TileDataParameter MODE = IFilterable.createParameter(); public static final TileDataParameter TYPE = IType.createParameter(); - public static final TileDataParameter VOID_EXCESS = IExcessVoidable.createParameter(); public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); public static final TileDataParameter STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> { int stored = 0; @@ -81,7 +80,6 @@ public class TileDiskDrive extends TileNode { dataManager.addWatchedParameter(COMPARE); dataManager.addWatchedParameter(MODE); dataManager.addWatchedParameter(TYPE); - dataManager.addWatchedParameter(VOID_EXCESS); dataManager.addWatchedParameter(ACCESS_TYPE); dataManager.addWatchedParameter(STORED); dataManager.addWatchedParameter(CAPACITY); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java index 1af61eafa..ef3ee9f41 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java @@ -2,7 +2,10 @@ package com.raoulvdberge.refinedstorage.tile; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.NetworkNodeFluidStorage; -import com.raoulvdberge.refinedstorage.tile.config.*; +import com.raoulvdberge.refinedstorage.tile.config.IAccessType; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; +import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; @@ -13,7 +16,6 @@ import javax.annotation.Nonnull; public class TileFluidStorage extends TileNode { public static final TileDataParameter PRIORITY = IPrioritizable.createParameter(); public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter VOID_EXCESS = IExcessVoidable.createParameter(); public static final TileDataParameter MODE = IFilterable.createParameter(); public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); public static final TileDataParameter STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getStorage().getStored()); @@ -23,7 +25,6 @@ public class TileFluidStorage extends TileNode { dataManager.addWatchedParameter(COMPARE); dataManager.addWatchedParameter(MODE); dataManager.addWatchedParameter(STORED); - dataManager.addWatchedParameter(VOID_EXCESS); dataManager.addWatchedParameter(ACCESS_TYPE); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java index a433a02d8..7d6de7f10 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java @@ -2,7 +2,10 @@ package com.raoulvdberge.refinedstorage.tile; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.NetworkNodeStorage; -import com.raoulvdberge.refinedstorage.tile.config.*; +import com.raoulvdberge.refinedstorage.tile.config.IAccessType; +import com.raoulvdberge.refinedstorage.tile.config.IComparable; +import com.raoulvdberge.refinedstorage.tile.config.IFilterable; +import com.raoulvdberge.refinedstorage.tile.config.IPrioritizable; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.util.math.BlockPos; @@ -16,14 +19,12 @@ public class TileStorage extends TileNode { public static final TileDataParameter MODE = IFilterable.createParameter(); public static final TileDataParameter ACCESS_TYPE = IAccessType.createParameter(); public static final TileDataParameter STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getStorage().getStored()); - public static final TileDataParameter VOID_EXCESS = IExcessVoidable.createParameter(); public TileStorage() { dataManager.addWatchedParameter(PRIORITY); dataManager.addWatchedParameter(COMPARE); dataManager.addWatchedParameter(MODE); dataManager.addWatchedParameter(STORED); - dataManager.addWatchedParameter(VOID_EXCESS); dataManager.addWatchedParameter(ACCESS_TYPE); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IExcessVoidable.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IExcessVoidable.java deleted file mode 100755 index 1d1b11a1f..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IExcessVoidable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.raoulvdberge.refinedstorage.tile.config; - -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.tileentity.TileEntity; - -public interface IExcessVoidable { - static TileDataParameter createParameter() { - return new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> ((IExcessVoidable) t.getNode()).isVoidExcess(), (t, v) -> ((IExcessVoidable) t.getNode()).setVoidExcess(v)); - } - - boolean isVoidExcess(); - - void setVoidExcess(boolean voidExcess); -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java index ee3637ca9..fb872685b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java @@ -388,11 +388,6 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer return true; } - @Override - public boolean isVoidExcess() { - return false; - } - @Override public AccessType getAccessType() { return AccessType.INSERT_EXTRACT; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java index d738629de..8e6c5ae1f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java @@ -661,11 +661,6 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, } } - @Override - public boolean isVoidExcess() { - return false; - } - @Override public AccessType getAccessType() { return AccessType.INSERT_EXTRACT; diff --git a/src/main/resources/assets/refinedstorage/lang/de_de.lang b/src/main/resources/assets/refinedstorage/lang/de_de.lang index be3df6d4a..73db01f6a 100755 --- a/src/main/resources/assets/refinedstorage/lang/de_de.lang +++ b/src/main/resources/assets/refinedstorage/lang/de_de.lang @@ -124,10 +124,6 @@ sidebutton.refinedstorage:detector.mode.3=Signal bei automatischer Herstellung sidebutton.refinedstorage:crafter.triggered_autocrafting=Automatische Herstellung mit Signal einschalten -sidebutton.refinedstorage:void_excess.items=Überlauf löschen (Teile) -sidebutton.refinedstorage:void_excess.fluids=Überlauf löschen (Flüssigkeiten) -sidebutton.refinedstorage:void_excess.items_fluids=Überlauf löschen (Teile und Flüssigkeiten) - sidebutton.refinedstorage:constructor.drop=Teil fallen lassen anstatt platzieren sidebutton.refinedstorage:destructor.pickup=Teil aufheben anstatt abbauen diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang index 02b0ad247..c18137320 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang @@ -184,10 +184,6 @@ sidebutton.refinedstorage:detector.mode.1=Emit signal when on the amount sidebutton.refinedstorage:detector.mode.2=Emit signal when above the amount sidebutton.refinedstorage:detector.mode.3=Emit signal when item is being autocrafted -sidebutton.refinedstorage:void_excess.items=Void excess items -sidebutton.refinedstorage:void_excess.fluids=Void excess fluids -sidebutton.refinedstorage:void_excess.items_fluids=Void excess items and fluids - sidebutton.refinedstorage:constructor.drop=Drop blocks instead of placing sidebutton.refinedstorage:destructor.pickup=Pickup items instead of breaking diff --git a/src/main/resources/assets/refinedstorage/lang/es_es.lang b/src/main/resources/assets/refinedstorage/lang/es_es.lang index 54bfe9732..f402a0d84 100644 --- a/src/main/resources/assets/refinedstorage/lang/es_es.lang +++ b/src/main/resources/assets/refinedstorage/lang/es_es.lang @@ -178,10 +178,6 @@ sidebutton.refinedstorage:detector.mode.1=Emitir señal si la cantidad se alcanz sidebutton.refinedstorage:detector.mode.2=Emitir señal si esta más de lo indicado sidebutton.refinedstorage:detector.mode.3=Emitir señal si se esta fabricando esto -sidebutton.refinedstorage:void_excess.items=Vaciar objetos excedentes -sidebutton.refinedstorage:void_excess.fluids=Vaciar fluidos excedentes -sidebutton.refinedstorage:void_excess.items_fluids=Vaciar objetos y fluidos excedentes - sidebutton.refinedstorage:constructor.drop=Soltar bloques en lugar de colocar sidebutton.refinedstorage:destructor.pickup=Recoger objetos en lugar de romper diff --git a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang index 406e2aa64..32f6e358a 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang @@ -154,9 +154,6 @@ sidebutton.refinedstorage:detector.mode.0=Emet un signal quand la quantité est guidebutton.refinedstorage:detector.mode.1=Emet un signal quand la quantité est égale sidebutton.refinedstorage:detector.mode.2=Emet un signal quand la quantité est supérieure sidebutton.refinedstorage:detector.mode.3=Emet un signal quand l'item est crafté auto -sidebutton.refinedstorage:void_excess.items=Supprime les items en surplus -sidebutton.refinedstorage:void_excess.fluids=Supprime les fluides en surplus -sidebutton.refinedstorage:void_excess.items_fluids=Supprime les items et liquides en surplus sidebutton.refinedstorage:constructor.drop=Laisse tomber les blocs au lieu de les placer diff --git a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang index 453e7a5e3..dccb966e7 100644 --- a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang +++ b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang @@ -153,10 +153,6 @@ sidebutton.refinedstorage:detector.mode.1=수량과 일치할 때 신호 출력 sidebutton.refinedstorage:detector.mode.2=수량 이상일 때 신호 출력 sidebutton.refinedstorage:detector.mode.3=자동 조합 시 신호 출력 -sidebutton.refinedstorage:void_excess.items=수량 초과 아이템 자동 제거 -sidebutton.refinedstorage:void_excess.fluids=용량 초과 액체 자동 제거 -sidebutton.refinedstorage:void_excess.items_fluids=용량 초과 아이템/액체 자동 제거 - sidebutton.refinedstorage:constructor.drop=블럭을 설치하지 않고 떨어트림 sidebutton.refinedstorage:destructor.pickup=블럭을 파괴하지 않고 주움 diff --git a/src/main/resources/assets/refinedstorage/lang/pt_br.lang b/src/main/resources/assets/refinedstorage/lang/pt_br.lang index 976532409..888c3f47b 100755 --- a/src/main/resources/assets/refinedstorage/lang/pt_br.lang +++ b/src/main/resources/assets/refinedstorage/lang/pt_br.lang @@ -156,10 +156,6 @@ sidebutton.refinedstorage:detector.mode.1=Emite um sinal quando estiver no valor sidebutton.refinedstorage:detector.mode.2=Emite sinal quando acima do valor sidebutton.refinedstorage:detector.mode.3=Emite o sinal quando o item está sendo auto-fabricado -sidebutton.refinedstorage:void_excess.items=Excesso de itens vazio -sidebutton.refinedstorage:void_excess.fluids=Excesso de fluidos vazio -sidebutton.refinedstorage:void_excess.items_fluids=Excesso de itens e fluidos vazio - sidebutton.refinedstorage:constructor.drop=Solte os blocos em vez de colocar sidebutton.refinedstorage:destructor.pickup=Pegue os itens em vez de quebrar diff --git a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang index 5892c0921..3a245f449 100755 --- a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang +++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang @@ -179,10 +179,6 @@ sidebutton.refinedstorage:detector.mode.1=Выдача сигнала, если sidebutton.refinedstorage:detector.mode.2=Выдача сигнала, если количество больше sidebutton.refinedstorage:detector.mode.3=Излучать сигнал, когда предмет начинает автосоздание -sidebutton.refinedstorage:void_excess.items=Избыток предметов -sidebutton.refinedstorage:void_excess.fluids=Избыток жидкости -sidebutton.refinedstorage:void_excess.items_fluids=Избыток предметов и жидкости - sidebutton.refinedstorage:constructor.drop=Выкидывать блоки вместо размещения sidebutton.refinedstorage:destructor.pickup=Подбирать предметы, а не ломать diff --git a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang index b9d0fd532..85477ebde 100755 --- a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang +++ b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang @@ -157,10 +157,6 @@ sidebutton.refinedstorage:detector.mode.1=物品数量等于输入数量时输 sidebutton.refinedstorage:detector.mode.2=物品数量大于于输入数量时输出信号 sidebutton.refinedstorage:detector.mode.3=当正在自动合成的时候输出红石信号 -sidebutton.refinedstorage:void_excess.items=销毁多余的物品 -sidebutton.refinedstorage:void_excess.fluids=销毁多余的流体 -sidebutton.refinedstorage:void_excess.items_fluids=销毁多余的物品和流体 - sidebutton.refinedstorage:constructor.drop=将物品以掉落物形式抛出 sidebutton.refinedstorage:destructor.pickup=拾取物品模式