diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index f3212cc49..919e8e100 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -56,28 +56,28 @@ import java.util.*; public class TileController extends TileBase implements INetworkMaster, IEnergyReceiver, IRedstoneConfigurable { public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter(); - public static final TileDataParameter ENERGY_USAGE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter ENERGY_USAGE = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileController tile) { return tile.getEnergyUsage(); } }); - public static final TileDataParameter ENERGY_STORED = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter ENERGY_STORED = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileController tile) { return tile.getEnergy().getEnergyStored(); } }); - public static final TileDataParameter ENERGY_CAPACITY = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter ENERGY_CAPACITY = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileController tile) { return tile.getEnergy().getMaxEnergyStored(); } }); - public static final TileDataParameter> NODES = TileDataManager.createParameter(RefinedStorageSerializers.CLIENT_NODE_SERIALIZER, new ITileDataProducer, TileController>() { + public static final TileDataParameter> NODES = TileDataManager.createParameter(RefinedStorageSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), new ITileDataProducer, TileController>() { @Override public List getValue(TileController tile) { List nodes = new ArrayList<>(); @@ -110,7 +110,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR return nodes; } - }, new ArrayList<>()); + }); public static final String NBT_ENERGY = "Energy"; public static final String NBT_ENERGY_CAPACITY = "EnergyCapacity"; diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java index 67875e4d8..e8b03f82c 100755 --- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java +++ b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.stream.Collectors; public class TileCraftingMonitor extends TileNode { - public static final TileDataParameter> TASKS = TileDataManager.createParameter(RefinedStorageSerializers.CLIENT_CRAFTING_TASK_SERIALIZER, new ITileDataProducer, TileCraftingMonitor>() { + public static final TileDataParameter> TASKS = TileDataManager.createParameter(RefinedStorageSerializers.CLIENT_CRAFTING_TASK_SERIALIZER, new ArrayList<>(), new ITileDataProducer, TileCraftingMonitor>() { @Override public List getValue(TileCraftingMonitor tile) { if (tile.connected) { @@ -26,7 +26,7 @@ public class TileCraftingMonitor extends TileNode { return Collections.emptyList(); } } - }, new ArrayList<>()); + }); public TileCraftingMonitor() { dataManager.addParameter(TASKS); diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index aafffaf37..456294a7a 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -23,7 +23,7 @@ import refinedstorage.tile.data.TileDataParameter; public class TileDetector extends TileNode implements IComparable { public static final TileDataParameter COMPARE = IComparable.createParameter(); - public static final TileDataParameter MODE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter MODE = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileDetector tile) { return tile.mode; @@ -39,7 +39,7 @@ public class TileDetector extends TileNode implements IComparable { } }); - public static final TileDataParameter AMOUNT = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter AMOUNT = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileDetector tile) { return tile.amount; @@ -59,7 +59,7 @@ public class TileDetector extends TileNode implements IComparable { ((GuiDetector) gui).AMOUNT.setText(String.valueOf(parameter.getValue())); } } - }, 0); + }); private static final int SPEED = 5; diff --git a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java index 43525596c..558668af0 100755 --- a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java @@ -17,21 +17,21 @@ import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; public class TileNetworkTransmitter extends TileNode { - public static final TileDataParameter DISTANCE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter DISTANCE = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileNetworkTransmitter tile) { return (tile.receiver != null && tile.isSameDimension()) ? tile.getDistance() : -1; } }); - public static final TileDataParameter RECEIVER_DIMENSION = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter RECEIVER_DIMENSION = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileNetworkTransmitter tile) { return tile.receiverDimension; } }); - public static final TileDataParameter RECEIVER_DIMENSION_SUPPORTED = TileDataManager.createParameter(DataSerializers.BOOLEAN, new ITileDataProducer() { + public static final TileDataParameter RECEIVER_DIMENSION_SUPPORTED = TileDataManager.createParameter(DataSerializers.BOOLEAN, false, new ITileDataProducer() { @Override public Boolean getValue(TileNetworkTransmitter tile) { return tile.isDimensionSupported(); diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 136c0dce6..40f991881 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -21,14 +21,14 @@ import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; public class TileSolderer extends TileNode { - public static final TileDataParameter DURATION = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter DURATION = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileSolderer tile) { return tile.recipe != null ? tile.recipe.getDuration() : 0; } }); - public static final TileDataParameter PROGRESS = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter PROGRESS = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileSolderer tile) { return tile.progress; diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 55f79d572..67540eef7 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -27,7 +27,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG public static final TileDataParameter PRIORITY = IPrioritizable.createParameter(); public static final TileDataParameter COMPARE = IComparable.createParameter(); public static final TileDataParameter MODE = IFilterable.createParameter(); - public static final TileDataParameter STORED = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter STORED = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileStorage tile) { return NBTStorage.getStoredFromNBT(tile.storageTag); diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 9c83b27e3..55b97b849 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -17,7 +17,7 @@ import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; public class TileWirelessTransmitter extends TileNode implements IWirelessTransmitter { - public static final TileDataParameter RANGE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter RANGE = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileWirelessTransmitter tile) { return tile.getRange(); diff --git a/src/main/java/refinedstorage/tile/config/IComparable.java b/src/main/java/refinedstorage/tile/config/IComparable.java index 4b5790915..4a3afa805 100755 --- a/src/main/java/refinedstorage/tile/config/IComparable.java +++ b/src/main/java/refinedstorage/tile/config/IComparable.java @@ -9,7 +9,7 @@ import refinedstorage.tile.data.TileDataParameter; public interface IComparable { static TileDataParameter createParameter() { - return TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + return TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(T tile) { return ((IComparable) tile).getCompare(); diff --git a/src/main/java/refinedstorage/tile/config/IFilterable.java b/src/main/java/refinedstorage/tile/config/IFilterable.java index a60351b17..16a69f92b 100755 --- a/src/main/java/refinedstorage/tile/config/IFilterable.java +++ b/src/main/java/refinedstorage/tile/config/IFilterable.java @@ -15,7 +15,7 @@ public interface IFilterable { int BLACKLIST = 1; static TileDataParameter createParameter() { - return TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + return TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(T tile) { return ((IFilterable) tile).getMode(); diff --git a/src/main/java/refinedstorage/tile/config/IPrioritizable.java b/src/main/java/refinedstorage/tile/config/IPrioritizable.java index c2383a849..70f1dda84 100755 --- a/src/main/java/refinedstorage/tile/config/IPrioritizable.java +++ b/src/main/java/refinedstorage/tile/config/IPrioritizable.java @@ -13,7 +13,7 @@ import refinedstorage.tile.data.TileDataParameter; public interface IPrioritizable { static TileDataParameter createParameter() { - return TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + return TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(T tile) { return ((IPrioritizable) tile).getPriority(); @@ -27,7 +27,7 @@ public interface IPrioritizable { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT && Minecraft.getMinecraft().currentScreen instanceof GuiStorage) { ((GuiStorage) Minecraft.getMinecraft().currentScreen).updatePriority(parameter.getValue()); } - }, 0); + }); } int getPriority(); diff --git a/src/main/java/refinedstorage/tile/config/RedstoneMode.java b/src/main/java/refinedstorage/tile/config/RedstoneMode.java index 3710bd9f7..9a2eb85d3 100755 --- a/src/main/java/refinedstorage/tile/config/RedstoneMode.java +++ b/src/main/java/refinedstorage/tile/config/RedstoneMode.java @@ -32,7 +32,7 @@ public enum RedstoneMode { } public static TileDataParameter createParameter() { - return TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + return TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(T tile) { return ((IRedstoneConfigurable) tile).getRedstoneMode().ordinal(); diff --git a/src/main/java/refinedstorage/tile/data/TileDataManager.java b/src/main/java/refinedstorage/tile/data/TileDataManager.java index d1ab8ef43..cee5ad105 100755 --- a/src/main/java/refinedstorage/tile/data/TileDataManager.java +++ b/src/main/java/refinedstorage/tile/data/TileDataManager.java @@ -25,19 +25,15 @@ public class TileDataManager { private List watchedParameters = new ArrayList<>(); private List watchedParametersCache = new ArrayList<>(); - public static TileDataParameter createParameter(DataSerializer serializer, ITileDataProducer producer) { - return createParameter(serializer, producer, null, null, null); + public static TileDataParameter createParameter(DataSerializer serializer, T defaultValue, ITileDataProducer producer) { + return createParameter(serializer, defaultValue, producer); } - public static TileDataParameter createParameter(DataSerializer serializer, ITileDataProducer producer, T defaultValue) { - return createParameter(serializer, producer, null, null, defaultValue); + public static TileDataParameter createParameter(DataSerializer serializer, T defaultValue, ITileDataProducer producer, ITileDataConsumer consumer) { + return createParameter(serializer, defaultValue, producer, consumer); } - public static TileDataParameter createParameter(DataSerializer serializer, ITileDataProducer producer, ITileDataConsumer consumer) { - return createParameter(serializer, producer, consumer, null, null); - } - - public static TileDataParameter createParameter(DataSerializer serializer, ITileDataProducer producer, ITileDataConsumer consumer, ITileDataListener listener, T defaultValue) { + public static TileDataParameter createParameter(DataSerializer serializer, T defaultValue, ITileDataProducer producer, ITileDataConsumer consumer, ITileDataListener listener) { TileDataParameter parameter = new TileDataParameter<>(PARAMETER_ID++, defaultValue, serializer, producer, consumer, listener); PARAMETER_MAP.put(parameter.getId(), parameter); diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index b6f740d3d..f2863064f 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -30,14 +30,14 @@ public class TileExternalStorage extends TileMultipartNode implements IStoragePr public static final TileDataParameter COMPARE = IComparable.createParameter(); public static final TileDataParameter MODE = IFilterable.createParameter(); - public static final TileDataParameter STORED = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter STORED = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileExternalStorage tile) { return tile.getStored(); } }); - public static final TileDataParameter CAPACITY = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter CAPACITY = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileExternalStorage tile) { return tile.getCapacity(); diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 872feb558..efcb3f848 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; public class TileGrid extends TileNode implements IGrid { - public static final TileDataParameter VIEW_TYPE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter VIEW_TYPE = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileGrid tile) { return tile.viewType; @@ -55,7 +55,7 @@ public class TileGrid extends TileNode implements IGrid { } }); - public static final TileDataParameter SORTING_DIRECTION = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter SORTING_DIRECTION = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileGrid tile) { return tile.sortingDirection; @@ -71,7 +71,7 @@ public class TileGrid extends TileNode implements IGrid { } }); - public static final TileDataParameter SORTING_TYPE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter SORTING_TYPE = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileGrid tile) { return tile.sortingType; @@ -87,7 +87,7 @@ public class TileGrid extends TileNode implements IGrid { } }); - public static final TileDataParameter SEARCH_BOX_MODE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter SEARCH_BOX_MODE = TileDataManager.createParameter(DataSerializers.VARINT, 0, new ITileDataProducer() { @Override public Integer getValue(TileGrid tile) { return tile.searchBoxMode; @@ -105,7 +105,7 @@ public class TileGrid extends TileNode implements IGrid { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT && Minecraft.getMinecraft().currentScreen instanceof GuiGrid) { ((GuiGrid) Minecraft.getMinecraft().currentScreen).updateSearchFieldFocus(parameter.getValue()); } - }, 0); + }); public static final String NBT_VIEW_TYPE = "ViewType"; public static final String NBT_SORTING_DIRECTION = "SortingDirection";