diff --git a/src/main/java/li/cil/oc2/common/Config.java b/src/main/java/li/cil/oc2/common/Config.java index 5b96b57f..317aba63 100644 --- a/src/main/java/li/cil/oc2/common/Config.java +++ b/src/main/java/li/cil/oc2/common/Config.java @@ -11,10 +11,6 @@ import java.util.UUID; public final class Config { @Path("vm") public static long maxAllocatedMemory = 512 * Constants.MEGABYTE; - @Path("vm") public static int maxMemorySize = 8 * Constants.MEGABYTE; - @Path("vm") public static int maxHardDriveSize = 8 * Constants.MEGABYTE; - @Path("vm") public static int maxFlashMemorySize = 4 * Constants.KILOBYTE; - @Path("vm") public static int maxFloppySize = 512 * Constants.KILOBYTE; @Path("energy.blocks") public static double busCableEnergyPerTick = 0.1; @Path("energy.blocks") public static double busInterfaceEnergyPerTick = 0.5; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java index 1d9b43bc..21109cfa 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java @@ -25,7 +25,7 @@ public final class FlashMemoryItemDeviceProvider extends AbstractItemDeviceProvi final ItemStack stack = query.getItemStack(); final FlashMemoryItem item = (FlashMemoryItem) stack.getItem(); - final int capacity = Mth.clamp(item.getCapacity(stack), 0, Config.maxFlashMemorySize); + final int capacity = Math.max(item.getCapacity(stack), 0); return Optional.of(new ByteBufferFlashStorageDevice(stack, capacity)); } } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java index 3eb1f13c..c85c0c95 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java @@ -47,6 +47,6 @@ public final class HardDriveItemDeviceProvider extends AbstractItemDeviceProvide private static int getCapacity(final ItemDeviceQuery query) { final ItemStack stack = query.getItemStack(); final HardDriveItem item = (HardDriveItem) stack.getItem(); - return Mth.clamp(item.getCapacity(stack), 0, Config.maxHardDriveSize); + return Math.max(item.getCapacity(stack), 0); } } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java index 69540f39..c82919b4 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java @@ -53,7 +53,7 @@ public final class HardDriveWithExternalDataItemDeviceProvider extends AbstractI return 0; } - final long capacity = Math.min(data.getBlockDevice().getCapacity(), Math.max(0, Config.maxHardDriveSize)); + final long capacity = Math.max(data.getBlockDevice().getCapacity(), 0); return Math.max(1, (int) Math.round(capacity * Config.hardDriveEnergyPerMegabytePerTick / Constants.MEGABYTE)); } } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java index 9bc8f2d2..9c1ac114 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java @@ -9,7 +9,6 @@ import li.cil.oc2.common.Constants; import li.cil.oc2.common.bus.device.provider.util.AbstractItemDeviceProvider; import li.cil.oc2.common.bus.device.vm.item.MemoryDevice; import li.cil.oc2.common.item.MemoryItem; -import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; import java.util.Optional; @@ -25,7 +24,7 @@ public final class MemoryItemDeviceProvider extends AbstractItemDeviceProvider { protected Optional getItemDevice(final ItemDeviceQuery query) { final ItemStack stack = query.getItemStack(); final MemoryItem item = (MemoryItem) stack.getItem(); - final int capacity = Mth.clamp(item.getCapacity(stack), 0, Config.maxMemorySize); + final int capacity = Math.max(item.getCapacity(stack), 0); return Optional.of(new MemoryDevice(query.getItemStack(), capacity)); } @@ -33,7 +32,7 @@ public final class MemoryItemDeviceProvider extends AbstractItemDeviceProvider { protected int getItemDeviceEnergyConsumption(final ItemDeviceQuery query) { final ItemStack stack = query.getItemStack(); final MemoryItem item = (MemoryItem) stack.getItem(); - final int capacity = Mth.clamp(item.getCapacity(stack), 0, Config.maxMemorySize); + final int capacity = Math.max(item.getCapacity(stack), 0); return Math.max(1, (int) Math.round(capacity * Config.memoryEnergyPerMegabytePerTick / Constants.MEGABYTE)); } } diff --git a/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java b/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java index 9e09cc4b..488c04ff 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java @@ -86,7 +86,7 @@ public final class DiskDriveDevice e return CompletableFuture.completedFuture(EMPTY_BLOCK_DEVICE); } - final int capacity = Mth.clamp(floppy.getCapacity(stack), 0, Config.maxFloppySize); + final int capacity = floppy.getCapacity(stack); if (capacity <= 0) { return CompletableFuture.completedFuture(EMPTY_BLOCK_DEVICE); }