From 543d92fee15bc730b86dd641de7d1d58181757be Mon Sep 17 00:00:00 2001 From: logan Date: Fri, 24 Jan 2025 23:15:07 -0800 Subject: [PATCH 01/52] Remove for nearby player check on network messages --- src/main/java/li/cil/oc2r/common/network/MessageUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/li/cil/oc2r/common/network/MessageUtils.java b/src/main/java/li/cil/oc2r/common/network/MessageUtils.java index 6f606268..02b3750a 100644 --- a/src/main/java/li/cil/oc2r/common/network/MessageUtils.java +++ b/src/main/java/li/cil/oc2r/common/network/MessageUtils.java @@ -18,7 +18,7 @@ import java.util.function.Consumer; public final class MessageUtils { public static void withNearbyServerBlockEntityForInteraction(final NetworkEvent.Context context, final BlockPos pos, final Class type, final BiConsumer callback) { final ServerPlayer player = context.getSender(); - if (player == null || !pos.closerToCenterThan(player.position(), 8)) { + if (player == null) { // || !pos.closerToCenterThan(player.position(), 8)) { return; } From 8c05a9ff34df7fe7360d66216b1a6f515fce0336 Mon Sep 17 00:00:00 2001 From: logan Date: Sun, 26 Jan 2025 02:38:05 -0800 Subject: [PATCH 02/52] Enable jarJar --- build.gradle | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build.gradle b/build.gradle index 4c1e3f44..ae012afc 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,8 @@ plugins { apply plugin: 'org.spongepowered.mixin' apply from: "minecraft.gradle" +apply plugin: "java" +jarJar.enable() allprojects { gradle.projectsEvaluated { @@ -71,6 +73,10 @@ repositories { } } } + flatDir { + dirs("libs") + } + } dependencies { @@ -121,6 +127,9 @@ dependencies { testImplementation "org.mockito:mockito-inline:4.3.1" testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2" + jarJar(group: 'libs', name: 'sedna', version: '[]') { + jarJar.pin(it, "") + } } System.setProperty("line.separator", "\n") @@ -141,6 +150,9 @@ task copyLicensesToResources(type: Copy) { processResources.dependsOn(packageScripts) processResources.dependsOn(copyLicensesToResources) +tasks.named('jarJar'){ +} + minecraft { mappings channel: "official", version: minecraft_version @@ -232,6 +244,7 @@ publishing { version = semver artifact jar artifact apiJar + jarJar.component(it) } } repositories { From c508fc6ccab1177581e5596b327d59df9ebdfd04 Mon Sep 17 00:00:00 2001 From: logan Date: Sun, 26 Jan 2025 02:56:08 -0800 Subject: [PATCH 03/52] don't embed libs --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 69022a76..fc1ef465 100644 --- a/.gitignore +++ b/.gitignore @@ -34,5 +34,7 @@ forge*changelog.txt #vscode .vscode +libs/ + # Don't ignore bin from scripts !/src/main/scripts/bin/ From 9c917a2fa5c2fc6a9cae95efe4dbbe0b82cfc2d7 Mon Sep 17 00:00:00 2001 From: logan Date: Sun, 26 Jan 2025 03:10:05 -0800 Subject: [PATCH 04/52] Bulk rename oc2r->oc2 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- README.md | 14 +- build.gradle | 24 +- settings.gradle | 2 +- src/main/java/li/cil/oc2r/api/API.java | 10 +- src/main/java/li/cil/oc2r/api/README.md | 40 +-- .../oc2r/api/bus/BlockDeviceBusElement.java | 2 +- .../java/li/cil/oc2r/api/bus/DeviceBus.java | 4 +- .../cil/oc2r/api/bus/DeviceBusController.java | 4 +- .../li/cil/oc2r/api/bus/DeviceBusElement.java | 6 +- .../li/cil/oc2r/api/bus/device/Device.java | 6 +- .../cil/oc2r/api/bus/device/DeviceType.java | 4 +- .../cil/oc2r/api/bus/device/DeviceTypes.java | 4 +- .../cil/oc2r/api/bus/device/ItemDevice.java | 4 +- .../api/bus/device/data/BlockDeviceData.java | 8 +- .../oc2r/api/bus/device/data/Firmware.java | 6 +- .../api/bus/device/data/package-info.java | 2 +- .../oc2r/api/bus/device/object/Callback.java | 6 +- .../oc2r/api/bus/device/object/Callbacks.java | 10 +- .../bus/device/object/DocumentedDevice.java | 2 +- .../device/object/LifecycleAwareDevice.java | 4 +- .../api/bus/device/object/NamedDevice.java | 2 +- .../api/bus/device/object/ObjectDevice.java | 10 +- .../oc2r/api/bus/device/object/Parameter.java | 2 +- .../api/bus/device/object/package-info.java | 2 +- .../cil/oc2r/api/bus/device/package-info.java | 2 +- .../device/provider/BlockDeviceProvider.java | 18 +- .../bus/device/provider/BlockDeviceQuery.java | 2 +- .../device/provider/ItemDeviceProvider.java | 14 +- .../bus/device/provider/ItemDeviceQuery.java | 2 +- .../api/bus/device/provider/package-info.java | 2 +- .../api/bus/device/rpc/AbstractRPCMethod.java | 2 +- .../oc2r/api/bus/device/rpc/RPCDevice.java | 12 +- .../api/bus/device/rpc/RPCInvocation.java | 2 +- .../oc2r/api/bus/device/rpc/RPCMethod.java | 6 +- .../api/bus/device/rpc/RPCMethodGroup.java | 4 +- .../oc2r/api/bus/device/rpc/RPCParameter.java | 2 +- .../oc2r/api/bus/device/rpc/package-info.java | 2 +- .../api/bus/device/vm/FirmwareLoader.java | 2 +- .../cil/oc2r/api/bus/device/vm/VMDevice.java | 16 +- .../api/bus/device/vm/VMDeviceLoadResult.java | 4 +- .../device/vm/context/InterruptAllocator.java | 4 +- .../device/vm/context/MemoryAllocator.java | 2 +- .../vm/context/MemoryRangeAllocator.java | 4 +- .../api/bus/device/vm/context/VMContext.java | 6 +- .../vm/context/VMLifecycleEventBus.java | 8 +- .../bus/device/vm/context/package-info.java | 2 +- .../vm/event/VMInitializationException.java | 2 +- .../device/vm/event/VMInitializingEvent.java | 6 +- .../vm/event/VMResumedRunningEvent.java | 6 +- .../device/vm/event/VMSynchronizeEvent.java | 2 +- .../api/bus/device/vm/event/package-info.java | 2 +- .../oc2r/api/bus/device/vm/package-info.java | 2 +- .../li/cil/oc2r/api/bus/package-info.java | 16 +- .../api/capabilities/NetworkInterface.java | 4 +- .../api/capabilities/RedstoneEmitter.java | 2 +- .../li/cil/oc2r/api/capabilities/Robot.java | 2 +- .../capabilities/TerminalUserProvider.java | 6 +- .../oc2r/api/capabilities/package-info.java | 2 +- .../imc/RPCMethodParameterTypeAdapter.java | 4 +- .../li/cil/oc2r/api/imc/package-info.java | 2 +- .../java/li/cil/oc2r/api/package-info.java | 2 +- .../li/cil/oc2r/api/util/Invalidatable.java | 6 +- .../java/li/cil/oc2r/api/util/Registries.java | 12 +- .../cil/oc2r/api/util/RobotOperationSide.java | 2 +- src/main/java/li/cil/oc2r/api/util/Side.java | 4 +- .../li/cil/oc2r/api/util/package-info.java | 2 +- .../java/li/cil/oc2r/client/ClientSetup.java | 32 +- .../client/audio/LoopingBlockEntitySound.java | 4 +- .../client/audio/LoopingSoundManager.java | 2 +- .../cil/oc2r/client/audio/package-info.java | 2 +- .../gui/AbstractMachineInventoryScreen.java | 18 +- .../gui/AbstractMachineTerminalScreen.java | 14 +- .../gui/AbstractModContainerScreen.java | 2 +- .../gui/AbstractMonitorDisplayScreen.java | 14 +- .../oc2r/client/gui/BusInterfaceScreen.java | 16 +- .../client/gui/ComputerContainerScreen.java | 4 +- .../client/gui/ComputerTerminalScreen.java | 4 +- .../oc2r/client/gui/FileChooserScreen.java | 4 +- .../cil/oc2r/client/gui/KeyCodeMapping.java | 2 +- .../cil/oc2r/client/gui/KeyboardScreen.java | 12 +- .../client/gui/MachineTerminalWidget.java | 8 +- .../oc2r/client/gui/MonitorDisplayScreen.java | 4 +- .../oc2r/client/gui/MonitorDisplayWidget.java | 14 +- .../gui/NetworkInterfaceCardScreen.java | 18 +- .../oc2r/client/gui/NetworkTunnelScreen.java | 12 +- .../oc2r/client/gui/RobotContainerScreen.java | 4 +- .../oc2r/client/gui/RobotTerminalScreen.java | 4 +- .../java/li/cil/oc2r/client/gui/Sprites.java | 6 +- .../java/li/cil/oc2r/client/gui/Textures.java | 4 +- .../li/cil/oc2r/client/gui/package-info.java | 2 +- .../client/gui/terminal/TerminalInput.java | 2 +- .../client/gui/terminal/package-info.java | 2 +- .../li/cil/oc2r/client/gui/util/GuiUtils.java | 14 +- .../oc2r/client/gui/util/package-info.java | 2 +- .../oc2r/client/gui/widget/ImageButton.java | 4 +- .../li/cil/oc2r/client/gui/widget/Sprite.java | 2 +- .../cil/oc2r/client/gui/widget/Texture.java | 4 +- .../client/gui/widget/ToggleImageButton.java | 2 +- .../oc2r/client/gui/widget/package-info.java | 2 +- .../oc2r/client/item/CustomItemColors.java | 4 +- .../item/CustomItemModelProperties.java | 6 +- .../li/cil/oc2r/client/item/package-info.java | 2 +- .../li/cil/oc2r/client/manual/Manuals.java | 8 +- .../client/manual/ModManualScreenStyle.java | 4 +- .../oc2r/client/manual/ModManualStyle.java | 4 +- .../cil/oc2r/client/manual/package-info.java | 2 +- .../oc2r/client/model/BusCableBakedModel.java | 10 +- .../cil/oc2r/client/model/BusCableModel.java | 4 +- .../client/model/BusCableModelLoader.java | 2 +- .../cil/oc2r/client/model/package-info.java | 2 +- .../java/li/cil/oc2r/client/package-info.java | 2 +- .../renderer/BusInterfaceNameRenderer.java | 8 +- .../oc2r/client/renderer/ModRenderType.java | 4 +- .../cil/oc2r/client/renderer/ModShaders.java | 4 +- .../client/renderer/MonitorGUIRenderer.java | 10 +- .../client/renderer/NetworkCableRenderer.java | 8 +- .../renderer/ProjectorDepthRenderer.java | 18 +- .../renderer/blockentity/ChargerRenderer.java | 10 +- .../blockentity/ComputerRenderer.java | 14 +- .../blockentity/DiskDriveRenderer.java | 6 +- .../renderer/blockentity/MonitorRenderer.java | 18 +- .../blockentity/ProjectorRenderer.java | 12 +- .../renderer/blockentity/package-info.java | 2 +- .../renderer/color/BusCableBlockColor.java | 6 +- .../client/renderer/color/package-info.java | 2 +- .../client/renderer/entity/RobotRenderer.java | 6 +- .../entity/RobotWithoutLevelRenderer.java | 4 +- .../renderer/entity/model/RobotModel.java | 6 +- .../renderer/entity/model/package-info.java | 2 +- .../client/renderer/entity/package-info.java | 2 +- .../renderer/font/MonospaceFontRenderer.java | 4 +- .../client/renderer/font/package-info.java | 2 +- .../oc2r/client/renderer/package-info.java | 2 +- .../java/li/cil/oc2r/common/CommonSetup.java | 14 +- src/main/java/li/cil/oc2r/common/Config.java | 4 +- .../li/cil/oc2r/common/ConfigManager.java | 4 +- .../java/li/cil/oc2r/common/Constants.java | 6 +- src/main/java/li/cil/oc2r/common/Main.java | 42 +-- .../java/li/cil/oc2r/common/block/Blocks.java | 4 +- .../cil/oc2r/common/block/BusCableBlock.java | 20 +- .../cil/oc2r/common/block/ChargerBlock.java | 6 +- .../cil/oc2r/common/block/ComputerBlock.java | 34 +-- .../common/block/CreativeEnergyBlock.java | 6 +- .../cil/oc2r/common/block/DiskDriveBlock.java | 6 +- .../common/block/EnergyConsumingBlock.java | 2 +- .../common/block/FlashMemoryFlasherBlock.java | 6 +- .../block/ImmutableHorizontalBlock.java | 2 +- .../cil/oc2r/common/block/KeyboardBlock.java | 10 +- .../cil/oc2r/common/block/MonitorBlock.java | 18 +- .../common/block/NetworkConnectorBlock.java | 8 +- .../oc2r/common/block/NetworkHubBlock.java | 6 +- .../oc2r/common/block/NetworkSwitchBlock.java | 6 +- .../oc2r/common/block/PciCardCageBlock.java | 10 +- .../cil/oc2r/common/block/ProjectorBlock.java | 10 +- .../common/block/RedstoneInterfaceBlock.java | 6 +- .../li/cil/oc2r/common/block/VxlanBlock.java | 8 +- .../cil/oc2r/common/block/package-info.java | 2 +- .../common/blockentity/BlockEntities.java | 6 +- .../blockentity/BusCableBlockEntity.java | 38 +-- .../blockentity/ChargerBlockEntity.java | 16 +- .../blockentity/ComputerBlockEntity.java | 54 ++-- .../CreativeEnergyBlockEntity.java | 4 +- .../blockentity/DiskDriveBlockEntity.java | 28 +- .../FlashMemoryFlasherBlockEntity.java | 28 +- .../blockentity/KeyboardBlockEntity.java | 6 +- .../common/blockentity/ModBlockEntity.java | 6 +- .../blockentity/MonitorBlockEntity.java | 42 +-- .../NetworkConnectorBlockEntity.java | 20 +- .../blockentity/NetworkHubBlockEntity.java | 14 +- .../blockentity/NetworkSwitchBlockEntity.java | 18 +- .../blockentity/PciCardCageBlockEntity.java | 12 +- .../blockentity/ProjectorBlockEntity.java | 30 +- .../RedstoneInterfaceBlockEntity.java | 18 +- .../blockentity/TickableBlockEntity.java | 4 +- .../common/blockentity/VxlanBlockEntity.java | 16 +- .../oc2r/common/blockentity/package-info.java | 2 +- .../bus/AbstractBlockDeviceBusElement.java | 30 +- .../common/bus/AbstractDeviceBusElement.java | 8 +- .../bus/AbstractGroupingDeviceBusElement.java | 6 +- .../bus/AbstractItemDeviceBusElement.java | 24 +- .../common/bus/BlockDeviceBusController.java | 12 +- .../common/bus/CommonDeviceBusController.java | 16 +- .../oc2r/common/bus/RPCDeviceBusAdapter.java | 18 +- .../bus/device/BlockDeviceBusElement.java | 4 +- .../oc2r/common/bus/device/DeviceGroup.java | 6 +- .../oc2r/common/bus/device/DeviceTypes.java | 12 +- .../device/data/BlockDeviceDataRegistry.java | 8 +- .../device/data/BuildrootBlockDeviceData.java | 4 +- .../bus/device/data/BuildrootFirmware.java | 4 +- .../common/bus/device/data/FileSystems.java | 10 +- .../bus/device/data/FirmwareRegistry.java | 8 +- .../device/data/ResourceBlockDeviceData.java | 4 +- .../common/bus/device/data/package-info.java | 2 +- .../oc2r/common/bus/device/package-info.java | 2 +- .../bus/device/provider/ProviderRegistry.java | 16 +- .../common/bus/device/provider/Providers.java | 6 +- .../BlockEntityCapabilityDeviceProvider.java | 12 +- .../device/provider/block/package-info.java | 2 +- ...ractItemStackCapabilityDeviceProvider.java | 8 +- .../BlockOperationsModuleDeviceProvider.java | 16 +- .../provider/item/CPUItemDeviceProvider.java | 18 +- .../item/EnergyStorageItemDeviceProvider.java | 12 +- ...ileImportExportCardItemDeviceProvider.java | 18 +- .../item/FlashMemoryItemDeviceProvider.java | 12 +- ...oryWithExternalDataItemDeviceProvider.java | 14 +- .../item/FluidHandlerItemDeviceProvider.java | 12 +- .../item/HardDriveItemDeviceProvider.java | 18 +- ...iveWithExternalDataItemDeviceProvider.java | 20 +- ...ventoryOperationsModuleDeviceProvider.java | 16 +- .../item/ItemHandlerItemDeviceProvider.java | 12 +- .../ItemStackCapabilityDeviceProvider.java | 10 +- .../item/MemoryItemDeviceProvider.java | 16 +- ...etworkInterfaceCardItemDeviceProvider.java | 14 +- .../NetworkTunnelCardItemDeviceProvider.java | 14 +- ...NetworkTunnelModuleItemDeviceProvider.java | 14 +- ...dstoneInterfaceCardItemDeviceProvider.java | 14 +- .../item/SoundCardItemDeviceProvider.java | 16 +- .../device/provider/item/package-info.java | 2 +- .../bus/device/provider/package-info.java | 2 +- .../util/AbstractBlockDeviceProvider.java | 4 +- ...ctBlockEntityCapabilityDeviceProvider.java | 10 +- .../AbstractBlockEntityDeviceProvider.java | 8 +- .../util/AbstractItemDeviceProvider.java | 8 +- .../device/provider/util/package-info.java | 2 +- .../bus/device/rpc/EnergyStorageDevice.java | 8 +- .../bus/device/rpc/FluidHandlerDevice.java | 8 +- .../bus/device/rpc/ItemHandlerDevice.java | 8 +- .../common/bus/device/rpc/RPCDeviceList.java | 6 +- .../bus/device/rpc/RPCItemStackTagFilter.java | 4 +- .../device/rpc/RPCItemStackTagFilters.java | 4 +- .../rpc/RPCMethodParameterTypeAdapters.java | 8 +- .../bus/device/rpc/TypeNameRPCDevice.java | 8 +- .../BlockEntityObjectDeviceProvider.java | 14 +- .../block/BlockStateObjectDeviceProvider.java | 14 +- .../EnergyStorageBlockDeviceProvider.java | 16 +- .../FluidHandlerBlockDeviceProvider.java | 16 +- .../block/ItemHandlerBlockDeviceProvider.java | 16 +- .../bus/device/rpc/block/package-info.java | 2 +- .../rpc/item/AbstractItemRPCDevice.java | 12 +- .../rpc/item/BlockOperationsModuleDevice.java | 16 +- .../bus/device/rpc/item/CPUItemDevice.java | 6 +- .../item/FileImportExportCardItemDevice.java | 20 +- .../item/InventoryOperationsModuleDevice.java | 12 +- .../item/RedstoneInterfaceCardItemDevice.java | 18 +- .../device/rpc/item/SoundCardItemDevice.java | 12 +- .../bus/device/rpc/item/package-info.java | 2 +- .../common/bus/device/rpc/package-info.java | 2 +- .../bus/device/util/AbstractDeviceInfo.java | 4 +- .../bus/device/util/BlockDeviceInfo.java | 6 +- .../bus/device/util/DeviceTypeImpl.java | 4 +- .../oc2r/common/bus/device/util/Devices.java | 20 +- .../common/bus/device/util/IdentityProxy.java | 2 +- .../bus/device/util/ItemDeviceInfo.java | 6 +- .../bus/device/util/OptionalAddress.java | 4 +- .../bus/device/util/OptionalInterrupt.java | 4 +- .../common/bus/device/util/package-info.java | 2 +- .../device/vm/block/DiskDriveContainer.java | 2 +- .../bus/device/vm/block/DiskDriveDevice.java | 8 +- .../vm/block/FlashMemoryFlasherContainer.java | 2 +- .../vm/block/FlashMemoryFlasherDevice.java | 8 +- .../bus/device/vm/block/KeyboardDevice.java | 20 +- .../bus/device/vm/block/MonitorDevice.java | 22 +- .../device/vm/block/PciCardCageDevice.java | 20 +- .../bus/device/vm/block/ProjectorDevice.java | 22 +- .../bus/device/vm/block/package-info.java | 2 +- .../vm/item/AbstractBlockStorageDevice.java | 28 +- .../item/AbstractNetworkInterfaceDevice.java | 24 +- .../vm/item/ByteBufferFlashStorageDevice.java | 26 +- .../vm/item/FirmwareFlashStorageDevice.java | 22 +- .../bus/device/vm/item/HardDriveDevice.java | 10 +- .../item/HardDriveDeviceWithInitialData.java | 4 +- .../bus/device/vm/item/MemoryDevice.java | 20 +- .../vm/item/NetworkInterfaceCardDevice.java | 4 +- .../device/vm/item/NetworkTunnelDevice.java | 12 +- .../bus/device/vm/item/package-info.java | 2 +- .../common/bus/device/vm/package-info.java | 2 +- .../li/cil/oc2r/common/bus/package-info.java | 2 +- .../common/capabilities/Capabilities.java | 14 +- .../capabilities/CapabilityRegistry.java | 16 +- .../common/capabilities/package-info.java | 2 +- .../container/AbstractComputerContainer.java | 22 +- .../common/container/AbstractContainer.java | 2 +- .../AbstractDeviceItemStackHandler.java | 4 +- .../container/AbstractMachineContainer.java | 4 +- .../AbstractMachineTerminalContainer.java | 4 +- .../container/AbstractMonitorContainer.java | 14 +- .../container/AbstractRobotContainer.java | 22 +- .../AbstractTypedDeviceItemStackHandler.java | 4 +- .../container/ComputerInventoryContainer.java | 10 +- .../container/ComputerTerminalContainer.java | 6 +- .../cil/oc2r/common/container/Containers.java | 4 +- .../oc2r/common/container/DeviceTypeSlot.java | 4 +- .../container/DeviceTypeSlotItemHandler.java | 4 +- .../container/FixedSizeItemStackHandler.java | 4 +- .../container/IntPrecisionContainerData.java | 2 +- .../cil/oc2r/common/container/LockedSlot.java | 2 +- .../container/MonitorDisplayContainer.java | 4 +- .../container/NetworkTunnelContainer.java | 8 +- .../container/RobotInventoryContainer.java | 12 +- .../cil/oc2r/common/container/RobotSlot.java | 2 +- .../container/RobotTerminalContainer.java | 10 +- .../container/TypedItemStackHandler.java | 2 +- .../oc2r/common/container/package-info.java | 2 +- .../common/energy/EnergyStorageItemStack.java | 6 +- .../common/energy/FixedEnergyStorage.java | 2 +- .../cil/oc2r/common/energy/package-info.java | 2 +- .../li/cil/oc2r/common/entity/Entities.java | 4 +- .../java/li/cil/oc2r/common/entity/Robot.java | 62 ++-- .../cil/oc2r/common/entity/package-info.java | 2 +- .../entity/robot/AbstractRobotAction.java | 4 +- .../entity/robot/AbstractRobotActionType.java | 4 +- .../entity/robot/MovementDirection.java | 2 +- .../entity/robot/RobotActionResult.java | 2 +- .../common/entity/robot/RobotActions.java | 4 +- .../entity/robot/RobotMovementAction.java | 12 +- .../entity/robot/RobotMovementActionType.java | 4 +- .../entity/robot/RobotRotationAction.java | 10 +- .../entity/robot/RobotRotationActionType.java | 4 +- .../entity/robot/RotationDirection.java | 2 +- .../common/entity/robot/package-info.java | 2 +- .../li/cil/oc2r/common/ext/MinecraftExt.java | 2 +- .../li/cil/oc2r/common/ext/package-info.java | 2 +- .../li/cil/oc2r/common/integration/IMC.java | 8 +- .../oc2r/common/integration/Integrations.java | 4 +- .../cil/oc2r/common/integration/Wrenches.java | 4 +- .../jei/ExtraGuiAreasJEIPlugin.java | 10 +- .../integration/jei/ExtraItemsJEIPlugin.java | 16 +- .../common/integration/jei/package-info.java | 2 +- .../oc2r/common/integration/package-info.java | 2 +- .../projectred/BundledCableHandler.java | 6 +- .../integration/util/BundledRedstone.java | 4 +- .../common/item/AbstractBlockDeviceItem.java | 8 +- .../oc2r/common/item/AbstractStorageItem.java | 8 +- .../common/item/BlockOperationsModule.java | 2 +- .../li/cil/oc2r/common/item/BusCableItem.java | 10 +- .../oc2r/common/item/BusInterfaceItem.java | 14 +- .../java/li/cil/oc2r/common/item/CPUItem.java | 2 +- .../li/cil/oc2r/common/item/ChargerItem.java | 2 +- .../cil/oc2r/common/item/FlashMemoryItem.java | 8 +- .../item/FlashMemoryWithExternalDataItem.java | 8 +- .../li/cil/oc2r/common/item/FloppyItem.java | 2 +- .../cil/oc2r/common/item/HardDriveItem.java | 6 +- .../item/HardDriveWithExternalDataItem.java | 6 +- .../li/cil/oc2r/common/item/ItemGroup.java | 6 +- .../oc2r/common/item/ItemRenameHandler.java | 4 +- .../java/li/cil/oc2r/common/item/Items.java | 12 +- .../li/cil/oc2r/common/item/ManualItem.java | 10 +- .../li/cil/oc2r/common/item/MemoryItem.java | 4 +- .../li/cil/oc2r/common/item/ModBlockItem.java | 4 +- .../java/li/cil/oc2r/common/item/ModItem.java | 4 +- .../oc2r/common/item/NetworkCableItem.java | 10 +- .../common/item/NetworkInterfaceCardItem.java | 14 +- .../oc2r/common/item/NetworkTunnelItem.java | 10 +- .../li/cil/oc2r/common/item/RobotItem.java | 30 +- .../li/cil/oc2r/common/item/WrenchItem.java | 4 +- .../item/crafting/RecipeSerializers.java | 4 +- .../common/item/crafting/WrenchRecipe.java | 4 +- .../common/item/crafting/package-info.java | 2 +- .../li/cil/oc2r/common/item/package-info.java | 2 +- .../cil/oc2r/common/mixin/FrustumMixin.java | 4 +- .../oc2r/common/mixin/LevelRendererMixin.java | 4 +- .../cil/oc2r/common/mixin/MinecraftMixin.java | 6 +- .../common/mixin/ServerChunkCacheMixin.java | 4 +- .../cil/oc2r/common/mixin/package-info.java | 2 +- .../cil/oc2r/common/network/MessageUtils.java | 4 +- .../common/network/MonitorLoadBalancer.java | 10 +- .../li/cil/oc2r/common/network/Network.java | 6 +- .../common/network/ProjectorLoadBalancer.java | 10 +- .../network/message/AbstractMessage.java | 4 +- .../message/AbstractTerminalBlockMessage.java | 4 +- .../AbstractTerminalEntityMessage.java | 2 +- .../message/BusCableFacadeMessage.java | 6 +- .../message/BusInterfaceNameMessage.java | 6 +- .../ClientCanceledImportFileMessage.java | 4 +- .../message/ComputerBootErrorMessage.java | 6 +- .../message/ComputerBusStateMessage.java | 8 +- .../network/message/ComputerPowerMessage.java | 6 +- .../message/ComputerRunStateMessage.java | 8 +- .../message/ComputerTerminalInputMessage.java | 6 +- .../ComputerTerminalOutputMessage.java | 6 +- .../message/DiskDriveFloppyMessage.java | 6 +- .../network/message/ExportedFileMessage.java | 4 +- .../message/FirmwareFlasherMessage.java | 6 +- .../network/message/ImportedFileMessage.java | 4 +- .../network/message/KeyboardInputMessage.java | 6 +- .../message/MonitorFramebufferMessage.java | 6 +- .../network/message/MonitorInputMessage.java | 6 +- .../network/message/MonitorPowerMessage.java | 8 +- .../message/MonitorPowerMessageForwarded.java | 6 +- .../MonitorRequestFramebufferMessage.java | 8 +- .../network/message/MonitorStateMessage.java | 6 +- .../network/message/MultipartMessage.java | 6 +- .../NetworkConnectorConnectionsMessage.java | 6 +- ...workInterfaceCardConfigurationMessage.java | 6 +- .../message/NetworkTunnelLinkMessage.java | 4 +- .../message/OpenComputerInventoryMessage.java | 6 +- .../message/OpenComputerTerminalMessage.java | 6 +- .../message/OpenRobotInventoryMessage.java | 6 +- .../message/OpenRobotTerminalMessage.java | 6 +- .../message/ProjectorFramebufferMessage.java | 6 +- .../ProjectorRequestFramebufferMessage.java | 8 +- .../message/ProjectorStateMessage.java | 6 +- .../message/RequestImportedFileMessage.java | 10 +- .../message/RobotBootErrorMessage.java | 6 +- .../network/message/RobotBusStateMessage.java | 8 +- .../message/RobotInitializationMessage.java | 12 +- .../RobotInitializationRequestMessage.java | 6 +- .../network/message/RobotPowerMessage.java | 6 +- .../network/message/RobotRunStateMessage.java | 8 +- .../message/RobotTerminalInputMessage.java | 6 +- .../message/RobotTerminalOutputMessage.java | 6 +- .../ServerCanceledImportFileMessage.java | 4 +- .../common/network/message/package-info.java | 2 +- .../cil/oc2r/common/network/package-info.java | 2 +- .../java/li/cil/oc2r/common/package-info.java | 2 +- .../common/serialization/BlobStorage.java | 4 +- .../serialization/NBTSerialization.java | 4 +- .../serialization/NBTToJsonConverter.java | 4 +- .../ceres/JsonArraySerializer.java | 2 +- .../ceres/MemoryRangeListSerializer.java | 4 +- .../ceres/MemoryRangeSerializer.java | 2 +- .../serialization/ceres/Serializers.java | 4 +- .../ceres/TextComponentSerializer.java | 2 +- .../serialization/ceres/package-info.java | 2 +- .../gson/DirectionJsonSerializer.java | 2 +- .../gson/EmptyRPCMethodGroupSerializer.java | 4 +- .../gson/ItemStackJsonSerializer.java | 6 +- .../gson/MessageJsonDeserializer.java | 4 +- .../MethodInvocationJsonDeserializer.java | 4 +- ...RPCDeviceWithIdentifierJsonSerializer.java | 4 +- .../gson/RPCMethodJsonSerializer.java | 6 +- .../gson/SideJsonDeserializer.java | 4 +- .../gson/UnsignedByteArrayJsonSerializer.java | 2 +- .../serialization/gson/package-info.java | 2 +- .../common/serialization/package-info.java | 2 +- .../li/cil/oc2r/common/tags/BlockTags.java | 4 +- .../li/cil/oc2r/common/tags/ItemTags.java | 4 +- .../li/cil/oc2r/common/tags/package-info.java | 2 +- .../oc2r/common/util/BlockEntityUtils.java | 2 +- .../cil/oc2r/common/util/BlockLocation.java | 2 +- .../common/util/ChainableVertexConsumer.java | 2 +- .../cil/oc2r/common/util/ChunkLocation.java | 2 +- .../li/cil/oc2r/common/util/ChunkUtils.java | 6 +- .../li/cil/oc2r/common/util/ColorUtils.java | 2 +- .../java/li/cil/oc2r/common/util/Event.java | 2 +- .../cil/oc2r/common/util/FakePlayerUtils.java | 6 +- .../common/util/HorizontalBlockUtils.java | 4 +- .../cil/oc2r/common/util/ItemDeviceUtils.java | 2 +- .../cil/oc2r/common/util/ItemStackUtils.java | 4 +- .../oc2r/common/util/LazyOptionalUtils.java | 2 +- .../li/cil/oc2r/common/util/LevelUtils.java | 2 +- .../common/util/LocationSupplierUtils.java | 6 +- .../li/cil/oc2r/common/util/NBTTagIds.java | 2 +- .../li/cil/oc2r/common/util/NBTUtils.java | 2 +- .../oc2r/common/util/ParameterizedEvent.java | 2 +- .../cil/oc2r/common/util/RegistryUtils.java | 12 +- .../cil/oc2r/common/util/RunnableUtils.java | 2 +- .../cil/oc2r/common/util/ServerScheduler.java | 2 +- .../li/cil/oc2r/common/util/SoundEvents.java | 4 +- .../cil/oc2r/common/util/TerminalUtils.java | 4 +- .../cil/oc2r/common/util/TextFormatUtils.java | 2 +- .../common/util/ThrottledSoundEmitter.java | 2 +- .../li/cil/oc2r/common/util/TickUtils.java | 4 +- .../li/cil/oc2r/common/util/TooltipUtils.java | 20 +- .../oc2r/common/util/TranslationUtils.java | 4 +- .../li/cil/oc2r/common/util/Vec3Utils.java | 2 +- .../cil/oc2r/common/util/VoxelShapeUtils.java | 2 +- .../li/cil/oc2r/common/util/package-info.java | 2 +- .../common/vm/AbstractTerminalVMRunner.java | 2 +- .../vm/AbstractVMItemStackHandlers.java | 20 +- .../common/vm/AbstractVirtualMachine.java | 26 +- .../java/li/cil/oc2r/common/vm/Allocator.java | 6 +- .../oc2r/common/vm/BaseAddressProvider.java | 4 +- .../li/cil/oc2r/common/vm/BuiltinDevices.java | 6 +- .../common/vm/MinecraftRealTimeCounter.java | 2 +- .../java/li/cil/oc2r/common/vm/Terminal.java | 4 +- .../oc2r/common/vm/VMDeviceBusAdapter.java | 12 +- .../oc2r/common/vm/VMItemStackHandlers.java | 4 +- .../li/cil/oc2r/common/vm/VMRunState.java | 2 +- .../java/li/cil/oc2r/common/vm/VMRunner.java | 16 +- .../li/cil/oc2r/common/vm/VirtualMachine.java | 4 +- .../oc2r/common/vm/context/EventManager.java | 2 +- .../common/vm/context/InterruptManager.java | 2 +- .../common/vm/context/InterruptValidator.java | 2 +- .../common/vm/context/MemoryRangeManager.java | 2 +- .../context/VMContextManagerCollection.java | 2 +- .../vm/context/global/GlobalEventBus.java | 8 +- .../global/GlobalInterruptAllocator.java | 8 +- .../global/GlobalInterruptController.java | 4 +- .../context/global/GlobalMemoryAllocator.java | 6 +- .../vm/context/global/GlobalMemoryMap.java | 2 +- .../global/GlobalMemoryRangeAllocator.java | 6 +- .../vm/context/global/GlobalVMContext.java | 12 +- .../vm/context/global/MemoryRangeList.java | 2 +- .../vm/context/global/package-info.java | 2 +- .../vm/context/managed/ManagedEventBus.java | 6 +- .../managed/ManagedInterruptAllocator.java | 8 +- .../managed/ManagedInterruptController.java | 4 +- .../managed/ManagedMemoryAllocator.java | 6 +- .../vm/context/managed/ManagedMemoryMap.java | 2 +- .../managed/ManagedMemoryRangeAllocator.java | 6 +- .../vm/context/managed/ManagedVMContext.java | 6 +- .../vm/context/managed/package-info.java | 2 +- .../oc2r/common/vm/context/package-info.java | 2 +- .../common/vm/device/PciRootPortDevice.java | 2 +- .../vm/device/SimpleFramebufferDevice.java | 6 +- .../oc2r/common/vm/fs/LayeredFileSystem.java | 2 +- .../cil/oc2r/common/vm/fs/package-info.java | 2 +- .../li/cil/oc2r/common/vm/package-info.java | 2 +- .../vm/provider/DeviceTreeProviders.java | 6 +- .../provider/PciRootPortDeviceProvider.java | 4 +- .../SimpleFramebufferDeviceProvider.java | 4 +- .../cil/oc2r/common/vxlan/TunnelManager.java | 6 +- .../java/li/cil/oc2r/data/DataGenerators.java | 4 +- .../cil/oc2r/data/ModBlockStateProvider.java | 10 +- .../cil/oc2r/data/ModBlockTagsProvider.java | 8 +- .../cil/oc2r/data/ModItemModelProvider.java | 8 +- .../li/cil/oc2r/data/ModItemTagsProvider.java | 8 +- .../cil/oc2r/data/ModLootTableProvider.java | 6 +- .../li/cil/oc2r/data/ModRecipesProvider.java | 4 +- .../li/cil/oc2r/data/WrenchRecipeBuilder.java | 6 +- .../java/li/cil/oc2r/data/package-info.java | 2 +- .../jcodec/codecs/common/biari/MConst.java | 2 +- .../jcodec/codecs/common/biari/MDecoder.java | 2 +- .../oc2r/jcodec/codecs/h264/H264Const.java | 12 +- .../oc2r/jcodec/codecs/h264/H264Decoder.java | 26 +- .../oc2r/jcodec/codecs/h264/H264Encoder.java | 26 +- .../oc2r/jcodec/codecs/h264/H264Utils.java | 2 +- .../oc2r/jcodec/codecs/h264/POCManager.java | 12 +- .../codecs/h264/decode/BlockInterpolator.java | 6 +- .../codecs/h264/decode/CABACContst.java | 2 +- .../codecs/h264/decode/CAVLCReader.java | 6 +- .../h264/decode/ChromaPredictionBuilder.java | 8 +- .../codecs/h264/decode/CoeffTransformer.java | 4 +- .../codecs/h264/decode/DeblockerInput.java | 14 +- .../codecs/h264/decode/DecoderState.java | 8 +- .../codecs/h264/decode/FrameReader.java | 28 +- .../decode/Intra16x16PredictionBuilder.java | 10 +- .../decode/Intra4x4PredictionBuilder.java | 4 +- .../decode/Intra8x8PredictionBuilder.java | 4 +- .../jcodec/codecs/h264/decode/MBlock.java | 10 +- .../h264/decode/MBlockDecoderBDirect.java | 22 +- .../codecs/h264/decode/MBlockDecoderBase.java | 22 +- .../codecs/h264/decode/MBlockDecoderIPCM.java | 10 +- .../h264/decode/MBlockDecoderInter.java | 24 +- .../h264/decode/MBlockDecoderInter8x8.java | 24 +- .../h264/decode/MBlockDecoderIntra16x16.java | 10 +- .../h264/decode/MBlockDecoderIntraNxN.java | 10 +- .../h264/decode/MBlockDecoderUtils.java | 10 +- .../codecs/h264/decode/MBlockSkipDecoder.java | 26 +- .../codecs/h264/decode/PredictionMerger.java | 10 +- .../codecs/h264/decode/RefListManager.java | 16 +- .../codecs/h264/decode/SliceDecoder.java | 20 +- .../codecs/h264/decode/SliceHeaderReader.java | 16 +- .../codecs/h264/decode/SliceReader.java | 28 +- .../h264/decode/aso/FlatMBlockMapper.java | 2 +- .../h264/decode/aso/MBToSliceGroupMap.java | 2 +- .../codecs/h264/decode/aso/MapManager.java | 8 +- .../jcodec/codecs/h264/decode/aso/Mapper.java | 2 +- .../h264/decode/aso/PrebuiltMBlockMapper.java | 2 +- .../h264/decode/aso/SliceGroupMapBuilder.java | 2 +- .../h264/decode/deblock/DeblockingFilter.java | 16 +- .../codecs/h264/encode/CQPRateControl.java | 10 +- .../jcodec/codecs/h264/encode/EncodedMB.java | 8 +- .../codecs/h264/encode/EncodingContext.java | 6 +- .../codecs/h264/encode/H264EncoderUtils.java | 2 +- .../h264/encode/IntraPredEstimator.java | 16 +- .../codecs/h264/encode/MBDeblocker.java | 10 +- .../codecs/h264/encode/MBEncoderHelper.java | 6 +- .../codecs/h264/encode/MBWriterI16x16.java | 26 +- .../codecs/h264/encode/MBWriterINxN.java | 24 +- .../codecs/h264/encode/MBWriterP16x16.java | 24 +- .../codecs/h264/encode/MotionEstimator.java | 10 +- .../codecs/h264/encode/RateControl.java | 8 +- .../cil/oc2r/jcodec/codecs/h264/io/CABAC.java | 18 +- .../cil/oc2r/jcodec/codecs/h264/io/CAVLC.java | 20 +- .../codecs/h264/io/model/AspectRatio.java | 2 +- .../jcodec/codecs/h264/io/model/Frame.java | 8 +- .../codecs/h264/io/model/HRDParameters.java | 2 +- .../jcodec/codecs/h264/io/model/MBType.java | 2 +- .../jcodec/codecs/h264/io/model/NALUnit.java | 2 +- .../codecs/h264/io/model/NALUnitType.java | 2 +- .../h264/io/model/PictureParameterSet.java | 10 +- .../h264/io/model/PredictionWeightTable.java | 2 +- .../codecs/h264/io/model/RefPicMarking.java | 2 +- .../h264/io/model/RefPicMarkingIDR.java | 2 +- .../codecs/h264/io/model/SeqParameterSet.java | 14 +- .../codecs/h264/io/model/SliceHeader.java | 2 +- .../codecs/h264/io/model/SliceType.java | 2 +- .../codecs/h264/io/model/VUIParameters.java | 2 +- .../codecs/h264/io/write/CAVLCWriter.java | 6 +- .../h264/io/write/SliceHeaderWriter.java | 8 +- .../li/cil/oc2r/jcodec/common/ArrayUtil.java | 2 +- .../cil/oc2r/jcodec/common/IntArrayList.java | 2 +- .../cil/oc2r/jcodec/common/IntObjectMap.java | 2 +- .../cil/oc2r/jcodec/common/VideoDecoder.java | 4 +- .../cil/oc2r/jcodec/common/VideoEncoder.java | 6 +- .../cil/oc2r/jcodec/common/io/BitReader.java | 2 +- .../cil/oc2r/jcodec/common/io/BitWriter.java | 2 +- .../li/cil/oc2r/jcodec/common/io/VLC.java | 4 +- .../cil/oc2r/jcodec/common/io/VLCBuilder.java | 4 +- .../oc2r/jcodec/common/model/ColorSpace.java | 2 +- .../cil/oc2r/jcodec/common/model/Picture.java | 2 +- .../li/cil/oc2r/jcodec/common/model/Size.java | 2 +- .../oc2r/jcodec/common/tools/MathUtil.java | 2 +- .../cil/oc2r/jcodec/scale/RgbToYuv420j.java | 6 +- .../li/cil/oc2r/jcodec/scale/Transform.java | 4 +- .../cil/oc2r/jcodec/scale/Yuv420jToRgb.java | 6 +- src/main/resources/META-INF/mods.toml | 14 +- .../assets/oc2r/blockstates/bus_cable.json | 26 +- .../assets/oc2r/blockstates/charger.json | 8 +- .../assets/oc2r/blockstates/computer.json | 8 +- .../oc2r/blockstates/creative_energy.json | 2 +- .../assets/oc2r/blockstates/disk_drive.json | 8 +- .../blockstates/flash_memory_flasher.json | 8 +- .../assets/oc2r/blockstates/keyboard.json | 8 +- .../assets/oc2r/blockstates/monitor.json | 8 +- .../oc2r/blockstates/network_connector.json | 24 +- .../assets/oc2r/blockstates/network_hub.json | 8 +- .../oc2r/blockstates/network_switch.json | 8 +- .../oc2r/blockstates/pci_card_cage.json | 16 +- .../assets/oc2r/blockstates/projector.json | 16 +- .../oc2r/blockstates/redstone_interface.json | 8 +- .../assets/oc2r/blockstates/vxlan_hub.json | 8 +- .../assets/oc2r/doc/en_us/block/bus_cable.md | 2 +- .../oc2r/doc/en_us/block/bus_interface.md | 2 +- .../assets/oc2r/doc/en_us/block/charger.md | 2 +- .../assets/oc2r/doc/en_us/block/computer.md | 2 +- .../assets/oc2r/doc/en_us/block/disk_drive.md | 2 +- .../doc/en_us/block/flash_memory_flasher.md | 2 +- .../assets/oc2r/doc/en_us/block/keyboard.md | 2 +- .../assets/oc2r/doc/en_us/block/monitor.md | 2 +- .../oc2r/doc/en_us/block/network_connector.md | 2 +- .../oc2r/doc/en_us/block/network_hub.md | 2 +- .../assets/oc2r/doc/en_us/block/projector.md | 2 +- .../doc/en_us/block/redstone_interface.md | 2 +- .../doc/en_us/item/block_operations_module.md | 2 +- .../doc/en_us/item/file_import_export_card.md | 2 +- .../oc2r/doc/en_us/item/flash_memory.md | 2 +- .../assets/oc2r/doc/en_us/item/floppy.md | 2 +- .../assets/oc2r/doc/en_us/item/hard_drive.md | 2 +- .../en_us/item/inventory_operations_module.md | 2 +- .../assets/oc2r/doc/en_us/item/manual.md | 2 +- .../assets/oc2r/doc/en_us/item/memory.md | 2 +- .../oc2r/doc/en_us/item/network_cable.md | 2 +- .../doc/en_us/item/network_interface_card.md | 2 +- .../doc/en_us/item/network_tunnel_card.md | 2 +- .../doc/en_us/item/network_tunnel_module.md | 2 +- .../doc/en_us/item/redstone_interface_card.md | 2 +- .../assets/oc2r/doc/en_us/item/robot.md | 2 +- .../assets/oc2r/doc/en_us/item/sound_card.md | 2 +- .../assets/oc2r/doc/en_us/item/wrench.md | 2 +- .../assets/oc2r/doc/ru_ru/block/bus_cable.md | 2 +- .../oc2r/doc/ru_ru/block/bus_interface.md | 2 +- .../assets/oc2r/doc/ru_ru/block/charger.md | 2 +- .../assets/oc2r/doc/ru_ru/block/computer.md | 2 +- .../assets/oc2r/doc/ru_ru/block/disk_drive.md | 2 +- .../doc/ru_ru/block/flash_memory_flasher.md | 2 +- .../assets/oc2r/doc/ru_ru/block/keyboard.md | 2 +- .../assets/oc2r/doc/ru_ru/block/monitor.md | 2 +- .../oc2r/doc/ru_ru/block/network_connector.md | 2 +- .../oc2r/doc/ru_ru/block/network_hub.md | 2 +- .../assets/oc2r/doc/ru_ru/block/projector.md | 2 +- .../doc/ru_ru/block/redstone_interface.md | 2 +- .../doc/ru_ru/item/block_operations_module.md | 2 +- .../doc/ru_ru/item/file_import_export_card.md | 2 +- .../oc2r/doc/ru_ru/item/flash_memory.md | 2 +- .../assets/oc2r/doc/ru_ru/item/floppy.md | 2 +- .../assets/oc2r/doc/ru_ru/item/hard_drive.md | 2 +- .../ru_ru/item/inventory_operations_module.md | 2 +- .../assets/oc2r/doc/ru_ru/item/manual.md | 2 +- .../assets/oc2r/doc/ru_ru/item/memory.md | 2 +- .../oc2r/doc/ru_ru/item/network_cable.md | 2 +- .../doc/ru_ru/item/network_interface_card.md | 2 +- .../doc/ru_ru/item/network_tunnel_card.md | 2 +- .../doc/ru_ru/item/network_tunnel_module.md | 2 +- .../doc/ru_ru/item/redstone_interface_card.md | 2 +- .../assets/oc2r/doc/ru_ru/item/robot.md | 2 +- .../assets/oc2r/doc/ru_ru/item/sound_card.md | 2 +- .../assets/oc2r/doc/ru_ru/item/wrench.md | 2 +- .../assets/oc2r/doc/zh_cn/block/bus_cable.md | 2 +- .../oc2r/doc/zh_cn/block/bus_interface.md | 2 +- .../assets/oc2r/doc/zh_cn/block/charger.md | 2 +- .../assets/oc2r/doc/zh_cn/block/computer.md | 2 +- .../assets/oc2r/doc/zh_cn/block/disk_drive.md | 2 +- .../doc/zh_cn/block/flash_memory_flasher.md | 2 +- .../assets/oc2r/doc/zh_cn/block/keyboard.md | 2 +- .../assets/oc2r/doc/zh_cn/block/monitor.md | 2 +- .../oc2r/doc/zh_cn/block/network_connector.md | 2 +- .../oc2r/doc/zh_cn/block/network_hub.md | 2 +- .../assets/oc2r/doc/zh_cn/block/projector.md | 2 +- .../doc/zh_cn/block/redstone_interface.md | 2 +- .../doc/zh_cn/item/block_operations_module.md | 2 +- .../doc/zh_cn/item/file_import_export_card.md | 2 +- .../oc2r/doc/zh_cn/item/flash_memory.md | 2 +- .../assets/oc2r/doc/zh_cn/item/floppy.md | 2 +- .../assets/oc2r/doc/zh_cn/item/hard_drive.md | 2 +- .../zh_cn/item/inventory_operations_module.md | 2 +- .../assets/oc2r/doc/zh_cn/item/manual.md | 2 +- .../assets/oc2r/doc/zh_cn/item/memory.md | 2 +- .../oc2r/doc/zh_cn/item/network_cable.md | 2 +- .../doc/zh_cn/item/network_interface_card.md | 2 +- .../doc/zh_cn/item/network_tunnel_card.md | 2 +- .../doc/zh_cn/item/network_tunnel_module.md | 2 +- .../doc/zh_cn/item/redstone_interface_card.md | 2 +- .../assets/oc2r/doc/zh_cn/item/robot.md | 2 +- .../assets/oc2r/doc/zh_cn/item/sound_card.md | 2 +- .../assets/oc2r/doc/zh_cn/item/wrench.md | 2 +- .../resources/assets/oc2r/lang/en_us.json | 276 +++++++++--------- .../resources/assets/oc2r/lang/ru_ru.json | 276 +++++++++--------- .../resources/assets/oc2r/lang/zh_cn.json | 276 +++++++++--------- .../assets/oc2r/models/block/cable_base.json | 2 +- .../assets/oc2r/models/block/cable_link.json | 2 +- .../assets/oc2r/models/block/cable_plug.json | 2 +- .../oc2r/models/block/cable_straight.json | 2 +- .../oc2r/models/block/cable_support.json | 2 +- .../assets/oc2r/models/block/charger.json | 2 +- .../assets/oc2r/models/block/computer.json | 10 +- .../oc2r/models/block/creative_energy.json | 2 +- .../assets/oc2r/models/block/disk_drive.json | 2 +- .../models/block/flash_memory_flasher.json | 2 +- .../assets/oc2r/models/block/keyboard.json | 2 +- .../assets/oc2r/models/block/monitor.json | 6 +- .../oc2r/models/block/network_connector.json | 2 +- .../assets/oc2r/models/block/network_hub.json | 2 +- .../oc2r/models/block/network_switch.json | 10 +- .../oc2r/models/block/pci_card_cage.json | 2 +- .../assets/oc2r/models/block/projector.json | 2 +- .../oc2r/models/block/redstone_interface.json | 2 +- .../assets/oc2r/models/block/vxlan_hub.json | 10 +- .../models/item/block_operations_module.json | 2 +- .../assets/oc2r/models/item/bus_cable.json | 2 +- .../oc2r/models/item/bus_interface.json | 2 +- .../assets/oc2r/models/item/charger.json | 2 +- .../oc2r/models/item/circuit_board.json | 2 +- .../assets/oc2r/models/item/computer.json | 2 +- .../assets/oc2r/models/item/cpu_tier_1.json | 2 +- .../assets/oc2r/models/item/cpu_tier_2.json | 2 +- .../assets/oc2r/models/item/cpu_tier_3.json | 2 +- .../assets/oc2r/models/item/cpu_tier_4.json | 2 +- .../oc2r/models/item/creative_energy.json | 2 +- .../assets/oc2r/models/item/disk_drive.json | 2 +- .../models/item/file_import_export_card.json | 2 +- .../assets/oc2r/models/item/flash_memory.json | 2 +- .../oc2r/models/item/flash_memory_custom.json | 2 +- .../models/item/flash_memory_flasher.json | 2 +- .../assets/oc2r/models/item/floppy.json | 4 +- .../oc2r/models/item/floppy_modern.json | 4 +- .../oc2r/models/item/hard_drive_custom.json | 4 +- .../models/item/hard_drive_extra_large.json | 4 +- .../oc2r/models/item/hard_drive_large.json | 4 +- .../oc2r/models/item/hard_drive_medium.json | 4 +- .../oc2r/models/item/hard_drive_small.json | 4 +- .../item/inventory_operations_module.json | 2 +- .../assets/oc2r/models/item/keyboard.json | 2 +- .../assets/oc2r/models/item/manual.json | 2 +- .../oc2r/models/item/memory_extra_large.json | 2 +- .../assets/oc2r/models/item/memory_large.json | 2 +- .../oc2r/models/item/memory_medium.json | 2 +- .../assets/oc2r/models/item/memory_small.json | 2 +- .../assets/oc2r/models/item/monitor.json | 2 +- .../oc2r/models/item/network_cable.json | 2 +- .../oc2r/models/item/network_connector.json | 2 +- .../assets/oc2r/models/item/network_hub.json | 2 +- .../models/item/network_interface_card.json | 2 +- .../oc2r/models/item/network_switch.json | 2 +- .../oc2r/models/item/network_tunnel_card.json | 2 +- .../models/item/network_tunnel_module.json | 2 +- .../oc2r/models/item/pci_card_cage.json | 2 +- .../assets/oc2r/models/item/projector.json | 2 +- .../oc2r/models/item/raw_silicon_wafer.json | 2 +- .../oc2r/models/item/redstone_interface.json | 2 +- .../models/item/redstone_interface_card.json | 2 +- .../assets/oc2r/models/item/silicon.json | 2 +- .../oc2r/models/item/silicon_blend.json | 2 +- .../oc2r/models/item/silicon_wafer.json | 2 +- .../assets/oc2r/models/item/sound_card.json | 2 +- .../assets/oc2r/models/item/transistor.json | 2 +- .../assets/oc2r/models/item/vxlan_hub.json | 2 +- .../assets/oc2r/models/item/wrench.json | 2 +- .../assets/oc2r/shaders/core/projectors.json | 4 +- src/main/resources/assets/oc2r/sounds.json | 42 +-- .../data/forge/tags/items/silicon.json | 2 +- .../oc2r.common/block_operations_module.json | 6 +- .../recipes/oc2r.common/bus_cable.json | 6 +- .../recipes/oc2r.common/bus_interface.json | 6 +- .../recipes/oc2r.common/charger.json | 6 +- .../recipes/oc2r.common/circuit_board.json | 6 +- .../recipes/oc2r.common/computer.json | 8 +- .../recipes/oc2r.common/disk_drive.json | 6 +- .../oc2r.common/file_import_export_card.json | 6 +- .../recipes/oc2r.common/flash_memory.json | 8 +- .../oc2r.common/flash_memory_custom.json | 8 +- .../recipes/oc2r.common/floppy.json | 6 +- .../recipes/oc2r.common/floppy_modern.json | 6 +- .../oc2r.common/hard_drive_custom.json | 8 +- .../oc2r.common/hard_drive_extra_large.json | 8 +- .../recipes/oc2r.common/hard_drive_large.json | 8 +- .../oc2r.common/hard_drive_medium.json | 8 +- .../recipes/oc2r.common/hard_drive_small.json | 8 +- .../inventory_operations_module.json | 6 +- .../recipes/oc2r.common/keyboard.json | 6 +- .../recipes/oc2r.common/manual.json | 6 +- .../oc2r.common/memory_extra_large.json | 8 +- .../recipes/oc2r.common/memory_large.json | 8 +- .../recipes/oc2r.common/memory_medium.json | 8 +- .../recipes/oc2r.common/memory_small.json | 8 +- .../recipes/oc2r.common/network_cable.json | 6 +- .../oc2r.common/network_connector.json | 6 +- .../recipes/oc2r.common/network_hub.json | 6 +- .../oc2r.common/network_interface_card.json | 6 +- .../oc2r.common/network_tunnel_card.json | 6 +- .../oc2r.common/network_tunnel_module.json | 6 +- .../recipes/oc2r.common/projector.json | 6 +- .../oc2r.common/redstone_interface.json | 6 +- .../oc2r.common/redstone_interface_card.json | 6 +- .../recipes/oc2r.common/robot.json | 8 +- .../recipes/oc2r.common/sound_card.json | 6 +- .../recipes/oc2r.common/transistor.json | 4 +- .../recipes/oc2r.common/wrench.json | 6 +- .../data/oc2r/file_systems/README.md | 6 +- .../data/oc2r/file_systems/scripts.json | 2 +- .../item_tag_filters/oc2r/hard_drive.json | 4 +- .../oc2r/item_tag_filters/oc2r/memory.json | 4 +- .../data/oc2r/loot_tables/blocks/charger.json | 2 +- .../oc2r/loot_tables/blocks/computer.json | 2 +- .../oc2r/loot_tables/blocks/disk_drive.json | 2 +- .../oc2r/loot_tables/blocks/keyboard.json | 2 +- .../loot_tables/blocks/network_connector.json | 2 +- .../oc2r/loot_tables/blocks/network_hub.json | 2 +- .../oc2r/loot_tables/blocks/projector.json | 2 +- .../blocks/redstone_interface.json | 2 +- .../oc2r/recipes/block_operations_module.json | 6 +- .../data/oc2r/recipes/bus_cable.json | 4 +- .../data/oc2r/recipes/bus_interface.json | 6 +- .../resources/data/oc2r/recipes/charger.json | 6 +- .../data/oc2r/recipes/circuit_board.json | 4 +- .../resources/data/oc2r/recipes/computer.json | 12 +- .../data/oc2r/recipes/cpu_tier_1.json | 8 +- .../data/oc2r/recipes/cpu_tier_2.json | 8 +- .../data/oc2r/recipes/cpu_tier_3.json | 8 +- .../data/oc2r/recipes/cpu_tier_4.json | 8 +- .../data/oc2r/recipes/disk_drive.json | 8 +- .../oc2r/recipes/file_import_export_card.json | 6 +- .../data/oc2r/recipes/flash_memory.json | 6 +- .../oc2r/recipes/flash_memory_custom.json | 8 +- .../oc2r/recipes/flash_memory_flasher.json | 8 +- .../resources/data/oc2r/recipes/floppy.json | 6 +- .../data/oc2r/recipes/floppy_modern.json | 6 +- .../data/oc2r/recipes/hard_drive_custom.json | 8 +- .../oc2r/recipes/hard_drive_extra_large.json | 6 +- .../data/oc2r/recipes/hard_drive_large.json | 6 +- .../data/oc2r/recipes/hard_drive_medium.json | 6 +- .../data/oc2r/recipes/hard_drive_small.json | 6 +- .../recipes/inventory_operations_module.json | 6 +- .../resources/data/oc2r/recipes/keyboard.json | 8 +- .../resources/data/oc2r/recipes/manual.json | 6 +- .../data/oc2r/recipes/memory_extra_large.json | 6 +- .../data/oc2r/recipes/memory_large.json | 6 +- .../data/oc2r/recipes/memory_medium.json | 6 +- .../data/oc2r/recipes/memory_small.json | 6 +- .../data/oc2r/recipes/network_cable.json | 4 +- .../data/oc2r/recipes/network_connector.json | 4 +- .../data/oc2r/recipes/network_hub.json | 10 +- .../oc2r/recipes/network_interface_card.json | 6 +- .../oc2r/recipes/network_tunnel_card.json | 6 +- .../oc2r/recipes/network_tunnel_module.json | 6 +- .../data/oc2r/recipes/projector.json | 8 +- .../data/oc2r/recipes/raw_silicon_wafer.json | 2 +- .../data/oc2r/recipes/redstone_interface.json | 8 +- .../oc2r/recipes/redstone_interface_card.json | 6 +- .../resources/data/oc2r/recipes/robot.json | 12 +- .../resources/data/oc2r/recipes/silicon.json | 4 +- .../data/oc2r/recipes/silicon_blend.json | 2 +- .../data/oc2r/recipes/silicon_wafer.json | 4 +- .../data/oc2r/recipes/sound_card.json | 6 +- .../data/oc2r/recipes/transistor.json | 2 +- .../resources/data/oc2r/recipes/unflash.json | 4 +- .../resources/data/oc2r/recipes/wrench.json | 4 +- .../data/oc2r/tags/blocks/cables.json | 2 +- .../data/oc2r/tags/blocks/devices.json | 8 +- .../oc2r/tags/blocks/wrench_breakable.json | 16 +- .../data/oc2r/tags/items/cables.json | 2 +- .../oc2r/tags/items/device_needs_reboot.json | 42 +-- .../data/oc2r/tags/items/devices.json | 22 +- .../data/oc2r/tags/items/devices/card.json | 10 +- .../data/oc2r/tags/items/devices/cpu.json | 8 +- .../oc2r/tags/items/devices/flash_memory.json | 4 +- .../data/oc2r/tags/items/devices/floppy.json | 4 +- .../oc2r/tags/items/devices/hard_drive.json | 10 +- .../data/oc2r/tags/items/devices/memory.json | 8 +- .../tags/items/devices/network_tunnel.json | 4 +- .../oc2r/tags/items/devices/robot_module.json | 6 +- .../data/oc2r/tags/items/tool_materials.json | 12 +- .../data/oc2r/tags/items/wrenches.json | 2 +- src/main/resources/mixins.oc2r.json | 4 +- 897 files changed, 3398 insertions(+), 3398 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 76884ad0..7939711c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -39,7 +39,7 @@ If applicable, add screenshots to help explain your problem. **Versions (please complete the following information):** - Minecraft: [e.g. 1.18.2] - Forge: [e.g. 40.0.40] - - oc2r: [e.g. 0.1.7] + - oc2: [e.g. 0.1.7] **Additional context** Add any other context about the problem here. diff --git a/README.md b/README.md index 59d870cb..ccc1834a 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,13 @@ The original section that was found here is preserved below, however it should b ~~While the mod isn't quite yet ready for release due to some remaining technical and usability issues, the API should be mostly stable at this point. For most people the high level device API will be sufficient, and is much more accessible. It centers around the [`RPCDevice`][RPC Device]. For a sample block implementation, see the [redstone interface]. For a sample item implementation, see the [sound card]. If you wish to dive deeper, and provide emulated hardware that requires a Linux driver, this centers around the [`VMDevice`][VM Device]. For a sample block implementation, see the [disk drive]. For a sample item implementation, see the [network card].~~ [OpenComputers]: https://github.com/MightyPirates/OpenComputers -[RPC Device]: src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java -[redstone interface]: src/main/java/li/cil/oc2r/common/blockentity/RedstoneInterfaceBlockEntity.java -[sound card]: src/main/java/li/cil/oc2r/common/bus/device/rpc/item/SoundCardItemDevice.java -[VM Device]: src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java -[disk drive]: src/main/java/li/cil/oc2r/common/blockentity/DiskDriveBlockEntity.java -[network card]: src/main/java/li/cil/oc2r/common/bus/device/vm/item/NetworkInterfaceCardDevice.java -[documentation]: src/main/resources/assets/oc2r/doc/en_us/index.md +[RPC Device]: src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java +[redstone interface]: src/main/java/li/cil/oc2/common/blockentity/RedstoneInterfaceBlockEntity.java +[sound card]: src/main/java/li/cil/oc2/common/bus/device/rpc/item/SoundCardItemDevice.java +[VM Device]: src/main/java/li/cil/oc2/api/bus/device/vm/VMDevice.java +[disk drive]: src/main/java/li/cil/oc2/common/blockentity/DiskDriveBlockEntity.java +[network card]: src/main/java/li/cil/oc2/common/bus/device/vm/item/NetworkInterfaceCardDevice.java +[documentation]: src/main/resources/assets/oc2/doc/en_us/index.md [GithubPackagesGradle]: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry [Sangar (fnuecke)]: https://github.com/fnuecke [Sedna]: https://github.com/fnuecke/sedna diff --git a/build.gradle b/build.gradle index ae012afc..5fbf4b1a 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ def getGitRef() { } version = "${semver}+${getGitRef()}" -group = "li.cil.oc2r" +group = "li.cil.oc2" java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -136,7 +136,7 @@ System.setProperty("line.separator", "\n") task packageScripts(type: Zip) { archiveFileName = "scripts.zip" - destinationDirectory = file("$buildDir/resources/main/data/oc2r/file_systems") + destinationDirectory = file("$buildDir/resources/main/data/oc2/file_systems") from "src/main/scripts" filter { line -> line } } @@ -164,7 +164,7 @@ minecraft { property "forge.logging.console.level", "debug" mods { - oc2r { + oc2 { source sourceSets.main } } @@ -172,30 +172,30 @@ minecraft { client { workingDirectory project.file("runclient") - property "forge.enabledGameTestNamespaces", "oc2r" + property "forge.enabledGameTestNamespaces", "oc2" } server { workingDirectory project.file("run") - property "forge.enabledGameTestNamespaces", "oc2r" + property "forge.enabledGameTestNamespaces", "oc2" arg "--nogui" } gameTestServer { workingDirectory project.file('run') - property "forge.enabledGameTestNamespaces", "oc2r" + property "forge.enabledGameTestNamespaces", "oc2" } data { workingDirectory project.file("run") - args "--mod", "oc2r", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources") + args "--mod", "oc2", "--all", "--output", file("src/generated/resources/"), "--existing", file("src/main/resources") } } } mixin { - add sourceSets.main, "mixins.oc2r.refmap.json" - config "mixins.oc2r.json" + add sourceSets.main, "mixins.oc2.refmap.json" + config "mixins.oc2.json" // quiet } @@ -212,14 +212,14 @@ jar { manifest { attributes([ "FMLAT" : "accesstransformer.cfg", - "Specification-Title" : "oc2r", + "Specification-Title" : "oc2", "Specification-Vendor" : "North Western Development (Originally by Sangar)", "Specification-Version" : "1", "Implementation-Title" : project.name, "Implementation-Version" : "${semver}", "Implementation-Vendor" : "North Western Development (Originally by Sangar)", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - "MixinConfigs" : "mixins.oc2r.json", + "MixinConfigs" : "mixins.oc2.json", "ContainedDeps" : "commons-collections4-4.4.jar" ]) } @@ -229,7 +229,7 @@ task apiJar(type: Jar) { archiveClassifier.set("api") from sourceSets.main.allSource from sourceSets.main.output - include "li/cil/oc2r/api/**" + include "li/cil/oc2/api/**" } artifacts { diff --git a/settings.gradle b/settings.gradle index 20743bf8..ca232508 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,7 @@ pluginManagement { } apply from: 'minecraft.gradle' -rootProject.name = "oc2r-${minecraft_version}-${minecraft_sdk}" +rootProject.name = "oc2-${minecraft_version}-${minecraft_sdk}" def substituteLocal(final directoryName, final libraryName) { final def path = new File("../${directoryName}"); diff --git a/src/main/java/li/cil/oc2r/api/API.java b/src/main/java/li/cil/oc2r/api/API.java index d2824560..cff37dfc 100644 --- a/src/main/java/li/cil/oc2r/api/API.java +++ b/src/main/java/li/cil/oc2r/api/API.java @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api; +package li.cil.oc2.api; import com.google.gson.GsonBuilder; -import li.cil.oc2r.api.bus.device.object.Callback; -import li.cil.oc2r.api.bus.device.rpc.RPCMethod; -import li.cil.oc2r.api.imc.RPCMethodParameterTypeAdapter; +import li.cil.oc2.api.bus.device.object.Callback; +import li.cil.oc2.api.bus.device.rpc.RPCMethod; +import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; import java.lang.reflect.Type; public final class API { - public static final String MOD_ID = "oc2r"; + public static final String MOD_ID = "oc2"; /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2r/api/README.md b/src/main/java/li/cil/oc2r/api/README.md index 5f99cc4b..3f47be16 100644 --- a/src/main/java/li/cil/oc2r/api/README.md +++ b/src/main/java/li/cil/oc2r/api/README.md @@ -1,6 +1,6 @@ # The OpenComputer II API -Welcome to the API of `oc2r`, fellow developer! This document will hopefully provide a sufficient overview of what +Welcome to the API of `oc2`, fellow developer! This document will hopefully provide a sufficient overview of what integrations this API allows, and how to best implement them. The primary purpose of the API is to allow other mods to implement their own devices, to be used by the computers in this mod. @@ -150,15 +150,15 @@ In this example, a device is made available for a custom `BlockEntity`. Using capabilities: ```java -import li.cil.oc2r.api.bus.device.object.Callback; -import li.cil.oc2r.api.bus.device.object.ObjectDevice; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.object.Callback; +import li.cil.oc2.api.bus.device.object.ObjectDevice; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fml.ModList; -import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2.api.bus.device.Device; class ModBlockEntity extends BlockEntity { public int getMagicValue() { @@ -167,7 +167,7 @@ class ModBlockEntity extends BlockEntity { @Override public LazyOptional getCapability(Capability cap, @Nullable Direction side) { - if (ModList.get().isLoaded("oc2r")) { + if (ModList.get().isLoaded("oc2")) { // Note: you can also store this and invalidate the capability to remove the // device/trigger the device bus to scan for changes in available devices. LazyOptional device = getDeviceCapability(); @@ -212,7 +212,7 @@ class Integration { Using the `Callback` annotation in the `BlockEntity` (hard dependency): ```java -import li.cil.oc2r.api.bus.device.object.Callback; +import li.cil.oc2.api.bus.device.object.Callback; import net.minecraft.world.level.block.entity.BlockEntity; class ModBlockEntity extends BlockEntity { @@ -229,14 +229,14 @@ devices to third-party `BlockEntities`. ### Block Device for a Third-Party `BlockEntity` In this example, a simple device providing a single method, `squareRoot`, is made available for the `FurnaceBlockEntity` -. As long as the registration of the `BlockDeviceProvider` is gated behind a check, whether `oc2r` is present, this is a +. As long as the registration of the `BlockDeviceProvider` is gated behind a check, whether `oc2` is present, this is a soft dependency. Using `ObjectDevice`: ```java -import li.cil.oc2r.api.bus.device.object.Callback; -import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2.api.bus.device.object.Callback; +import li.cil.oc2.api.bus.device.object.ObjectDevice; import net.minecraft.world.level.block.entity.BlockEntity; class MyCalculatorDevice { @@ -264,14 +264,14 @@ class ModDeviceProvider extends ForgeRegistryEntry implemen Using the `RPCDevice` and `RPCMethods` interfaces directly: ```java -import li.cil.oc2r.api.bus.device.Device; -import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; -import li.cil.oc2r.api.bus.device.provider.BlockDeviceQuery; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; -import li.cil.oc2r.api.bus.device.rpc.RPCMethod; -import li.cil.oc2r.api.bus.device.rpc.RPCMethodGroup; -import li.cil.oc2r.api.bus.device.rpc.RPCParameter; -import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.rpc.RPCMethod; +import li.cil.oc2.api.bus.device.rpc.RPCMethodGroup; +import li.cil.oc2.api.bus.device.rpc.RPCParameter; +import li.cil.oc2.api.util.Invalidatable; import net.minecraft.world.level.block.entity.FurnaceBlockEntity; import java.util.Collections; @@ -333,7 +333,7 @@ class ModDeviceProvider extends ForgeRegistryEntry implemen Shared device provider registration: ```java -import li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider; +import li.cil.oc2.api.bus.device.provider.BlockDeviceProvider; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; @@ -341,7 +341,7 @@ class Providers { static final DeferredRegister BLOCK_DEVICE_PROVIDERS = DeferredRegister.create(BlockDeviceProvider.class, "my_mod_id"); - // Called from mod initialization, if oc2r is present. + // Called from mod initialization, if oc2 is present. static void initialize() { BLOCK_DEVICE_PROVIDERS.register("my_calculator_device", ModDeviceProvider::new); diff --git a/src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java b/src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java index b4c62709..29129e3f 100644 --- a/src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/api/bus/BlockDeviceBusElement.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus; +package li.cil.oc2.api.bus; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/li/cil/oc2r/api/bus/DeviceBus.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBus.java index 075ccfd9..cbbc90b6 100644 --- a/src/main/java/li/cil/oc2r/api/bus/DeviceBus.java +++ b/src/main/java/li/cil/oc2r/api/bus/DeviceBus.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus; +package li.cil.oc2.api.bus; -import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2.api.bus.device.Device; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java index 1f00442c..4c37b137 100644 --- a/src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java +++ b/src/main/java/li/cil/oc2r/api/bus/DeviceBusController.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus; +package li.cil.oc2.api.bus; -import li.cil.oc2r.api.bus.device.Device; +import li.cil.oc2.api.bus.device.Device; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java b/src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java index dfe7a813..53d11696 100644 --- a/src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java +++ b/src/main/java/li/cil/oc2r/api/bus/DeviceBusElement.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus; +package li.cil.oc2.api.bus; -import li.cil.oc2r.api.bus.device.Device; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; import net.minecraftforge.common.util.LazyOptional; import java.util.Collection; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/Device.java b/src/main/java/li/cil/oc2r/api/bus/device/Device.java index b7a43d39..6a6b699b 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/Device.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/Device.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device; +package li.cil.oc2.api.bus.device; -import li.cil.oc2r.api.bus.DeviceBus; -import li.cil.oc2r.api.bus.DeviceBusController; +import li.cil.oc2.api.bus.DeviceBus; +import li.cil.oc2.api.bus.DeviceBusController; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java b/src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java index e785a73b..fbd949a0 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/DeviceType.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device; +package li.cil.oc2.api.bus.device; -import li.cil.oc2r.api.API; +import li.cil.oc2.api.API; import net.minecraft.core.Registry; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java b/src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java index b4b9c4bc..b21632b1 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/DeviceTypes.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device; +package li.cil.oc2.api.bus.device; -import li.cil.oc2r.api.API; +import li.cil.oc2.api.API; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.RegistryObject; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java index a460d37a..a9c2d999 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/ItemDevice.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device; +package li.cil.oc2.api.bus.device; -import li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider; +import li.cil.oc2.api.bus.device.provider.ItemDeviceProvider; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java b/src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java index 40bc7a51..c796b4bd 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/data/BlockDeviceData.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.data; +package li.cil.oc2.api.bus.device.data; import li.cil.sedna.api.device.BlockDevice; import net.minecraft.network.chat.Component; @@ -13,15 +13,15 @@ import net.minecraft.network.chat.Component; * This is used for the built-in Linux root file-system, for example. *

* To make use of registered implementations, a hard drive item with the - * string tag {@code oc2r.base} referencing the implementation's registry id + * string tag {@code oc2.base} referencing the implementation's registry id * must be created. For example, if the implementation's registry name is * {@code my_mod:my_block_device}: * 

- * /give ? oc2r:hard_drive{oc2r:{data:"my_mod:my_block_device"}}
+ * /give ? oc2:hard_drive{oc2:{data:"my_mod:my_block_device"}}
  *
* The drive can be made readonly by also specifying the {@code readonly} tag: * 
- * /give ? oc2r:hard_drive{oc2r:{data:"my_mod:my_block_device",readonly:true}}
+ * /give ? oc2:hard_drive{oc2:{data:"my_mod:my_block_device",readonly:true}}
  *
*/ public interface BlockDeviceData { diff --git a/src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java b/src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java index 791e5013..ecfd0ab0 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/data/Firmware.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.data; +package li.cil.oc2.api.bus.device.data; import li.cil.sedna.api.memory.MemoryMap; import net.minecraft.network.chat.Component; @@ -12,11 +12,11 @@ import net.minecraft.network.chat.Component; * This is used for the built-in OpenSBI firmware and Linux kernel, for example. *

* To make use of registered implementations, a flash memory item with the - * string tag {@code oc2r.firmware} referencing the implementation's registry name + * string tag {@code oc2.firmware} referencing the implementation's registry name * must be created. For example, if the implementation's registry name is * {@code my_mod:my_firmware}: * 

- * /give @p oc2r:flash_memory{oc2r:{firmware:"my_mod:my_firmware"}}
+ * /give @p oc2:flash_memory{oc2:{firmware:"my_mod:my_firmware"}}
  *
*/ public interface Firmware { diff --git a/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java index 54007429..47ed0659 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/data/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus.device.data; +package li.cil.oc2.api.bus.device.data; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java b/src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java index 07986a82..ae350414 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/Callback.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.object; +package li.cil.oc2.api.bus.device.object; -import li.cil.oc2r.api.bus.device.rpc.RPCMethod; +import li.cil.oc2.api.bus.device.rpc.RPCMethod; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -17,7 +17,7 @@ import java.lang.annotation.Target; *

* Method parameters are serialized and deserialized using Gson. When using custom * parameter types it may be necessary to register a custom type adapter for them - * via {@link li.cil.oc2r.api.API#IMC_ADD_RPC_METHOD_PARAMETER_TYPE_ADAPTER}. + * via {@link li.cil.oc2.api.API#IMC_ADD_RPC_METHOD_PARAMETER_TYPE_ADAPTER}. */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/Callbacks.java b/src/main/java/li/cil/oc2r/api/bus/device/object/Callbacks.java index ae6896dd..2fccd3ef 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/object/Callbacks.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/Callbacks.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.object; +package li.cil.oc2.api.bus.device.object; -import li.cil.oc2r.api.bus.device.rpc.AbstractRPCMethod; -import li.cil.oc2r.api.bus.device.rpc.RPCMethod; -import li.cil.oc2r.api.bus.device.rpc.RPCMethodGroup; -import li.cil.oc2r.api.bus.device.rpc.RPCParameter; +import li.cil.oc2.api.bus.device.rpc.AbstractRPCMethod; +import li.cil.oc2.api.bus.device.rpc.RPCMethod; +import li.cil.oc2.api.bus.device.rpc.RPCMethodGroup; +import li.cil.oc2.api.bus.device.rpc.RPCParameter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.util.Strings; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/DocumentedDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/object/DocumentedDevice.java index 22adf2d5..f840bae0 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/object/DocumentedDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/DocumentedDevice.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.object; +package li.cil.oc2.api.bus.device.object; /** * This interface is used to declare callback documentation on targets of an {@link ObjectDevice}. diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/LifecycleAwareDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/object/LifecycleAwareDevice.java index fd4bc8b8..aedd908b 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/object/LifecycleAwareDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/LifecycleAwareDevice.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.object; +package li.cil.oc2.api.bus.device.object; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/NamedDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/object/NamedDevice.java index e28af06f..0001a66f 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/object/NamedDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/NamedDevice.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.object; +package li.cil.oc2.api.bus.device.object; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/ObjectDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/object/ObjectDevice.java index ffffc3d2..2e237764 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/object/ObjectDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/ObjectDevice.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.object; +package li.cil.oc2.api.bus.device.object; -import li.cil.oc2r.api.bus.device.ItemDevice; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; -import li.cil.oc2r.api.bus.device.rpc.RPCMethod; -import li.cil.oc2r.api.bus.device.rpc.RPCMethodGroup; +import li.cil.oc2.api.bus.device.ItemDevice; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.rpc.RPCMethod; +import li.cil.oc2.api.bus.device.rpc.RPCMethodGroup; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/Parameter.java b/src/main/java/li/cil/oc2r/api/bus/device/object/Parameter.java index 23276549..86226498 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/object/Parameter.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/Parameter.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.object; +package li.cil.oc2.api.bus.device.object; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/object/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/object/package-info.java index 9151568c..261c7339 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/object/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/object/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus.device.object; +package li.cil.oc2.api.bus.device.object; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/package-info.java index 169ce7b5..609af817 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus.device; +package li.cil.oc2.api.bus.device; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceProvider.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceProvider.java index cf59de58..6c1eab63 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceProvider.java @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.provider; +package li.cil.oc2.api.bus.device.provider; -import li.cil.oc2r.api.bus.device.Device; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; -import li.cil.oc2r.api.bus.device.vm.VMDevice; -import li.cil.oc2r.api.util.Invalidatable; +import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.vm.VMDevice; +import li.cil.oc2.api.util.Invalidatable; import net.minecraft.nbt.CompoundTag; /** @@ -21,7 +21,7 @@ import net.minecraft.nbt.CompoundTag; * previous scan. *

* This is also required to avoid device duplication when a device is connected to a - * {@link li.cil.oc2r.api.bus.DeviceBus} more than once. An example where this can occur are + * {@link li.cil.oc2.api.bus.DeviceBus} more than once. An example where this can occur are * blocks that expose the same device on all sides having connected cabling adjacent to more * than one face. *

@@ -39,9 +39,9 @@ import net.minecraft.nbt.CompoundTag; * } * * - * @see li.cil.oc2r.api.bus.device.rpc.RPCDevice - * @see li.cil.oc2r.api.bus.device.object.ObjectDevice - * @see li.cil.oc2r.api.bus.device.vm.VMDevice + * @see li.cil.oc2.api.bus.device.rpc.RPCDevice + * @see li.cil.oc2.api.bus.device.object.ObjectDevice + * @see li.cil.oc2.api.bus.device.vm.VMDevice * @see BlockDeviceQuery */ public interface BlockDeviceProvider { diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java index ff014567..5781523a 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/BlockDeviceQuery.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.provider; +package li.cil.oc2.api.bus.device.provider; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java index a53a92ed..b860fd6e 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceProvider.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.provider; +package li.cil.oc2.api.bus.device.provider; -import li.cil.oc2r.api.bus.device.ItemDevice; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; -import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2.api.bus.device.ItemDevice; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.vm.VMDevice; import net.minecraft.nbt.CompoundTag; import javax.annotation.Nullable; @@ -36,9 +36,9 @@ import java.util.Optional; * } * * - * @see li.cil.oc2r.api.bus.device.rpc.RPCDevice - * @see li.cil.oc2r.api.bus.device.object.ObjectDevice - * @see li.cil.oc2r.api.bus.device.vm.VMDevice + * @see li.cil.oc2.api.bus.device.rpc.RPCDevice + * @see li.cil.oc2.api.bus.device.object.ObjectDevice + * @see li.cil.oc2.api.bus.device.vm.VMDevice * @see ItemDeviceQuery */ public interface ItemDeviceProvider { diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java index 4d29d709..9bed31a5 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/ItemDeviceQuery.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.provider; +package li.cil.oc2.api.bus.device.provider; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java index cb72d743..fc586bd3 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/provider/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus.device.provider; +package li.cil.oc2.api.bus.device.provider; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java index b78ffebb..c6397ad8 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/AbstractRPCMethod.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.rpc; +package li.cil.oc2.api.bus.device.rpc; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java index bbea5262..68942d14 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCDevice.java @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.rpc; +package li.cil.oc2.api.bus.device.rpc; -import li.cil.oc2r.api.bus.DeviceBus; -import li.cil.oc2r.api.bus.device.Device; -import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2.api.bus.DeviceBus; +import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.api.bus.device.object.ObjectDevice; import java.util.List; @@ -47,8 +47,8 @@ import java.util.List; * * * @see ObjectDevice - * @see li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider - * @see li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider + * @see li.cil.oc2.api.bus.device.provider.BlockDeviceProvider + * @see li.cil.oc2.api.bus.device.provider.ItemDeviceProvider */ public interface RPCDevice extends Device { /** diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java index 4db63dc4..e4c0c6f9 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCInvocation.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.rpc; +package li.cil.oc2.api.bus.device.rpc; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java index 3adfd861..ac9b7a05 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethod.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.rpc; +package li.cil.oc2.api.bus.device.rpc; -import li.cil.oc2r.api.bus.device.object.ObjectDevice; +import li.cil.oc2.api.bus.device.object.ObjectDevice; import javax.annotation.Nullable; import java.util.Collections; @@ -17,7 +17,7 @@ import java.util.Set; *

* Method parameters are serialized and deserialized using Gson. When using custom * parameter types it may be necessary to register a custom type adapter for them - * via {@link li.cil.oc2r.api.API#IMC_ADD_RPC_METHOD_PARAMETER_TYPE_ADAPTER}. + * via {@link li.cil.oc2.api.API#IMC_ADD_RPC_METHOD_PARAMETER_TYPE_ADAPTER}. * * @see ObjectDevice */ diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethodGroup.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethodGroup.java index 570e4e67..74cf93cc 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethodGroup.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCMethodGroup.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.rpc; +package li.cil.oc2.api.bus.device.rpc; -import li.cil.oc2r.api.bus.DeviceBusController; +import li.cil.oc2.api.bus.DeviceBusController; import java.util.Collections; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCParameter.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCParameter.java index 61d15bbc..51f9ecff 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCParameter.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/RPCParameter.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.rpc; +package li.cil.oc2.api.bus.device.rpc; import java.util.Optional; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/rpc/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/rpc/package-info.java index bdd7e92f..c3668cf1 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/rpc/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/rpc/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus.device.rpc; +package li.cil.oc2.api.bus.device.rpc; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/FirmwareLoader.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/FirmwareLoader.java index b66e4949..f93a4cd4 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/FirmwareLoader.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/FirmwareLoader.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm; +package li.cil.oc2.api.bus.device.vm; /** * This interface serves as a marker for devices that load firmware. diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java index 7a13998b..a6574819 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDevice.java @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm; +package li.cil.oc2.api.bus.device.vm; -import li.cil.oc2r.api.bus.DeviceBus; -import li.cil.oc2r.api.bus.device.Device; -import li.cil.oc2r.api.bus.device.rpc.RPCDevice; -import li.cil.oc2r.api.bus.device.vm.context.InterruptAllocator; -import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2.api.bus.DeviceBus; +import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.api.bus.device.rpc.RPCDevice; +import li.cil.oc2.api.bus.device.vm.context.InterruptAllocator; +import li.cil.oc2.api.bus.device.vm.context.VMContext; import li.cil.sedna.api.device.MemoryMappedDevice; /** @@ -47,8 +47,8 @@ import li.cil.sedna.api.device.MemoryMappedDevice; * Note that if any other {@link VMDevice} fails mounting, all mounted devices * will immediately unmounted and disposed. * - * @see li.cil.oc2r.api.bus.device.provider.BlockDeviceProvider - * @see li.cil.oc2r.api.bus.device.provider.ItemDeviceProvider + * @see li.cil.oc2.api.bus.device.provider.BlockDeviceProvider + * @see li.cil.oc2.api.bus.device.provider.ItemDeviceProvider */ public interface VMDevice extends Device { /** diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDeviceLoadResult.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDeviceLoadResult.java index 5b504669..f8cf523c 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDeviceLoadResult.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/VMDeviceLoadResult.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm; +package li.cil.oc2.api.bus.device.vm; -import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2.api.bus.device.vm.context.VMContext; import net.minecraft.network.chat.Component; import javax.annotation.Nullable; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/InterruptAllocator.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/InterruptAllocator.java index d69853e9..fb7fb991 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/InterruptAllocator.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/InterruptAllocator.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.context; +package li.cil.oc2.api.bus.device.vm.context; -import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2.api.bus.device.vm.VMDevice; import java.util.Optional; import java.util.OptionalInt; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryAllocator.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryAllocator.java index 9244d2ce..084e1847 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryAllocator.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryAllocator.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.context; +package li.cil.oc2.api.bus.device.vm.context; /** * A memory allocator used to ensure sandbox limits when loading devices. diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryRangeAllocator.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryRangeAllocator.java index 3195723a..f148d6aa 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryRangeAllocator.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/MemoryRangeAllocator.java @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.context; +package li.cil.oc2.api.bus.device.vm.context; -import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2.api.bus.device.vm.VMDevice; import li.cil.sedna.api.device.MemoryMappedDevice; import java.util.OptionalLong; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMContext.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMContext.java index 0b253157..e3090cea 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMContext.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMContext.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.context; +package li.cil.oc2.api.bus.device.vm.context; -import li.cil.oc2r.api.bus.DeviceBus; -import li.cil.oc2r.api.bus.device.vm.VMDevice; +import li.cil.oc2.api.bus.DeviceBus; +import li.cil.oc2.api.bus.device.vm.VMDevice; import li.cil.sedna.api.device.InterruptController; import li.cil.sedna.api.device.MemoryMappedDevice; import li.cil.sedna.api.memory.MemoryMap; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMLifecycleEventBus.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMLifecycleEventBus.java index 9d85db3f..de272ddb 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMLifecycleEventBus.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/VMLifecycleEventBus.java @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.context; +package li.cil.oc2.api.bus.device.vm.context; /** * Allows registering for VM lifecycle events. * - * @see li.cil.oc2r.api.bus.device.vm.event.VMInitializingEvent - * @see li.cil.oc2r.api.bus.device.vm.event.VMSynchronizeEvent - * @see li.cil.oc2r.api.bus.device.vm.event.VMResumedRunningEvent + * @see li.cil.oc2.api.bus.device.vm.event.VMInitializingEvent + * @see li.cil.oc2.api.bus.device.vm.event.VMSynchronizeEvent + * @see li.cil.oc2.api.bus.device.vm.event.VMResumedRunningEvent */ public interface VMLifecycleEventBus { /** diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/package-info.java index d1de369e..b67780c0 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/context/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/context/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus.device.vm.context; +package li.cil.oc2.api.bus.device.vm.context; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializationException.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializationException.java index 6f779716..fb6c6ee2 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializationException.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializationException.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.event; +package li.cil.oc2.api.bus.device.vm.event; import net.minecraft.network.chat.Component; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializingEvent.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializingEvent.java index fc254d37..f264abf5 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializingEvent.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMInitializingEvent.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.event; +package li.cil.oc2.api.bus.device.vm.event; -import li.cil.oc2r.api.bus.device.vm.VMDevice; -import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2.api.bus.device.vm.VMDevice; +import li.cil.oc2.api.bus.device.vm.context.VMContext; /** * Fired exactly once, when the VM first starts running. diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMResumedRunningEvent.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMResumedRunningEvent.java index 42f93ee3..628726ea 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMResumedRunningEvent.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMResumedRunningEvent.java @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.event; +package li.cil.oc2.api.bus.device.vm.event; -import li.cil.oc2r.api.bus.device.vm.VMDevice; -import li.cil.oc2r.api.bus.device.vm.context.VMContext; +import li.cil.oc2.api.bus.device.vm.VMDevice; +import li.cil.oc2.api.bus.device.vm.context.VMContext; /** * Fired when the VM resumed running, either when first starting up, when resuming after diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMSynchronizeEvent.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMSynchronizeEvent.java index d201c0c8..af0f69b3 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMSynchronizeEvent.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/VMSynchronizeEvent.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -package li.cil.oc2r.api.bus.device.vm.event; +package li.cil.oc2.api.bus.device.vm.event; /** * Fired when the VM is paused, typically before state is persisted. diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/package-info.java index e4a4edd3..08173178 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/event/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/event/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus.device.vm.event; +package li.cil.oc2.api.bus.device.vm.event; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/bus/device/vm/package-info.java b/src/main/java/li/cil/oc2r/api/bus/device/vm/package-info.java index f699c021..6f100586 100644 --- a/src/main/java/li/cil/oc2r/api/bus/device/vm/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/device/vm/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2r.api.bus.device.vm; +package li.cil.oc2.api.bus.device.vm; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2r/api/bus/package-info.java b/src/main/java/li/cil/oc2r/api/bus/package-info.java index ca439a80..89ba550b 100644 --- a/src/main/java/li/cil/oc2r/api/bus/package-info.java +++ b/src/main/java/li/cil/oc2r/api/bus/package-info.java @@ -3,29 +3,29 @@ /** * The device bus is the glue that connects devices and VMs. *

- * A bus must always be managed by a {@link li.cil.oc2r.api.bus.DeviceBusController}. + * A bus must always be managed by a {@link li.cil.oc2.api.bus.DeviceBusController}. * If there is no controller, there is no (connected) bus. *

* When a controller performs a scan, it collects a list of connected - * {@link li.cil.oc2r.api.bus.DeviceBusElement}s thus defining a - * {@link li.cil.oc2r.api.bus.DeviceBus}. + * {@link li.cil.oc2.api.bus.DeviceBusElement}s thus defining a + * {@link li.cil.oc2.api.bus.DeviceBus}. * How the controller scans for elements depends on the implementation. * One example is a block-based controller which scans adjacent blocks * in a recursive manner -- usually up to some maximum bus complexity. *

- * {@link li.cil.oc2r.api.bus.DeviceBusElement}s are responsible for + * {@link li.cil.oc2.api.bus.DeviceBusElement}s are responsible for * providing a list of devices connected to them. Whether they play an * active role and seek out devices, or passively expect devices to be * registered with them depends on the implementation. *

- * After a scan {@link li.cil.oc2r.api.bus.DeviceBusController}s then + * After a scan {@link li.cil.oc2.api.bus.DeviceBusController}s then * collect all devices from all bus elements to build a global set * of devices on the bus. *

* There can be various types of devices on a bus, but which types are * supported will depend on the context of the controller. Currently, two - * types of devices are defined in this API, {@link li.cil.oc2r.api.bus.device.rpc.RPCDevice} - * and {@link li.cil.oc2r.api.bus.device.vm.VMDevice}. + * types of devices are defined in this API, {@link li.cil.oc2.api.bus.device.rpc.RPCDevice} + * and {@link li.cil.oc2.api.bus.device.vm.VMDevice}. *