Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove upper limits for device sizes. Needs op rights anyway, so kinda pointless.

Browse Source
This commit is contained in:
Florian Nücke
2022-02-27 17:50:47 +01:00
parent 75e50ffe22
commit abc7a2300a
6 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/li/cil/oc2/common/Config.java
View File

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

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/FlashMemoryItemDeviceProvider.java
View File

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

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveItemDeviceProvider.java
View File

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

2
src/main/java/li/cil/oc2/common/bus/device/provider/item/HardDriveWithExternalDataItemDeviceProvider.java
View File

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

5
src/main/java/li/cil/oc2/common/bus/device/provider/item/MemoryItemDeviceProvider.java
View File

@@ -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<ItemDevice> 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));
}
}

2
src/main/java/li/cil/oc2/common/bus/device/vm/block/DiskDriveDevice.java
View File

@@ -86,7 +86,7 @@ public final class DiskDriveDevice<T extends BlockEntity & DiskDriveContainer> 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);
}